Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

everything working but the math :)

jonmatthisd321e6d1b34e
diff --git a/freemocap-ui/src/components/camera-views/CameraImage.tsx b/freemocap-ui/src/components/camera-views/CameraImage.tsx
new file mode 100644
index 00000000..9305707c
--- /dev/null
+++ b/freemocap-ui/src/components/camera-views/CameraImage.tsx
@@ -0,0 +1,52 @@
+import { Box, Typography } from "@mui/material";
+import React from "react";
+
+interface CameraImageProps {
+ cameraId: string;
+ base64Image: string;
+ showAnnotation: boolean;
+}
+
+export const CameraImage = ({ cameraId, base64Image, showAnnotation }: CameraImageProps) => {
+ return (
+ <Box
+ key={cameraId}
+ sx={{
+ position: "relative",
+ display: "flex",
+ justifyContent: "center",
+ alignItems: "center",
+ flexBasis: "calc(50% - 5px)",
+ margin: "1px",
+ boxSizing: "border-box"
+ }}
+ >
+ <img
+ src={`data:image/jpeg;base64,${base64Image}`}
+ alt={`Camera ${cameraId}`}
+ style={{
+ width: "100%",
+ height: "auto",
+ maxHeight: "100%",
+ objectFit: "contain"
+ }}
+ />
+ {showAnnotation && (
+ <Typography
+ variant="caption"
+ sx={{
+ position: "absolute",
+ bottom: 8,
+ left: 8,
+ color: "white",
+ backgroundColor: "rgba(0, 0, 0, 0.5)",
+ padding: "2px 4px",
+ borderRadius: "4px"
+ }}
+ >
+ {cameraId}
+ </Typography>
+ )}
+ </Box>
+ );
+};
diff --git a/freemocap-ui/src/components/camera-views/CameraImagesGrid.tsx b/freemocap-ui/src/components/camera-views/CameraImagesGrid.tsx
new file mode 100644
index 00000000..e484032f
--- /dev/null
+++ b/freemocap-ui/src/components/camera-views/CameraImagesGrid.tsx
@@ -0,0 +1,30 @@
+import { Box } from "@mui/material";
+import React from "react";
+import {CameraImage} from "@/components/camera-views/CameraImage";
+
+interface CameraImagesGridProps {
+ images: { [cameraId: string]: string };
+ showAnnotation: boolean;
+}
+
+export const CameraImagesGrid = ({ images, showAnnotation }: CameraImagesGridProps) => {
+ return (
+ <Box
+ sx={{
+ display: "flex",
+ flexDirection: "row",
+ flexWrap: "wrap",
+ flexGrow: 1,
+ justifyContent: "center",
+ alignItems: "center",
+ overflow: "hidden"
+ }}
+ >
+ {Object.entries(images).map(([cameraId, base64Image]) =>
+ base64Image ? (
+ <CameraImage key={cameraId} cameraId={cameraId} base64Image={base64Image} showAnnotation={showAnnotation} />
+ ) : null
+ )}
+ </Box>
+ );
+};
diff --git a/freemocap-ui/src/components/webcam/webcam-capture.tsx b/freemocap-ui/src/components/old_webcam/webcam-capture.tsx
similarity index 100%
rename from freemocap-ui/src/components/webcam/webcam-capture.tsx
rename to freemocap-ui/src/components/old_webcam/webcam-capture.tsx
diff --git a/freemocap-ui/src/components/webcam/webcam.tsx b/freemocap-ui/src/components/old_webcam/webcam.tsx
similarity index 100%
rename from freemocap-ui/src/components/webcam/webcam.tsx
rename to freemocap-ui/src/components/old_webcam/webcam.tsx
diff --git a/freemocap-ui/src/components/ConnectToCamerasButton.tsx b/freemocap-ui/src/components/ui-components/ConnectToCamerasButton.tsx
similarity index 100%
rename from freemocap-ui/src/components/ConnectToCamerasButton.tsx
rename to freemocap-ui/src/components/ui-components/ConnectToCamerasButton.tsx
diff --git a/freemocap-ui/src/layout/Copyright.tsx b/freemocap-ui/src/components/ui-components/Copyright.tsx
similarity index 100%
rename from freemocap-ui/src/layout/Copyright.tsx
rename to freemocap-ui/src/components/ui-components/Copyright.tsx
diff --git a/freemocap-ui/src/layout/Header.tsx b/freemocap-ui/src/components/ui-components/Header.tsx
similarity index 100%
rename from freemocap-ui/src/layout/Header.tsx
rename to freemocap-ui/src/components/ui-components/Header.tsx
diff --git a/freemocap-ui/src/layout/Sidebar.tsx b/freemocap-ui/src/components/ui-components/Sidebar.tsx
similarity index 92%
rename from freemocap-ui/src/layout/Sidebar.tsx
rename to freemocap-ui/src/components/ui-components/Sidebar.tsx
index 0203896f..fcbb1f5b 100644
--- a/freemocap-ui/src/layout/Sidebar.tsx
+++ b/freemocap-ui/src/components/ui-components/Sidebar.tsx
@@ -5,12 +5,10 @@ import List from '@mui/material/List';
import Box from '@mui/material/Box';
import ListItem from '@mui/material/ListItem';
import ListItemButton from '@mui/material/ListItemButton';
-import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
-import HomeIcon from '@mui/icons-material/Home';
import {useNavigate} from "react-router";
-import WebsocketConnectionStatus from "@/components/WebsocketConnectionStatus";
-import {ConnectToCamerasButton} from "@/components/ConnectToCamerasButton";
+import WebsocketConnectionStatus from "@/components/ui-components/WebsocketConnectionStatus";
+import {ConnectToCamerasButton} from "@/components/ui-components/ConnectToCamerasButton";
const sidebarItems = [
{
diff --git a/freemocap-ui/src/components/WebsocketConnectionStatus.tsx b/freemocap-ui/src/components/ui-components/WebsocketConnectionStatus.tsx
similarity index 100%
rename from freemocap-ui/src/components/WebsocketConnectionStatus.tsx
rename to freemocap-ui/src/components/ui-components/WebsocketConnectionStatus.tsx
diff --git a/freemocap-ui/src/layout/content/BaseContent.tsx b/freemocap-ui/src/layout/content/BaseContent.tsx
index 08417174..80d276dc 100644
--- a/freemocap-ui/src/layout/content/BaseContent.tsx
+++ b/freemocap-ui/src/layout/content/BaseContent.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import {Header} from "../Header";
+import {Header} from "../../components/ui-components/Header";
import Box from "@mui/material/Box";
import {Router} from "../routing/router";
diff --git a/freemocap-ui/src/layout/paperbase_theme/Paperbase.tsx b/freemocap-ui/src/layout/paperbase_theme/Paperbase.tsx
index 826b8a7f..eb12737b 100644
--- a/freemocap-ui/src/layout/paperbase_theme/Paperbase.tsx
+++ b/freemocap-ui/src/layout/paperbase_theme/Paperbase.tsx
@@ -5,9 +5,9 @@ import Box from '@mui/material/Box';
import {HashRouter} from 'react-router-dom';
import {CssBaseline} from "@mui/material";
import paperbaseTheme from '../content/paperbase-theme';
-import {Sidebar} from "@/layout/Sidebar";
+import {Sidebar} from "@/components/ui-components/Sidebar";
import {BaseContent} from "@/layout/content/BaseContent";
-import {Copyright} from "@/layout/Copyright";
+import {Copyright} from "@/components/ui-components/Copyright";
import IconButton from "@mui/material/IconButton";
import MenuIcon from "@mui/icons-material/Menu";
diff --git a/freemocap-ui/src/layout/routing/router.tsx b/freemocap-ui/src/layout/routing/router.tsx
index dc5fd4b8..0b38b49d 100644
--- a/freemocap-ui/src/layout/routing/router.tsx
+++ b/freemocap-ui/src/layout/routing/router.tsx
@@ -5,7 +5,7 @@ import {BrowserCamerasView} from "@/views/BrowserCamerasView";
import {PythonToJsTest} from "@/views/PythonToJsTest";
import {PythonCamerasView} from "@/views/PythonCamerasView";
import {DefaultView} from "@/views/Default";
-import WebsocketConnectionStatus from "@/components/WebsocketConnectionStatus";
+import WebsocketConnectionStatus from "@/components/ui-components/WebsocketConnectionStatus";
import {Viewport3d} from "@/views/Viewport3d";
export const Router = () => {
diff --git a/freemocap-ui/src/views/PythonCamerasView.tsx b/freemocap-ui/src/views/PythonCamerasView.tsx
index fb63ef01..60a76ab4 100644
--- a/freemocap-ui/src/views/PythonCamerasView.tsx
+++ b/freemocap-ui/src/views/PythonCamerasView.tsx
@@ -1,55 +1,34 @@
-import {Box, Button} from "@mui/material";
-import React from "react";
-import {ConnectToCamerasButton} from "@/components/ConnectToCamerasButton";
-import {useWebSocketContext} from "@/context/WebSocketContext";
-import {ThreeJSCanvas3d} from "@/components/viewport3d/ThreeJSCanvas3d";
+import { Box, Button } from "@mui/material";
+import React, { useState, useEffect } from "react";
+import { useWebSocketContext } from "@/context/WebSocketContext";
+import {CameraImagesGrid} from "@/components/camera-views/CameraImagesGrid";
+
+
export const PythonCamerasView = () => {
- const { latestFrontendPayload } = useWebSocketContext();
+ const {latestImages} = useWebSocketContext();
+ const [showAnnotation, setShowAnnotation] = useState(true);
+ const toggleAnnotation = () => {
+ setShowAnnotation(prev => !prev);
+ };
+
+ useEffect(() => {
+ const handleKeyDown = (event: KeyboardEvent) => {
+ if (event.key === 'a') {
+ toggleAnnotation();
+ }
+ };
+
+ window.addEventListener('keydown', handleKeyDown);
+ return () => {
+ window.removeEventListener('keydown', handleKeyDown);
+ };
+ }, []);
return (
<Box sx={{ display: "flex", flexDirection: "column", height: "70vh" }}>
- {latestFrontendPayload && latestFrontendPayload.jpeg_images && (
- <Box
- sx={{
- display: "flex",
- flexDirection: "row",
- flexWrap: "wrap",
- flexGrow: 1,
- justifyContent: "center",
- alignItems: "center",
- overflow: "hidden"
- }}
- >
- {Object.entries(latestFrontendPayload.jpeg_images).map(([cameraId, base64Image]) => (
- base64Image ? (
- <Box
- key={cameraId}
- sx={{
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- flexBasis: "calc(50% - 5px)",
- margin: "1px",
- boxSizing: "border-box"
- }}
- >
- <img
- src={`data:image/jpeg;base64,${base64Image}`}
- alt={`Camera ${cameraId}`}
- style={{
- width: "100%",
- height: "auto",
- maxHeight: "100%",
- objectFit: "contain"
- }}
- />
- </Box>
- ) : null
- ))}
- </Box>
+ {latestImages && (
+ <CameraImagesGrid images={latestImages} showAnnotation={showAnnotation} />
)}
-
-
</Box>
);
-}
+};
diff --git a/freemocap-ui/src/views/Viewport3d.tsx b/freemocap-ui/src/views/Viewport3d.tsx
index 114966a1..9d2eb2a3 100644
--- a/freemocap-ui/src/views/Viewport3d.tsx
+++ b/freemocap-ui/src/views/Viewport3d.tsx
@@ -1,6 +1,6 @@
import {Box, Button} from "@mui/material";
import React from "react";
-import {ConnectToCamerasButton} from "@/components/ConnectToCamerasButton";
+import {ConnectToCamerasButton} from "@/components/ui-components/ConnectToCamerasButton";
import {useWebSocketContext} from "@/context/WebSocketContext";
import {ThreeJSCanvas3d} from "@/components/viewport3d/ThreeJSCanvas3d";
export const Viewport3d = () => {