Skip to content

47 adding coordinate system #55

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

Merged
merged 8 commits into from
Jul 23, 2025
Merged

47 adding coordinate system #55

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d71c69
Made template of Buttons in a grid and dialog box pop up
Jul 9, 2025
a19e92d
Styled buttons and added plans onClick
Jul 10, 2025
37ec133
Styled button sizes to match and look consistent. Also put some infor…
Jul 10, 2025
f93d5c8
Remove unnecessary import.
Jul 10, 2025
8d94777
Added image to preset explanation
Jul 21, 2025
5cb0765
Merge remote-tracking branch 'origin/main' into 47-Adding_Coordinate_…
Jul 21, 2025
9ff3f8b
Merge branch 'main' into 47-Adding_Coordinate_System
Jul 22, 2025
e1a15e6
Smaller buttons, fixed text and fixed image location
Jul 23, 2025
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
4 changes: 4 additions & 0 deletions public/Oxford Chip Diagram.excalidraw.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
157 changes: 155 additions & 2 deletions src/screens/OavMover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
import {
Box,
Button,
Drawer,
Dialog,
DialogContent,
DialogTitle,
Grid2,
IconButton,
Stack,
TextField,
Tooltip,
Typography,
useTheme,
Drawer,
Tooltip,
} from "@mui/material";
import { OavVideoStream } from "../components/OavVideoStream";
import {
ArrowBackRounded,
ArrowDownwardRounded,
ArrowForwardRounded,
ArrowUpwardRounded,
Close,
Help,
} from "@mui/icons-material";
import { useState } from "react";

Expand Down Expand Up @@ -258,6 +265,149 @@ export function SideDrawer() {
);
}

export function CoordinateSystem() {
const [open, setOpen] = React.useState(false);

const handleClickOpen = () => {
setOpen(true);
};
const handleClose = () => {
setOpen(false);
};

const buttonStyle = {
color: "white",
margin: "5px",
padding: "15px",
backgroundColor: "#1c2025",
width: "100%",
height: "95%",
};

return (
<>
<Box>
<Grid2 container spacing={1}>
<Grid2 size={10}>
<b>Co-ordinate System Setup</b>
</Grid2>
<Grid2>
<Help onClick={handleClickOpen} />
</Grid2>
<Grid2 size={4}>
<Button
style={buttonStyle}
onClick={() =>
submitAndRunPlanImmediately("moveto", {
place: "zero",
})
}
>
Go to Origin
</Button>
</Grid2>
<Grid2 size={4}>
<Button
style={buttonStyle}
onClick={() =>
submitAndRunPlanImmediately("moveto", {
place: "f1",
})
}
>
Go to Fiducial 1
</Button>
</Grid2>
<Grid2 size={4}>
<Button
style={buttonStyle}
onClick={() =>
submitAndRunPlanImmediately("moveto", {
place: "f2",
})
}
>
Go to Fiducial 2
</Button>
</Grid2>
<Grid2 size={4}>
<Button style={buttonStyle}>Set Fiducial 0</Button>
</Grid2>
<Grid2 size={4}>
<Button
style={buttonStyle}
onClick={() =>
submitAndRunPlanImmediately("fiducial", {
point: "1",
})
}
>
Set Fiducial 1
</Button>
</Grid2>
<Grid2 size={4}>
<Button
style={buttonStyle}
onClick={() =>
submitAndRunPlanImmediately("fiducial", {
point: "2",
})
}
>
Set Fiducial 2
</Button>
</Grid2>
<Grid2 size={6}>
<Button
style={buttonStyle}
onClick={() => submitAndRunPlanImmediately("cs_maker", {})}
>
Make Coordinate System
</Button>
</Grid2>
<Grid2 size={6}>
<Button
style={buttonStyle}
onClick={() => submitAndRunPlanImmediately("block_check", {})}
>
Block Check
</Button>
</Grid2>
</Grid2>
</Box>
<Dialog
onClose={handleClose}
aria-labelledby="customized-dialog-title"
open={open}
>
<DialogTitle sx={{ m: 0, p: 2 }} id="customized-dialog-title">
How to use Co-ordinate System Setup
</DialogTitle>
<IconButton
aria-label="close"
onClick={handleClose}
sx={(theme) => ({
position: "absolute",
right: 8,
top: 8,
color: theme.palette.grey[500],
})}
>
<Close />
</IconButton>
<DialogContent dividers>
<img src="Oxford Chip Diagram.excalidraw.svg" alt="" />
<Typography gutterBottom>
This only works for an Oxford chip. Fiducial 0 is the origin, the
top left corner. Fiducial 1 is the top right corner and Fiducial 2
is the bottom left corner.
</Typography>
</DialogContent>
</Dialog>
</>
);
}

export function OavMover() {
const [crosshairX, setCrosshairX] = useState<number>(200);
const [crosshairY, setCrosshairY] = useState<number>(200);
Expand Down Expand Up @@ -309,6 +459,9 @@ export function OavMover() {
label="zoom-level"
pv="ca://BL24I-EA-OAV-01:FZOOM:MP:SELECT"
/>
<hr />
<CoordinateSystem />
<hr />
<SideDrawer />
</Grid2>
</Grid2>
Expand Down