Compare commits
3 Commits
feature/os
...
feature/bl
| Author | SHA1 | Date | |
|---|---|---|---|
| 1628048ac5 | |||
| 7cda7d5887 | |||
| 4c53c04767 |
@@ -1,9 +1,33 @@
|
||||
import { useReducer, type ReactNode } from "react";
|
||||
import { useEffect, useReducer, type ReactNode } from "react";
|
||||
import { CameraFeedContext } from "../context/CameraFeedContext";
|
||||
import { initialState, reducer } from "../reducers/cameraFeedReducer";
|
||||
import { useBlackBoard } from "../../hooks/useBlackBoard";
|
||||
import type { CameraFeedState } from "../../types/types";
|
||||
|
||||
export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
|
||||
const { blackboardMutation } = useBlackBoard();
|
||||
const [state, dispatch] = useReducer(reducer, initialState);
|
||||
|
||||
useEffect(() => {
|
||||
const fetchBlackBoardData = async () => {
|
||||
const result = await blackboardMutation.mutateAsync({
|
||||
operation: "VIEW",
|
||||
path: "cameraFeed",
|
||||
});
|
||||
if (!result?.result || typeof result.result === "string") return;
|
||||
const cameraFeedData: CameraFeedState = result.result;
|
||||
const recontructedState = {
|
||||
...cameraFeedData,
|
||||
paintedCells: {
|
||||
A: new Map(cameraFeedData.paintedCells.A),
|
||||
B: new Map(cameraFeedData.paintedCells.B),
|
||||
C: new Map(cameraFeedData.paintedCells.C),
|
||||
},
|
||||
};
|
||||
dispatch({ type: "SET_CAMERA_FEED_DATA", cameraState: recontructedState });
|
||||
};
|
||||
fetchBlackBoardData();
|
||||
}, []);
|
||||
|
||||
return <CameraFeedContext.Provider value={{ state, dispatch }}>{children}</CameraFeedContext.Provider>;
|
||||
};
|
||||
|
||||
@@ -98,6 +98,14 @@ export function reducer(state: CameraFeedState, action: CameraFeedAction) {
|
||||
[state.cameraFeedID]: new Map<string, PaintedCell>(),
|
||||
},
|
||||
};
|
||||
case "SET_CAMERA_FEED_DATA":
|
||||
return {
|
||||
...action.cameraState,
|
||||
};
|
||||
case "RESET_CAMERA_FEED":
|
||||
return {
|
||||
...initialState,
|
||||
};
|
||||
|
||||
default:
|
||||
return state;
|
||||
|
||||
@@ -9,12 +9,12 @@ const CameraGrid = () => {
|
||||
const [tabIndex, setTabIndex] = useState(0);
|
||||
|
||||
return (
|
||||
<div className="grid grid-cols-1 md:grid-cols-3 gap-4 p-4 h-screen max-h-screen overflow-hidden">
|
||||
<div className="grid grid-cols-1 md:grid-cols-3 md:gap-4 p-4 h-screen max-h-screen">
|
||||
<div className="col-span-2 flex flex-col gap-4">
|
||||
<div className="shrink-0">
|
||||
<div className="">
|
||||
<VideoFeedGridPainter />
|
||||
</div>
|
||||
<div className="flex-1 overflow-hidden">
|
||||
<div className="overflow-hidden">
|
||||
<PlatePatch />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -39,7 +39,6 @@ const CameraPanel = ({ tabIndex }: CameraPanelProps) => {
|
||||
<Tab>Target Detection</Tab>
|
||||
<Tab>Camera Controls</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanel>
|
||||
<RegionSelector
|
||||
regions={regions}
|
||||
|
||||
@@ -10,7 +10,7 @@ type CameraSettingsProps = {
|
||||
|
||||
const CameraSettings = ({ tabIndex, setTabIndex }: CameraSettingsProps) => {
|
||||
return (
|
||||
<Card className="p-4 w-full h-full max-h-screen ">
|
||||
<Card className="p-4 w-full h-full max-h-screen">
|
||||
<Tabs
|
||||
selectedTabClassName="bg-gray-300 text-gray-900 font-semibold border-none rounded-sm mb-1"
|
||||
className="react-tabs"
|
||||
|
||||
@@ -2,6 +2,8 @@ import type { ColourData, PaintedCell, Region } from "../../../../types/types";
|
||||
import ColourPicker from "./ColourPicker";
|
||||
import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
|
||||
import { useColourDectection } from "../../hooks/useColourDetection";
|
||||
import { useBlackBoard } from "../../../../hooks/useBlackBoard";
|
||||
import { toast } from "sonner";
|
||||
|
||||
type RegionSelectorProps = {
|
||||
regions: Region[];
|
||||
@@ -13,6 +15,7 @@ type RegionSelectorProps = {
|
||||
const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: RegionSelectorProps) => {
|
||||
const { colourMutation } = useColourDectection();
|
||||
const { state, dispatch } = useCameraFeedContext();
|
||||
const { blackboardMutation } = useBlackBoard();
|
||||
const paintedCells = state.paintedCells[cameraFeedID];
|
||||
|
||||
const handleChange = (e: { target: { value: string } }) => {
|
||||
@@ -58,6 +61,10 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
|
||||
});
|
||||
};
|
||||
|
||||
const handleResetAll = () => {
|
||||
dispatch({ type: "RESET_CAMERA_FEED" });
|
||||
};
|
||||
|
||||
const handleSaveclick = () => {
|
||||
const regions: ColourData[] = [];
|
||||
const test = Array.from(paintedCells.entries());
|
||||
@@ -103,12 +110,24 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
|
||||
}
|
||||
|
||||
colourMutation.mutate({ cameraFeedID, regions: regions });
|
||||
|
||||
// Convert Map to plain object for blackboard
|
||||
const serializableState = {
|
||||
...state,
|
||||
paintedCells: {
|
||||
A: Array.from(state.paintedCells.A.entries()),
|
||||
B: Array.from(state.paintedCells.B.entries()),
|
||||
C: Array.from(state.paintedCells.C.entries()),
|
||||
},
|
||||
};
|
||||
blackboardMutation.mutate({ operation: "INSERT", path: `cameraFeed`, value: serializableState });
|
||||
toast.success("Region data saved successfully!");
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-4 max-h-[50%]">
|
||||
<div className="flex flex-row gap-3">
|
||||
<div className="p-2 border border-gray-600 rounded-lg flex flex-col h-50 w-full">
|
||||
<div className="flex flex-col md:flex-row gap-3">
|
||||
<div className="p-2 border border-gray-600 rounded-lg flex flex-col h-[10%] w-full">
|
||||
<h2 className="text-2xl mb-2">Tools</h2>
|
||||
<div className="flex flex-col">
|
||||
<label
|
||||
@@ -208,6 +227,12 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
|
||||
>
|
||||
Reset Region
|
||||
</button>
|
||||
<button
|
||||
onClick={handleResetAll}
|
||||
className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full md:w-full hover:bg-red-700 hover:cursor-pointer"
|
||||
>
|
||||
Reset All
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -12,7 +12,7 @@ const SightingEntryTable = () => {
|
||||
|
||||
if (isLoading) return <span className="text-slate-500">Loading Sighting data…</span>;
|
||||
return (
|
||||
<div className="border border-gray-600 rounded-lg overflow-hidden m-2">
|
||||
<div className="border border-gray-600 rounded-lg m-2">
|
||||
<div className="overflow-y-auto ">
|
||||
<table className="w-full text-left text-sm">
|
||||
<thead className="bg-gray-700/50 text-gray-200 sticky top-0">
|
||||
|
||||
@@ -6,9 +6,9 @@ import SightingExitTable from "./SightingExitTable";
|
||||
|
||||
const PlatePatch = () => {
|
||||
return (
|
||||
<Card className="p-4 w-full max-h-[600px] overflow-hidden flex flex-col">
|
||||
<Card className="p-4 w-full max-h-[600px] flex flex-col md:w-[95%]">
|
||||
<CardHeader title="Entry / Exit" />
|
||||
<Tabs defaultIndex={1} className="flex-1 overflow-hidden flex flex-col">
|
||||
<Tabs defaultIndex={1} className="flex-1 flex flex-col">
|
||||
<TabList>
|
||||
<Tab>Entry Sightings</Tab>
|
||||
<Tab>Exit Sightings</Tab>
|
||||
|
||||
@@ -16,7 +16,7 @@ const gap = 0;
|
||||
const VideoFeedGridPainter = () => {
|
||||
const { state } = useCameraFeedContext();
|
||||
const cameraFeedID = state.cameraFeedID;
|
||||
const paintedCells = state.paintedCells[cameraFeedID];
|
||||
const paintedCells = state?.paintedCells?.[cameraFeedID];
|
||||
const regions = state.regionsByCamera[cameraFeedID];
|
||||
const selectedRegionIndex = state.selectedRegionIndex;
|
||||
const mode = state.modeByCamera[cameraFeedID];
|
||||
@@ -93,9 +93,16 @@ const VideoFeedGridPainter = () => {
|
||||
const width = window.innerWidth;
|
||||
|
||||
const aspectRatio = BACKEND_WIDTH / BACKEND_HEIGHT;
|
||||
const newWidth = width * 0.6;
|
||||
const newHeight = newWidth / aspectRatio;
|
||||
setStageSize({ width: newWidth, height: newHeight });
|
||||
console.log(window.innerWidth);
|
||||
if (width < 768) {
|
||||
const newWidth = width * 0.8;
|
||||
const newHeight = newWidth / aspectRatio;
|
||||
setStageSize({ width: newWidth, height: newHeight });
|
||||
} else {
|
||||
const newWidth = width * 0.6;
|
||||
const newHeight = newWidth / aspectRatio;
|
||||
setStageSize({ width: newWidth, height: newHeight });
|
||||
}
|
||||
};
|
||||
|
||||
handleResize();
|
||||
@@ -128,7 +135,8 @@ const VideoFeedGridPainter = () => {
|
||||
<Shape
|
||||
sceneFunc={(ctx, shape) => {
|
||||
const cells = paintedCells;
|
||||
cells.forEach((cell, key) => {
|
||||
if (!cells || cells.size === 0 || !paintLayerRef.current) return;
|
||||
cells?.forEach((cell, key) => {
|
||||
const [rowStr, colStr] = key.split("-");
|
||||
const row = Number(rowStr);
|
||||
const col = Number(colStr);
|
||||
|
||||
@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
|
||||
import { CAMBASE } from "../../../utils/config";
|
||||
|
||||
const getfeed = 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),
|
||||
cache: "no-store",
|
||||
});
|
||||
|
||||
@@ -2,6 +2,7 @@ import { Field, useFormikContext } from "formik";
|
||||
import { useOSDConfig } from "../hooks/useOSDConfig";
|
||||
import OSDFieldToggle from "./OSDFieldToggle";
|
||||
import type { OSDConfigFields } from "../../../types/types";
|
||||
import { toast } from "sonner";
|
||||
|
||||
type OSDFieldsProps = {
|
||||
isOSDLoading: boolean;
|
||||
@@ -15,7 +16,9 @@ const OSDFields = ({ isOSDLoading }: OSDFieldsProps) => {
|
||||
|
||||
const handleSubmit = async (values: OSDConfigFields) => {
|
||||
const result = await osdMutation.mutateAsync(values);
|
||||
console.log(result);
|
||||
if (result?.id) {
|
||||
toast.success("OSD Config updated successfully");
|
||||
}
|
||||
};
|
||||
|
||||
if (isOSDLoading) {
|
||||
|
||||
@@ -24,7 +24,7 @@ const OutputForms = () => {
|
||||
const includeCameraName = osdQuery?.data?.propIncludeCameraName?.value.toLowerCase() === "true";
|
||||
const overlayPosition = osdQuery?.data?.propOverlayPosition?.value;
|
||||
const OSDTimestampFormat = osdQuery?.data?.propTimestampFormat?.value;
|
||||
console.log(includeVRM);
|
||||
|
||||
const format = dispatcherQuery?.data?.propFormat?.value;
|
||||
const { optionalConstantsQuery, optionalConstantsMutation } = useOptionalConstants(format?.toLowerCase());
|
||||
const FFID = optionalConstantsQuery?.data?.propFeedIdentifier?.value;
|
||||
|
||||
@@ -26,7 +26,6 @@ const postOSDConfig = async (data: OSDConfigFields) => {
|
||||
fields: fields,
|
||||
};
|
||||
|
||||
console.log(osdConfigPayload);
|
||||
const response = await fetch(`${CAMBASE}/api/update-config`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify(osdConfigPayload),
|
||||
|
||||
35
src/hooks/useBlackBoard.ts
Normal file
35
src/hooks/useBlackBoard.ts
Normal file
@@ -0,0 +1,35 @@
|
||||
import { useQuery, useMutation } from "@tanstack/react-query";
|
||||
import { CAMBASE } from "../utils/config";
|
||||
import type { BlackBoardOptions } from "../types/types";
|
||||
|
||||
const fetchBlackBoardData = async () => {
|
||||
const response = await fetch(`${CAMBASE}/api/blackboard`);
|
||||
if (!response.ok) {
|
||||
throw new Error("Failed to fetch blackboard data");
|
||||
}
|
||||
return response.json();
|
||||
};
|
||||
|
||||
const viewBlackBoardData = async (options: BlackBoardOptions) => {
|
||||
const response = await fetch(`${CAMBASE}/api/blackboard`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify(options),
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error("Failed to view blackboard data");
|
||||
}
|
||||
return response.json();
|
||||
};
|
||||
|
||||
export const useBlackBoard = () => {
|
||||
const blackboardQuery = useQuery({
|
||||
queryKey: ["blackboardData"],
|
||||
queryFn: fetchBlackBoardData,
|
||||
});
|
||||
|
||||
const blackboardMutation = useMutation({
|
||||
mutationKey: ["viewBlackBoardData"],
|
||||
mutationFn: (options: BlackBoardOptions) => viewBlackBoardData(options),
|
||||
});
|
||||
return { blackboardQuery, blackboardMutation };
|
||||
};
|
||||
@@ -170,6 +170,13 @@ export type CameraFeedAction =
|
||||
| {
|
||||
type: "RESET_PAINTED_CELLS";
|
||||
payload: { cameraFeedID: "A" | "B" | "C"; paintedCells: Map<string, PaintedCell> };
|
||||
}
|
||||
| {
|
||||
type: "SET_CAMERA_FEED_DATA";
|
||||
cameraState: CameraFeedState;
|
||||
}
|
||||
| {
|
||||
type: "RESET_CAMERA_FEED";
|
||||
};
|
||||
|
||||
export type DecodeReading = {
|
||||
@@ -214,3 +221,9 @@ export type CustomFieldConfig = {
|
||||
label: string;
|
||||
value: string;
|
||||
};
|
||||
|
||||
export type BlackBoardOptions = {
|
||||
operation?: string;
|
||||
path?: string;
|
||||
value?: object | string | number | (string | number)[] | null;
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@ const Card = ({ children, className }: CardProps) => {
|
||||
return (
|
||||
<div
|
||||
className={clsx(
|
||||
"bg-[#253445] rounded-lg mt-4 shadow-2xl overflow-x-hidden md:row-span-1 px-2 border border-gray-600 ",
|
||||
"bg-[#253445] rounded-lg mt-4 shadow-2xl overflow-x-hidden md:row-span-1 px-2 border border-gray-600 ",
|
||||
className,
|
||||
)}
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user