diff --git a/src/basicAppBar.tsx b/src/basicAppBar.tsx index bfa71ce..2918740 100644 --- a/src/basicAppBar.tsx +++ b/src/basicAppBar.tsx @@ -5,14 +5,36 @@ import Toolbar from "@mui/material/Toolbar"; import Typography from "@mui/material/Typography"; import IconButton from "@mui/material/IconButton"; import MenuIcon from "@mui/icons-material/Menu"; -import { Drawer } from "@mui/material"; +import { Autocomplete, Drawer, TextField } from "@mui/material"; import SideMenu from "./sideMenu"; +import { useBeamlineConfigStore } from "./data-entry/beamlineconfigStore"; +import { presetList } from "./presets/presetManager"; +import { useBeamstopStore } from "./data-entry/beamstopStore"; +import { useCameraTubeStore } from "./data-entry/cameraTubeStore"; +import { useDetectorStore } from "./data-entry/detectorStore"; export default function BasicAppBar(): JSX.Element { const [state, setState] = React.useState({ menuOpen: false }); const toggleDrawer = (open: boolean) => () => { setState({ menuOpen: open }); }; + + const preset = useBeamlineConfigStore((state) => state.preset); + const updateBeamstop = useBeamstopStore((state) => state.updateBeamstop); + const updateCameraTube = useCameraTubeStore((state) => state.updateCameraTube); + const updateBeamlineConfig = useBeamlineConfigStore((state) => state.updateBeamlineConfig); + const updatePreset = useBeamlineConfigStore((state) => state.updatePreset); + const updateDetector = useDetectorStore((state) => state.updateDetector); + const handlePreset = (preset: string) => { + const { beamstop, cameraTube, detector, ...beamlineConfig } = presetList[preset]; + updateDetector(detector); + updateBeamstop(beamstop); + updateCameraTube(cameraTube); + updateBeamlineConfig(beamlineConfig); + updatePreset(preset) + }; + + return ( @@ -45,6 +67,20 @@ export default function BasicAppBar(): JSX.Element { Dedi Web + ( + + )} + onChange={(_, value) => { + value ? handlePreset(value) : {}; + }} + /> diff --git a/src/data-entry/dataSideBar.tsx b/src/data-entry/dataSideBar.tsx index c51e413..d020e6d 100644 --- a/src/data-entry/dataSideBar.tsx +++ b/src/data-entry/dataSideBar.tsx @@ -16,10 +16,6 @@ import BeamStopDataEntry from "./beamstop"; import CameraTubeDataEntry from "./cameraTube"; import { useDetectorStore } from "./detectorStore"; import BeampropertiesDataEntry from "./beamProperties"; -import { presetList } from "../presets/presetManager"; -import { useBeamlineConfigStore } from "./beamlineconfigStore"; -import { useBeamstopStore } from "./beamstopStore"; -import { useCameraTubeStore } from "./cameraTubeStore"; export default function DataSideBar(): JSX.Element { const name = useDetectorStore((state) => state.name); @@ -35,44 +31,12 @@ export default function DataSideBar(): JSX.Element { const updateUnits = useDetectorStore((state) => state.updateUnits); const updateDetector = useDetectorStore((state) => state.updateDetector); - const preset = useBeamlineConfigStore((state) => state.preset); - const updateBeamstop = useBeamstopStore((state) => state.updateBeamstop) - const updateCameraTube = useCameraTubeStore((state) => state.updateCameraTube) - const updateBeamlineConfig = useBeamlineConfigStore((state) => state.updateBeamlineConfig) - const updatePreset = useBeamlineConfigStore((state) => state.updatePreset) - const handlePreset = (preset: string) => { - const { beamstop, cameraTube, detector, ...beamlineConfig } = presetList[preset]; - updateDetector(detector); - updateBeamstop(beamstop); - updateCameraTube(cameraTube); - updateBeamlineConfig(beamlineConfig); - updatePreset(preset) - } + return ( - Configuration - - Predefined Configuration Templates - - ( - - )} - onChange={(_, value) => { - value ? handlePreset(value) : {}; - }} - /> - - Detector