diff --git a/src/plot/centrePlot.tsx b/src/plot/centrePlot.tsx index 606996c..305ee1b 100644 --- a/src/plot/centrePlot.tsx +++ b/src/plot/centrePlot.tsx @@ -3,16 +3,20 @@ import { DataToHtml, DefaultInteractions, ResetZoomButton, - SvgCircle, - SvgRect, - SvgLine, SvgElement, VisCanvas, } from "@h5web/lib" import { Vector3 } from "three"; +import { useBeamstopStore } from "../data-entry/beamstopStore"; +import { useDetectorStore } from "../data-entry/detectorStore"; +import { useCameraTubeStore } from "../data-entry/cameraTubeStore"; export default function CentrePlot(): JSX.Element { + const beamstop = useBeamstopStore(); + const detector = useDetectorStore(); + const cameraTube = useCameraTubeStore(); + return ( @@ -20,38 +24,27 @@ export default function CentrePlot(): JSX.Element {
- {(pt1: Vector3, pt2: Vector3, pt3: Vector3, pt4: Vector3, pt5: Vector3, pt6: Vector3) => ( + {(beamstopCentre: Vector3, BeamstopDiameter: Vector3, clearnace: Vector3, cameraTubeCentre: Vector3, cameraTubeDiameter: Vector3, detectorResolution: Vector3) => ( - - - - + + + + )} @@ -61,4 +54,4 @@ export default function CentrePlot(): JSX.Element { ); -} \ No newline at end of file +} diff --git a/src/plot/legendBar.tsx b/src/plot/legendBar.tsx index 6679638..fc2227a 100644 --- a/src/plot/legendBar.tsx +++ b/src/plot/legendBar.tsx @@ -2,17 +2,25 @@ import { Card, CardContent, Checkbox, + Divider, + FormControl, FormControlLabel, FormGroup, + FormLabel, + Radio, + RadioGroup, Stack, Typography, } from "@mui/material"; +import { + PlotAxes +} from "./plotStore"; export default function LegendBar(): JSX.Element { return ( - + Legend Add something to do with colors here @@ -23,7 +31,21 @@ export default function LegendBar(): JSX.Element { } label="Mask" /> } label="Calibrant" /> - Currently selected Calibrant is: {5} + + Calibrant: {5} + + + Axes: + + } label="Axes in mm" /> + } label="Axes in pixels" /> + } label="Axes in q(nm^-1)" /> + + diff --git a/src/sideMenu.tsx b/src/sideMenu.tsx index fdf8430..7ac238f 100644 --- a/src/sideMenu.tsx +++ b/src/sideMenu.tsx @@ -10,7 +10,17 @@ export default function SideMenu() { - Settings + Add New detector + + + + + Add New detector + + + + + Save current config as preset