Compare commits
6 Commits
feature/in
...
feature/di
| Author | SHA1 | Date | |
|---|---|---|---|
| 06fe99b550 | |||
| 328c61cf98 | |||
| a9f6c4a4ad | |||
| 59e09b7a8d | |||
| c6a336389b | |||
| b93b446614 |
@@ -21,13 +21,15 @@
|
|||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"formik": "^2.4.9",
|
"formik": "^2.4.9",
|
||||||
"konva": "^10.0.11",
|
"konva": "^10.0.11",
|
||||||
|
"rc-slider": "^11.1.9",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0",
|
"react-dom": "^19.2.0",
|
||||||
"react-konva": "^19.2.0",
|
"react-konva": "^19.2.0",
|
||||||
"react-modal": "^3.16.3",
|
"react-modal": "^3.16.3",
|
||||||
"react-tabs": "^6.1.0",
|
"react-tabs": "^6.1.0",
|
||||||
"react-use-websocket": "3.0.0",
|
"react-use-websocket": "3.0.0",
|
||||||
"sonner": "^2.0.7"
|
"sonner": "^2.0.7",
|
||||||
|
"use-debounce": "^10.0.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.39.1",
|
"@eslint/js": "^9.39.1",
|
||||||
|
|||||||
@@ -3,9 +3,14 @@ import { CameraFeedContext } from "../context/CameraFeedContext";
|
|||||||
import { initialState, reducer } from "../reducers/cameraFeedReducer";
|
import { initialState, reducer } from "../reducers/cameraFeedReducer";
|
||||||
import { useBlackBoard } from "../../hooks/useBlackBoard";
|
import { useBlackBoard } from "../../hooks/useBlackBoard";
|
||||||
import type { CameraFeedState } from "../../types/types";
|
import type { CameraFeedState } from "../../types/types";
|
||||||
|
import { useCameraZoom } from "../../features/cameras/hooks/useCameraZoom";
|
||||||
|
|
||||||
export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
|
export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
|
||||||
const { blackboardMutation } = useBlackBoard();
|
const { blackboardMutation } = useBlackBoard();
|
||||||
|
const { cameraZoomQuery: cameraZoomQueryA } = useCameraZoom("A");
|
||||||
|
const { cameraZoomQuery: cameraZoomQueryB } = useCameraZoom("B");
|
||||||
|
const { cameraZoomQuery: cameraZoomQueryC } = useCameraZoom("C");
|
||||||
|
|
||||||
const [state, dispatch] = useReducer(reducer, initialState);
|
const [state, dispatch] = useReducer(reducer, initialState);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -29,5 +34,42 @@ export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
|
|||||||
fetchBlackBoardData();
|
fetchBlackBoardData();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const fetchZoomLevels = async () => {
|
||||||
|
const [resultA, resultB, resultC] = await Promise.all([
|
||||||
|
cameraZoomQueryA.refetch(),
|
||||||
|
cameraZoomQueryB.refetch(),
|
||||||
|
cameraZoomQueryC.refetch(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
console.log(resultA?.data);
|
||||||
|
const zoomLevelAnumber = parseFloat(resultA.data?.propPhysCurrent?.value);
|
||||||
|
const zoomLevelBnumber = parseFloat(resultB.data?.propPhysCurrent?.value);
|
||||||
|
const zoomLevelCnumber = parseFloat(resultC.data?.propPhysCurrent?.value);
|
||||||
|
|
||||||
|
if (resultA.data) {
|
||||||
|
dispatch({
|
||||||
|
type: "SET_ZOOM_LEVEL",
|
||||||
|
payload: { cameraFeedID: "A", zoomLevel: zoomLevelAnumber },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resultB.data) {
|
||||||
|
dispatch({
|
||||||
|
type: "SET_ZOOM_LEVEL",
|
||||||
|
payload: { cameraFeedID: "B", zoomLevel: zoomLevelBnumber },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resultC.data) {
|
||||||
|
dispatch({
|
||||||
|
type: "SET_ZOOM_LEVEL",
|
||||||
|
payload: { cameraFeedID: "C", zoomLevel: zoomLevelCnumber },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
fetchZoomLevels();
|
||||||
|
}, []);
|
||||||
|
|
||||||
return <CameraFeedContext.Provider value={{ state, dispatch }}>{children}</CameraFeedContext.Provider>;
|
return <CameraFeedContext.Provider value={{ state, dispatch }}>{children}</CameraFeedContext.Provider>;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -37,6 +37,11 @@ export const initialState: CameraFeedState = {
|
|||||||
B: "painter",
|
B: "painter",
|
||||||
C: "painter",
|
C: "painter",
|
||||||
},
|
},
|
||||||
|
zoomLevel: {
|
||||||
|
A: 1,
|
||||||
|
B: 1,
|
||||||
|
C: 1,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export function reducer(state: CameraFeedState, action: CameraFeedAction) {
|
export function reducer(state: CameraFeedState, action: CameraFeedAction) {
|
||||||
@@ -106,7 +111,14 @@ export function reducer(state: CameraFeedState, action: CameraFeedAction) {
|
|||||||
return {
|
return {
|
||||||
...initialState,
|
...initialState,
|
||||||
};
|
};
|
||||||
|
case "SET_ZOOM_LEVEL":
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
zoomLevel: {
|
||||||
|
...state.zoomLevel,
|
||||||
|
[action.payload.cameraFeedID]: action.payload.zoomLevel,
|
||||||
|
},
|
||||||
|
};
|
||||||
default:
|
default:
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Tabs, Tab, TabList, TabPanel } from "react-tabs";
|
|||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
|
import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
|
||||||
import RegionSelector from "./RegionSelector";
|
import RegionSelector from "./RegionSelector";
|
||||||
|
import CameraControls from "./cameraControls/CameraControls";
|
||||||
|
|
||||||
type CameraPanelProps = {
|
type CameraPanelProps = {
|
||||||
tabIndex: number;
|
tabIndex: number;
|
||||||
@@ -54,10 +55,7 @@ const CameraPanel = ({ tabIndex, isResetAllModalOpen, handleClose, setIsResetMod
|
|||||||
/>
|
/>
|
||||||
</TabPanel>
|
</TabPanel>
|
||||||
<TabPanel>
|
<TabPanel>
|
||||||
<div className="p-4">
|
<CameraControls cameraFeedID={cameraFeedID} />
|
||||||
<h2 className="text-lg font-semibold mb-4">Camera Controls</h2>
|
|
||||||
<p>Controls for camera {cameraFeedID} will go here.</p>
|
|
||||||
</div>
|
|
||||||
</TabPanel>
|
</TabPanel>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -174,6 +174,27 @@ const RegionSelector = ({
|
|||||||
/>
|
/>
|
||||||
<span className="text-xl">Erase mode</span>
|
<span className="text-xl">Erase mode</span>
|
||||||
</label>
|
</label>
|
||||||
|
<label
|
||||||
|
htmlFor="zoomMode"
|
||||||
|
className={`p-4 border rounded-lg mb-2
|
||||||
|
${mode === "zoom" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
|
||||||
|
hover:bg-[#202b36] hover:cursor-pointer`}
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
id="zoomMode"
|
||||||
|
type="radio"
|
||||||
|
onChange={handleChange}
|
||||||
|
checked={mode === "zoom"}
|
||||||
|
value="zoom"
|
||||||
|
className="sr-only"
|
||||||
|
/>
|
||||||
|
<div className="flex flex-col space-y-3">
|
||||||
|
<span className="text-xl">Enlarge image</span>
|
||||||
|
{mode === "zoom" && (
|
||||||
|
<small className={`text-gray-400 italic`}>Use mouse to digitally zoom in and out</small>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
import { useCameraFeedContext } from "../../../../../app/context/CameraFeedContext";
|
||||||
|
import SliderComponent from "../../../../../ui/SliderComponent";
|
||||||
|
import { useCameraZoom } from "../../../hooks/useCameraZoom";
|
||||||
|
import { useDebouncedCallback } from "use-debounce";
|
||||||
|
|
||||||
|
type CameraControlsProps = {
|
||||||
|
cameraFeedID: "A" | "B" | "C";
|
||||||
|
};
|
||||||
|
|
||||||
|
const CameraControls = ({ cameraFeedID }: CameraControlsProps) => {
|
||||||
|
const { state, dispatch } = useCameraFeedContext();
|
||||||
|
const { cameraZoomMutation } = useCameraZoom(cameraFeedID);
|
||||||
|
|
||||||
|
const zoomLevel = state.zoomLevel ? state.zoomLevel[cameraFeedID] : 1;
|
||||||
|
const debouncedMutation = useDebouncedCallback(async (value) => {
|
||||||
|
await cameraZoomMutation.mutateAsync({
|
||||||
|
cameraFeedID,
|
||||||
|
zoomLevel: value as number,
|
||||||
|
});
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
const handleChange = (value: number | number[]) => {
|
||||||
|
const newZoom = value as number;
|
||||||
|
dispatch({
|
||||||
|
type: "SET_ZOOM_LEVEL",
|
||||||
|
payload: { cameraFeedID: cameraFeedID, zoomLevel: value as number },
|
||||||
|
});
|
||||||
|
debouncedMutation(newZoom);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
|
||||||
|
<h2 className="text-2xl mb-4">Camera {cameraFeedID}</h2>
|
||||||
|
<div className="w-[70%] ">
|
||||||
|
<label htmlFor="zoom">Zoom {zoomLevel} </label>
|
||||||
|
<SliderComponent id="zoom" onChange={handleChange} value={zoomLevel} min={1} max={3} step={0.1} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default CameraControls;
|
||||||
@@ -23,6 +23,10 @@ const VideoFeedGridPainter = () => {
|
|||||||
const { latestBitmapRef, isloading } = useCreateVideoSnapshot();
|
const { latestBitmapRef, isloading } = useCreateVideoSnapshot();
|
||||||
const [stageSize, setStageSize] = useState({ width: BACKEND_WIDTH, height: BACKEND_HEIGHT });
|
const [stageSize, setStageSize] = useState({ width: BACKEND_WIDTH, height: BACKEND_HEIGHT });
|
||||||
const isDrawingRef = useRef(false);
|
const isDrawingRef = useRef(false);
|
||||||
|
const [scale, setScale] = useState(1);
|
||||||
|
const [position, setPosition] = useState({ x: 0, y: 0 });
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
const stageRef = useRef<any>(null);
|
||||||
|
|
||||||
const currentScale = stageSize.width / BACKEND_WIDTH;
|
const currentScale = stageSize.width / BACKEND_WIDTH;
|
||||||
const size = BACKEND_CELL_SIZE * currentScale;
|
const size = BACKEND_CELL_SIZE * currentScale;
|
||||||
@@ -71,14 +75,14 @@ const VideoFeedGridPainter = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleStageMouseDown = (e: KonvaEventObject<MouseEvent>) => {
|
const handleStageMouseDown = (e: KonvaEventObject<MouseEvent>) => {
|
||||||
if (!regions[selectedRegionIndex]) return;
|
if (!regions[selectedRegionIndex] || mode === "zoom") return;
|
||||||
isDrawingRef.current = true;
|
isDrawingRef.current = true;
|
||||||
const pos = e.target.getStage()?.getPointerPosition();
|
const pos = e.target.getStage()?.getPointerPosition();
|
||||||
if (pos) paintCell(pos.x, pos.y);
|
if (pos) paintCell(pos.x, pos.y);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleStageMouseMove = (e: KonvaEventObject<MouseEvent>) => {
|
const handleStageMouseMove = (e: KonvaEventObject<MouseEvent>) => {
|
||||||
if (!isDrawingRef.current) return;
|
if (!isDrawingRef.current || mode === "zoom") return;
|
||||||
if (!regions[selectedRegionIndex]) return;
|
if (!regions[selectedRegionIndex]) return;
|
||||||
const pos = e.target.getStage()?.getPointerPosition();
|
const pos = e.target.getStage()?.getPointerPosition();
|
||||||
if (pos) paintCell(pos.x, pos.y);
|
if (pos) paintCell(pos.x, pos.y);
|
||||||
@@ -88,6 +92,38 @@ const VideoFeedGridPainter = () => {
|
|||||||
isDrawingRef.current = false;
|
isDrawingRef.current = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleMouseEnter = () => {
|
||||||
|
if (mode !== "zoom") return;
|
||||||
|
setScale(2);
|
||||||
|
};
|
||||||
|
const handleMouseLeave = () => {
|
||||||
|
document.body.style.cursor = "default";
|
||||||
|
setScale(1);
|
||||||
|
setPosition({ x: 0, y: 0 });
|
||||||
|
};
|
||||||
|
const handleMouseMove = (e: KonvaEventObject<MouseEvent>) => {
|
||||||
|
if (scale === 1) return;
|
||||||
|
|
||||||
|
const stage = e.target.getStage();
|
||||||
|
if (!stage) return;
|
||||||
|
|
||||||
|
const pointerPosition = stage.getPointerPosition();
|
||||||
|
if (!pointerPosition) return;
|
||||||
|
|
||||||
|
const newX = stageSize.width / 2 - pointerPosition.x * scale;
|
||||||
|
const newY = stageSize.height / 2 - pointerPosition.y * scale;
|
||||||
|
|
||||||
|
const maxX = 0;
|
||||||
|
const minX = stageSize.width - stageSize.width * scale;
|
||||||
|
const maxY = 0;
|
||||||
|
const minY = stageSize.height - stageSize.height * scale;
|
||||||
|
|
||||||
|
setPosition({
|
||||||
|
x: Math.max(minX, Math.min(maxX, newX)),
|
||||||
|
y: Math.max(minY, Math.min(maxY, newY)),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleResize = () => {
|
const handleResize = () => {
|
||||||
const width = window.innerWidth;
|
const width = window.innerWidth;
|
||||||
@@ -112,48 +148,57 @@ const VideoFeedGridPainter = () => {
|
|||||||
|
|
||||||
if (image === null || isloading) return <span className="text-slate-500">Loading Video feed…</span>;
|
if (image === null || isloading) return <span className="text-slate-500">Loading Video feed…</span>;
|
||||||
return (
|
return (
|
||||||
<div
|
<div>
|
||||||
className={`w-full md:row-span-3 md:col-span-3 ${mode === "painter" ? "hover:cursor-crosshair" : ""} ${
|
|
||||||
mode === "eraser" ? "hover:cursor-pointer" : ""
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<Stage
|
<Stage
|
||||||
|
ref={stageRef}
|
||||||
width={stageSize.width}
|
width={stageSize.width}
|
||||||
height={stageSize.height}
|
height={stageSize.height}
|
||||||
onMouseDown={handleStageMouseDown}
|
onMouseDown={handleStageMouseDown}
|
||||||
onMouseMove={handleStageMouseMove}
|
onMouseMove={handleStageMouseMove}
|
||||||
onMouseUp={handleStageMouseUp}
|
onMouseUp={handleStageMouseUp}
|
||||||
onMouseLeave={handleStageMouseUp}
|
onMouseLeave={handleStageMouseUp}
|
||||||
className="max-w-[55%]"
|
className={`max-w-[55%] md:row-span-3 md:col-span-3 ${mode === "painter" ? "hover:cursor-crosshair" : ""} ${
|
||||||
|
mode === "eraser" ? "hover:cursor-pointer" : ""
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
<Layer>
|
<Layer
|
||||||
|
scaleX={scale}
|
||||||
|
scaleY={scale}
|
||||||
|
onMouseEnter={handleMouseEnter}
|
||||||
|
onMouseLeave={handleMouseLeave}
|
||||||
|
onMouseMove={handleMouseMove}
|
||||||
|
x={position.x}
|
||||||
|
y={position.y}
|
||||||
|
>
|
||||||
<Image image={image} width={stageSize.width} height={stageSize.height} classname={"rounded-lg"} />
|
<Image image={image} width={stageSize.width} height={stageSize.height} classname={"rounded-lg"} />
|
||||||
</Layer>
|
</Layer>
|
||||||
|
|
||||||
<Layer ref={paintLayerRef} opacity={0.6}>
|
<Layer ref={paintLayerRef} opacity={0.6}>
|
||||||
<Shape
|
{mode === "painter" || mode === "eraser" ? (
|
||||||
sceneFunc={(ctx, shape) => {
|
<Shape
|
||||||
const cells = paintedCells;
|
sceneFunc={(ctx, shape) => {
|
||||||
if (!cells || cells.size === 0 || !paintLayerRef.current) return;
|
const cells = paintedCells;
|
||||||
cells?.forEach((cell, key) => {
|
if (!cells || cells.size === 0 || !paintLayerRef.current) return;
|
||||||
const [rowStr, colStr] = key.split("-");
|
cells?.forEach((cell, key) => {
|
||||||
const row = Number(rowStr);
|
const [rowStr, colStr] = key.split("-");
|
||||||
const col = Number(colStr);
|
const row = Number(rowStr);
|
||||||
|
const col = Number(colStr);
|
||||||
|
|
||||||
const x = col * (size + gap);
|
const x = col * (size + gap);
|
||||||
const y = row * (size + gap);
|
const y = row * (size + gap);
|
||||||
|
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
ctx.rect(x, y, size, size);
|
ctx.rect(x, y, size, size);
|
||||||
ctx.fillStyle = cell.colour;
|
ctx.fillStyle = cell.colour;
|
||||||
ctx.fill();
|
ctx.fill();
|
||||||
});
|
});
|
||||||
|
|
||||||
ctx.fillStrokeShape(shape);
|
ctx.fillStrokeShape(shape);
|
||||||
}}
|
}}
|
||||||
width={stageSize.width}
|
width={stageSize.width}
|
||||||
height={stageSize.height}
|
height={stageSize.height}
|
||||||
/>
|
/>
|
||||||
|
) : null}
|
||||||
</Layer>
|
</Layer>
|
||||||
</Stage>
|
</Stage>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
48
src/features/cameras/hooks/useCameraZoom.ts
Normal file
48
src/features/cameras/hooks/useCameraZoom.ts
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
import { useQuery, useMutation } from "@tanstack/react-query";
|
||||||
|
import { CAMBASE } from "../../../utils/config";
|
||||||
|
import type { CameraZoomConfig } from "../../../types/types";
|
||||||
|
|
||||||
|
const fetchZoomLevel = async (cameraFeedID: string) => {
|
||||||
|
const response = await fetch(`${CAMBASE}/api/fetch-config?id=Camera${cameraFeedID}-onvif-controller`);
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error("Network response was not ok");
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const postZoomLevel = async (zoomConfig: CameraZoomConfig) => {
|
||||||
|
const fields = [
|
||||||
|
{ property: "propPhysCurrent", value: zoomConfig.zoomLevel },
|
||||||
|
{ property: "propCameraHost", value: "192.168.0.101" },
|
||||||
|
{ property: "propCameraPort", value: 80 },
|
||||||
|
{ property: "propCameraUsername", value: "administrator" },
|
||||||
|
{ property: "propCameraPassword", value: "MAV12345" },
|
||||||
|
];
|
||||||
|
const zoomPayload = {
|
||||||
|
id: `Camera${zoomConfig.cameraFeedID}-onvif-controller`,
|
||||||
|
fields,
|
||||||
|
};
|
||||||
|
console.log(zoomPayload);
|
||||||
|
const response = await fetch(`${CAMBASE}/api/update-config`, {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(zoomPayload),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error("Network response was not ok");
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useCameraZoom = (cameraFeedID: "A" | "B" | "C") => {
|
||||||
|
const cameraZoomQuery = useQuery({
|
||||||
|
queryKey: ["cameraZoom", cameraFeedID],
|
||||||
|
queryFn: () => fetchZoomLevel(cameraFeedID),
|
||||||
|
});
|
||||||
|
|
||||||
|
const cameraZoomMutation = useMutation({
|
||||||
|
mutationKey: ["postCameraZoom"],
|
||||||
|
mutationFn: (zoomConfig: CameraZoomConfig) => postZoomLevel(zoomConfig),
|
||||||
|
});
|
||||||
|
return { cameraZoomQuery, cameraZoomMutation };
|
||||||
|
};
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useQuery } from "@tanstack/react-query";
|
import { useQuery } from "@tanstack/react-query";
|
||||||
import { CAMBASE } from "../../../utils/config";
|
import { CAMBASE } from "../../../utils/config";
|
||||||
|
|
||||||
const getfeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
|
const targetDectionFeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
|
||||||
const response = await fetch(`${CAMBASE}/TargetDetectionColour${cameraFeedID}-preview`, {
|
const response = await fetch(`${CAMBASE}/TargetDetectionColour${cameraFeedID}-preview`, {
|
||||||
signal: AbortSignal.timeout(300000),
|
signal: AbortSignal.timeout(300000),
|
||||||
cache: "no-store",
|
cache: "no-store",
|
||||||
@@ -12,12 +12,31 @@ const getfeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
|
|||||||
return response.blob();
|
return response.blob();
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useGetVideoFeed = (cameraFeedID: "A" | "B" | "C" | null) => {
|
const getVideoFeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
|
||||||
const videoQuery = useQuery({
|
const response = await fetch(`${CAMBASE}/Camera${cameraFeedID}-preview`, {
|
||||||
|
signal: AbortSignal.timeout(300000),
|
||||||
|
cache: "no-store",
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Cannot reach endpoint (${response.status})`);
|
||||||
|
}
|
||||||
|
return response.blob();
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useGetVideoFeed = (cameraFeedID: "A" | "B" | "C" | null, mode: string) => {
|
||||||
|
const targetDetectionQuery = useQuery({
|
||||||
queryKey: ["getfeed", cameraFeedID],
|
queryKey: ["getfeed", cameraFeedID],
|
||||||
queryFn: () => getfeed(cameraFeedID),
|
queryFn: () => targetDectionFeed(cameraFeedID),
|
||||||
refetchInterval: 500,
|
refetchInterval: 500,
|
||||||
|
enabled: mode !== "zoom",
|
||||||
});
|
});
|
||||||
|
|
||||||
return { videoQuery };
|
const videoFeedQuery = useQuery({
|
||||||
|
queryKey: ["videoQuery", cameraFeedID, mode],
|
||||||
|
queryFn: () => getVideoFeed(cameraFeedID),
|
||||||
|
refetchInterval: 500,
|
||||||
|
enabled: mode === "zoom",
|
||||||
|
});
|
||||||
|
|
||||||
|
return { targetDetectionQuery, videoFeedQuery };
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,11 +5,19 @@ import { useCameraFeedContext } from "../../../app/context/CameraFeedContext";
|
|||||||
export const useCreateVideoSnapshot = () => {
|
export const useCreateVideoSnapshot = () => {
|
||||||
const { state } = useCameraFeedContext();
|
const { state } = useCameraFeedContext();
|
||||||
const cameraFeedID = state?.cameraFeedID;
|
const cameraFeedID = state?.cameraFeedID;
|
||||||
|
const mode = state.modeByCamera[cameraFeedID];
|
||||||
const latestBitmapRef = useRef<ImageBitmap | null>(null);
|
const latestBitmapRef = useRef<ImageBitmap | null>(null);
|
||||||
const { videoQuery } = useGetVideoFeed(cameraFeedID);
|
const { targetDetectionQuery, videoFeedQuery } = useGetVideoFeed(cameraFeedID, mode);
|
||||||
|
|
||||||
const snapShot = videoQuery?.data;
|
let snapShot = targetDetectionQuery?.data;
|
||||||
const isloading = videoQuery.isPending;
|
const isloading = targetDetectionQuery.isPending;
|
||||||
|
|
||||||
|
const videoSnapShot = videoFeedQuery?.data;
|
||||||
|
const isVideoLoading = videoFeedQuery.isPending;
|
||||||
|
|
||||||
|
if (isVideoLoading === false && videoSnapShot && mode === "zoom") {
|
||||||
|
snapShot = videoSnapShot;
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
async function createBitmap() {
|
async function createBitmap() {
|
||||||
|
|||||||
@@ -143,6 +143,11 @@ export type CameraFeedState = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
tabIndex?: number;
|
tabIndex?: number;
|
||||||
|
zoomLevel: {
|
||||||
|
A: number;
|
||||||
|
B: number;
|
||||||
|
C: number;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type CameraFeedAction =
|
export type CameraFeedAction =
|
||||||
@@ -177,6 +182,10 @@ export type CameraFeedAction =
|
|||||||
}
|
}
|
||||||
| {
|
| {
|
||||||
type: "RESET_CAMERA_FEED";
|
type: "RESET_CAMERA_FEED";
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
type: "SET_ZOOM_LEVEL";
|
||||||
|
payload: { cameraFeedID: "A" | "B" | "C"; zoomLevel: number };
|
||||||
};
|
};
|
||||||
|
|
||||||
export type DecodeReading = {
|
export type DecodeReading = {
|
||||||
@@ -227,3 +236,5 @@ export type BlackBoardOptions = {
|
|||||||
path?: string;
|
path?: string;
|
||||||
value?: object | string | number | (string | number)[] | null;
|
value?: object | string | number | (string | number)[] | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type CameraZoomConfig = { cameraFeedID: string; zoomLevel: number };
|
||||||
|
|||||||
24
src/ui/SliderComponent.tsx
Normal file
24
src/ui/SliderComponent.tsx
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import Slider from "rc-slider";
|
||||||
|
import "rc-slider/assets/index.css";
|
||||||
|
|
||||||
|
type SliderComponentProps = {
|
||||||
|
id: string;
|
||||||
|
onChange: (value: number | number[]) => void;
|
||||||
|
value?: number;
|
||||||
|
min?: number;
|
||||||
|
max?: number;
|
||||||
|
step?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
const SliderComponent = ({ id, onChange, value = 0, min = 0, max = 100, step = 1 }: SliderComponentProps) => {
|
||||||
|
const handleChange = (val: number | number[]) => {
|
||||||
|
onChange(val);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Slider id={id} onChange={handleChange} value={value} min={min} max={max} step={step} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default SliderComponent;
|
||||||
37
yarn.lock
37
yarn.lock
@@ -226,6 +226,11 @@
|
|||||||
"@babel/plugin-transform-modules-commonjs" "^7.27.1"
|
"@babel/plugin-transform-modules-commonjs" "^7.27.1"
|
||||||
"@babel/plugin-transform-typescript" "^7.28.5"
|
"@babel/plugin-transform-typescript" "^7.28.5"
|
||||||
|
|
||||||
|
"@babel/runtime@^7.10.1", "@babel/runtime@^7.18.3":
|
||||||
|
version "7.28.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
|
||||||
|
integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
|
||||||
|
|
||||||
"@babel/template@^7.27.2":
|
"@babel/template@^7.27.2":
|
||||||
version "7.27.2"
|
version "7.27.2"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
|
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
|
||||||
@@ -1314,6 +1319,11 @@ chokidar@^3.6.0:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
fsevents "~2.3.2"
|
fsevents "~2.3.2"
|
||||||
|
|
||||||
|
classnames@^2.2.5:
|
||||||
|
version "2.5.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
|
||||||
|
integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
|
||||||
|
|
||||||
clsx@^2.0.0, clsx@^2.1.1:
|
clsx@^2.0.0, clsx@^2.1.1:
|
||||||
version "2.1.1"
|
version "2.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
|
resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
|
||||||
@@ -2142,6 +2152,23 @@ queue-microtask@^1.2.2:
|
|||||||
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
|
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
|
||||||
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
|
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
|
||||||
|
|
||||||
|
rc-slider@^11.1.9:
|
||||||
|
version "11.1.9"
|
||||||
|
resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-11.1.9.tgz#d872130fbf4ec51f28543d62e90451091d6f5208"
|
||||||
|
integrity sha512-h8IknhzSh3FEM9u8ivkskh+Ef4Yo4JRIY2nj7MrH6GQmrwV6mcpJf5/4KgH5JaVI1H3E52yCdpOlVyGZIeph5A==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.10.1"
|
||||||
|
classnames "^2.2.5"
|
||||||
|
rc-util "^5.36.0"
|
||||||
|
|
||||||
|
rc-util@^5.36.0:
|
||||||
|
version "5.44.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.44.4.tgz#89ee9037683cca01cd60f1a6bbda761457dd6ba5"
|
||||||
|
integrity sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.18.3"
|
||||||
|
react-is "^18.2.0"
|
||||||
|
|
||||||
react-dom@^19.2.0:
|
react-dom@^19.2.0:
|
||||||
version "19.2.0"
|
version "19.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.0.tgz#00ed1e959c365e9a9d48f8918377465466ec3af8"
|
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.0.tgz#00ed1e959c365e9a9d48f8918377465466ec3af8"
|
||||||
@@ -2159,6 +2186,11 @@ react-is@^16.13.1, react-is@^16.7.0:
|
|||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
||||||
|
|
||||||
|
react-is@^18.2.0:
|
||||||
|
version "18.3.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
|
||||||
|
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
|
||||||
|
|
||||||
react-konva@^19.2.0:
|
react-konva@^19.2.0:
|
||||||
version "19.2.0"
|
version "19.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/react-konva/-/react-konva-19.2.0.tgz#b4cc5d73cd6d642569e4df36a0139996c3dcf8e6"
|
resolved "https://registry.yarnpkg.com/react-konva/-/react-konva-19.2.0.tgz#b4cc5d73cd6d642569e4df36a0139996c3dcf8e6"
|
||||||
@@ -2461,6 +2493,11 @@ uri-js@^4.2.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
punycode "^2.1.0"
|
punycode "^2.1.0"
|
||||||
|
|
||||||
|
use-debounce@^10.0.6:
|
||||||
|
version "10.0.6"
|
||||||
|
resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-10.0.6.tgz#e05060a5e561432ec740c653698f3eb162bd28ec"
|
||||||
|
integrity sha512-C5OtPyhAZgVoteO9heXMTdW7v/IbFI+8bSVKYCJrSmiWWCLsbUxiBSp4t9v0hNBTGY97bT72ydDIDyGSFWfwXg==
|
||||||
|
|
||||||
use-sync-external-store@^1.6.0:
|
use-sync-external-store@^1.6.0:
|
||||||
version "1.6.0"
|
version "1.6.0"
|
||||||
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
|
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
|
||||||
|
|||||||
Reference in New Issue
Block a user