Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/adjust plots layout #56

Merged
merged 3 commits into from
May 11, 2021
Merged

Feature/adjust plots layout #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0691de7
Adjust grids
j-or May 11, 2021
a34d533
Merge branch 'main' into feature/adjust_plots_layout
j-or May 11, 2021
dcaca4f
Move plots below data points on smaller screens
j-or May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions components/experiment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function Experiment(props: ExperimentProps) {
<Card className={[classes.experimentContainer, isDirty && allowSaveToServer ? classes.experimentContainerDirty : ''].join(' ')}>
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12}>
<Grid item xs={12}>
<Grid container>
<Grid item xs={7}>
<Typography variant="body2">
Expand Down Expand Up @@ -137,6 +137,7 @@ export default function Experiment(props: ExperimentProps) {

<Grid item xs={3}>
<Grid container spacing={2}>

<Grid item xs={12}>
<ModelEditor
info={experiment.info}
Expand All @@ -157,17 +158,6 @@ export default function Experiment(props: ExperimentProps) {
</Card>
</Grid>

<Grid item xs={12}>
<OptimizerConfigurator
config={experiment.optimizerConfig}
onConfigUpdated={(config: OptimizerConfig) => dispatch({ type: 'updateConfiguration', payload: config })} />
</Grid>
</Grid>
</Grid>

<Grid item xs={9}>

<Grid container spacing={2}>
<Grid item xs={12}>
<OptimizerModel
valueVariables={valueVariables}
Expand All @@ -178,14 +168,27 @@ export default function Experiment(props: ExperimentProps) {
addValueVariable={(valueVariable: ValueVariableType) => dispatch({ type: 'addValueVariable', payload: valueVariable })}
addCategoricalVariable={(categoricalVariable: CategoricalVariableType) => dispatch({ type: 'addCategorialVariable', payload: categoricalVariable })} />
</Grid>

<Grid item xs={12}>
<OptimizerConfigurator
config={experiment.optimizerConfig}
onConfigUpdated={(config: OptimizerConfig) => dispatch({ type: 'updateConfiguration', payload: config })} />
</Grid>

</Grid>
</Grid>

<Grid item xs={9}>

<Grid container spacing={2}>
<Grid item xs={12} xl={6}>
<DataPoints
valueVariables={experiment.valueVariables}
categoricalVariables={experiment.categoricalVariables}
dataPoints={experiment.dataPoints}
onUpdateDataPoints={(dataPoints: DataPointType[][]) => dispatch({ type: 'updateDataPoints', payload: dataPoints })} />
</Grid>
<Grid item xs={12}>
<Grid item xs={12} xl={6}>
{experiment.results.plots.length > 0 &&
<Card>
<CardContent>
Expand Down
14 changes: 9 additions & 5 deletions components/optimizer-model.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,22 @@ export default function OptimizerModel(props: OptimizerModelProps) {
</Box>
}
{!isAddOpen &&
<Box mt={2}>
<Button
disabled={disabled}
variant="outlined"
size="small"
onClick={() => setAddOpen(true)}>Add variable</Button>
</Box>
}
{isAddOpen &&
<VariableEditor
isAddVariableDisabled={disabled}
addCategoricalVariable={(categoricalVariable: CategoricalVariableType) => addCategoricalVariable(categoricalVariable)}
addValueVariable={(valueVariable: ValueVariableType) => addValueVariable(valueVariable)}
close={() => setAddOpen(false)} />
<Box mt={2}>
<VariableEditor
isAddVariableDisabled={disabled}
addCategoricalVariable={(categoricalVariable: CategoricalVariableType) => addCategoricalVariable(categoricalVariable)}
addValueVariable={(valueVariable: ValueVariableType) => addValueVariable(valueVariable)}
close={() => setAddOpen(false)} />
</Box>
}

{disabled &&
Expand Down
2 changes: 1 addition & 1 deletion components/variable-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function VariableEditor(props: VariableEditorProps) {

return (
<Grid container spacing={0}>
<Grid item xs={6}>
<Grid item xs={12}>
<Card className={classes.main}>
<CardContent>
<Grid container spacing={0}>
Expand Down
4 changes: 2 additions & 2 deletions theme/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ const createCustomTheme = (custom: CustomColours): Theme => {
return createMuiTheme({
overrides,
sizes: {
mainWidthMin: 1200,
mainWidthMax: 1400,
mainWidthMin: 1280,
mainWidthMax: 3840,
},
palette: {
primary: {
Expand Down