diff --git a/src/app.tsx b/src/app.tsx index 54b2e32..0df7c49 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -8,7 +8,7 @@ export default function App(): JSX.Element { return ( - + @@ -20,7 +20,7 @@ export default function App(): JSX.Element { - - + + ); } diff --git a/src/components/basicAppBar.tsx b/src/components/basicAppBar.tsx index bfa71ce..129722f 100644 --- a/src/components/basicAppBar.tsx +++ b/src/components/basicAppBar.tsx @@ -8,6 +8,7 @@ import MenuIcon from "@mui/icons-material/Menu"; import { Drawer } from "@mui/material"; import SideMenu from "./sideMenu"; + export default function BasicAppBar(): JSX.Element { const [state, setState] = React.useState({ menuOpen: false }); const toggleDrawer = (open: boolean) => () => { diff --git a/src/components/dataSideBar.tsx b/src/components/dataSideBar.tsx index 1f14a77..af3b593 100644 --- a/src/components/dataSideBar.tsx +++ b/src/components/dataSideBar.tsx @@ -19,26 +19,8 @@ import { BeamlineConfig, DetectorType } from "../utils/types"; import React from "react"; import RemoveIcon from "@mui/icons-material/Remove"; import AddIcon from "@mui/icons-material/Add"; +import { DistanceUnits, EnergyUnits, WavelengthUnits, AngleUnits } from "../utils/units"; -enum DistanceUnits { - millimetre = "millimetre", - micrometre = "micrometre", -} - -enum EnergyUnits { - electronVolts = "electronVolts", - kiloElectronVolts = "kiloElectronVolts", -} - -enum WavelengthUnits { - nanmometres = "nanometeres", - angstroms = "angstroms", -} - -enum AngleUnits { - radians = "radians", - degrees = "degrees", -} export default function DataSideBar(): JSX.Element { const [cameraDiameterUnits, setCameraDiameterUnits] = @@ -104,7 +86,7 @@ export default function DataSideBar(): JSX.Element { }; return ( - + Configuration @@ -112,6 +94,7 @@ export default function DataSideBar(): JSX.Element { Predefined Configuration Templates Detector units @@ -157,31 +142,30 @@ export default function DataSideBar(): JSX.Element { units - - Position - - x: - px - - - y: - px - - - + Position + + x: + px + + + + y: + px + Clearance @@ -190,13 +174,14 @@ export default function DataSideBar(): JSX.Element { units @@ -208,13 +193,13 @@ export default function DataSideBar(): JSX.Element { units @@ -235,12 +220,13 @@ export default function DataSideBar(): JSX.Element { units @@ -249,13 +235,13 @@ export default function DataSideBar(): JSX.Element { units @@ -272,6 +258,7 @@ export default function DataSideBar(): JSX.Element { value={cameraLength} />