Skip to content

Commit

Permalink
Merge pull request #148 from technote-space/release/next-v0.15.0
Browse files Browse the repository at this point in the history
release: v0.15.1
  • Loading branch information
technote-space authored Dec 27, 2022
2 parents acc81d2 + a4b9646 commit fd04b5c
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 117 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@technote-space/ga-framework",
"version": "0.15.0",
"version": "0.15.1",
"description": "GA Framework",
"keywords": [
"genetic algorithm"
Expand Down Expand Up @@ -44,7 +44,7 @@
"@emotion/styled": "^11.10.5",
"@mui-treasury/layout": "^5.0.0",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.1",
"@mui/material": "^5.11.2",
"@technote-space/genetic-algorithms-js": "^0.8.27",
"@technote-space/worker-controller": "^0.5.56",
"chart.js": "^4.1.1",
Expand All @@ -69,11 +69,11 @@
"@babel/preset-typescript": "^7.18.6",
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@types/node": "^18.11.17",
"@types/node": "^18.11.18",
"@types/react-helmet": "^6.1.6",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.47.0",
"@typescript-eslint/parser": "^5.47.0",
"@typescript-eslint/eslint-plugin": "^5.47.1",
"@typescript-eslint/parser": "^5.47.1",
"babel-plugin-react-html-attrs": "^3.0.5",
"babel-plugin-transform-class-properties": "^6.24.1",
"copy-webpack-plugin": "^11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Graph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const Graph: FC<{
);
}, [nodes, edges, options]);

return <Box sx={{ height: '100%', padding: 20 }} ref={container}/>;
return <Box sx={{ height: '100%', padding: '20px' }} ref={container}/>;
});

Graph.displayName = 'Graph';
Expand Down
9 changes: 4 additions & 5 deletions src/app/components/Timeline.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import type { FC } from 'react';
import type { ScatterDataPoint } from 'chart.js';
import React, { memo, useRef, useState, useEffect } from 'react';
import Box from '@mui/material/Box';
import { Chart } from 'chart.js';
import { Chart, registerables } from 'chart.js';
import useTheme from '@/hooks/useTheme';
import { useStoreContext } from '@/Store';

Chart.register(...registerables);

const Timeline: FC<{
data: Array<ScatterDataPoint>;
}> = memo(({ data }) => {
Expand Down Expand Up @@ -82,9 +83,7 @@ const Timeline: FC<{
}
}, [data]);

return <Box sx={{ paddingY: 0, paddingX: 2 }}>
<canvas ref={container}/>
</Box>;
return <canvas ref={container} style={{ padding: '0', paddingRight: 16, paddingLeft: 16 }}/>;
});

Timeline.displayName = 'Timeline';
Expand Down
6 changes: 2 additions & 4 deletions src/app/templates/HeaderEx.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ const HeaderEx: FC<{
minWidth: 0,
fontSize: 18,
display: {
display: 'none',
md: {
display: 'inherit',
},
xs: 'none',
md: 'inherit',
},
}}>{title}</Typography>, []);
const beforeHeaderTitle = useMemo(() => options.parts?.beforeHeaderTitle ? options.parts.beforeHeaderTitle() : null, []);
Expand Down
11 changes: 5 additions & 6 deletions src/app/templates/NavContentEx.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,22 @@ const NavContentEx: FC<{
useEffect(() => {
if (worker) {
setController(<Box sx={{
background: 'background.default',
color: 'secondary.contrastText',
marginTop: 10,
padding: 5,
marginTop: '10px',
padding: '5px',
}}>
<Box sx={{ textAlign: 'center' }}>
<Button
sx={{ margin: 5 }}
sx={{ margin: '5px' }}
onClick={control.reset(store)}
disabled={status === 'disabled' || (status !== 'initialized' && status !== 'finished' && status !== 'canceled')}
>
Reset
</Button>
<Button sx={{ margin: 5 }} onClick={control.start(store)} disabled={status === 'disabled' || (status !== 'initialized' && status !== 'canceled')}>
<Button sx={{ margin: '5px' }} onClick={control.start(store)} disabled={status === 'disabled' || (status !== 'initialized' && status !== 'canceled')}>
Start
</Button>
<Button sx={{ margin: 5 }} onClick={control.stop(store)} disabled={status === 'disabled' || status !== 'started'}>
<Button sx={{ margin: '5px' }} onClick={control.stop(store)} disabled={status === 'disabled' || status !== 'started'}>
Stop
</Button>
</Box>
Expand Down
Loading

0 comments on commit fd04b5c

Please sign in to comment.