working lengend for plot

DiamondLightSource · Sep 7, 2023 · c636a07 · c636a07
1 parent 723b1e6
commit c636a07
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 43 deletions.
diff --git a/src/plot/centrePlot.tsx b/src/plot/centrePlot.tsx
@@ -134,29 +134,33 @@ export default function CentrePlot(): JSX.Element {
                   detectorUpper: Vector3,
                 ) => (
                   <SvgElement>
-                    <SvgCircle
-                      coords={[cameraTubeCentre, cameraTubePerimeter]}
-                      fill="rgba(0, 255, 0, 0.5)"
-                      id="camera tube"
-                    />
-                    <SvgCircle
-                      coords={[beamstopCentre, clearance]}
-                      fill="rgba(0, 0, 255, 0.5)"
-                      id="clearance"
-                    />
-                    <SvgCircle
-                      coords={[beamstopCentre, beamstopPerimeter]}
-                      fill="black"
-                      id="beamstop"
-                    />
-                    <SvgRect
-                      coords={[detectorLower, detectorUpper]}
-                      fill="rgba(255, 0, 0, 0.5)"
-                      id="detector"
-                      stroke="black"
-                      strokePosition="outside"
-                      strokeWidth={0}
-                    />
+                    {plotConfig.cameraTube &&
+                      <SvgCircle
+                        coords={[cameraTubeCentre, cameraTubePerimeter]}
+                        fill="rgba(0, 255, 0, 0.2)"
+                        id="camera tube"
+                      />}
+                    {plotConfig.clearnace &&
+                      <SvgCircle
+                        coords={[beamstopCentre, clearance]}
+                        fill="rgba(0, 0, 255, 0.2)"
+                        id="clearance"
+                      />}
+                    {plotConfig.beamstop &&
+                      <SvgCircle
+                        coords={[beamstopCentre, beamstopPerimeter]}
+                        fill="black"
+                        id="beamstop"
+                      />}
+                    {plotConfig.detector &&
+                      <SvgRect
+                        coords={[detectorLower, detectorUpper]}
+                        fill="rgba(255, 0, 0, 0.2)"
+                        id="detector"
+                        stroke="black"
+                        strokePosition="outside"
+                        strokeWidth={0}
+                      />}
                   </SvgElement>
                 )}
               </DataToHtml>

diff --git a/src/plot/legendBar.tsx b/src/plot/legendBar.tsx
@@ -25,27 +25,27 @@ export default function LegendBar(): JSX.Element {
           <Typography>Add something to do with colors here</Typography>
           <FormGroup>
             <FormControlLabel
-              control={<Checkbox checked={plotConfig.detector.inPlot} />}
+              control={<Checkbox checked={plotConfig.detector} onChange={(_, checked) => plotConfig.edit({ detector: checked })} />}
               label="Detector"
             />
             <FormControlLabel
-              control={<Checkbox checked={plotConfig.beamstop.inPlot} />}
+              control={<Checkbox checked={plotConfig.beamstop} onChange={(_, checked) => plotConfig.edit({ beamstop: checked })} />}
               label="Beamstop"
             />
             <FormControlLabel
-              control={<Checkbox checked={plotConfig.cameraTube.inPlot} />}
+              control={<Checkbox checked={plotConfig.cameraTube} onChange={(_, checked) => plotConfig.edit({ cameraTube: checked })} />}
               label="Camera tube"
             />
             <FormControlLabel
-              control={<Checkbox checked={plotConfig.qrange} />}
+              control={<Checkbox checked={plotConfig.qrange} onChange={(_, checked) => plotConfig.edit({ qrange: checked })} />}
               label="Q range"
             />
             <FormControlLabel
-              control={<Checkbox checked={plotConfig.mask} />}
+              control={<Checkbox checked={plotConfig.mask} onChange={(_, checked) => plotConfig.edit({ mask: checked })} />}
               label="Mask"
             />
             <FormControlLabel
-              control={<Checkbox checked={plotConfig.calibrantInPlot} />}
+              control={<Checkbox checked={plotConfig.calibrantInPlot} onChange={(_, checked) => plotConfig.edit({ calibrantInPlot: checked })} />}
               label="Calibrant"
             />
           </FormGroup>

diff --git a/src/plot/plotStore.ts b/src/plot/plotStore.ts
@@ -6,16 +6,11 @@ export enum PlotAxes {
   reciprocal = "reciprocal",
 }
 
-interface PlotItem {
-  inPlot: boolean;
-  colour: string;
-}
-
 export interface PlotConfig {
-  detector: PlotItem;
-  beamstop: PlotItem;
-  cameraTube: PlotItem;
-  clearnace: PlotItem;
+  detector: boolean;
+  beamstop: boolean;
+  cameraTube: boolean;
+  clearnace: boolean;
   qrange: boolean;
   mask: boolean;
   calibrantInPlot: boolean;
@@ -25,10 +20,10 @@ export interface PlotConfig {
 }
 
 export const usePlotStore = create<PlotConfig>((set) => ({
-  detector: { inPlot: false, colour: "red" },
-  beamstop: { inPlot: true, colour: "blue" },
-  cameraTube: { inPlot: true, colour: "green" },
-  clearnace: { inPlot: true, colour: "pink" },
+  detector: true,
+  beamstop: true,
+  cameraTube: true,
+  clearnace: true,
   qrange: true,
   mask: false,
   calibrantInPlot: false,

diff --git a/src/presets/detectors.json b/src/presets/detectors.json
@@ -6,11 +6,18 @@
     },
     "pixelSize": 0.172
   },
+  "long boy": {
+    "resolution": {
+      "width": 1475,
+      "height": 679
+    },
+    "pixelSize": 0.172
+  },
   "test": {
     "resolution": {
       "width": 1,
       "height": 1
     },
     "pixelSize": 1
   }
-}
+}