develop #29

Merged
TobaOjo merged 3 commits from develop into main 2026-01-13 16:11:33 +00:00
5 changed files with 50 additions and 19 deletions
Showing only changes of commit 00ca9441b9 - Show all commits

View File

@@ -1,7 +1,7 @@
{ {
"name": "bayiq-ui", "name": "bayiq-ui",
"private": true, "private": true,
"version": "1.0.5", "version": "1.0.6",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View File

@@ -3,6 +3,7 @@ import { CAMERA_IDS, DEFAULT_REGIONS, type CameraID } from "../config/cameraConf
export const initialState: CameraFeedState = { export const initialState: CameraFeedState = {
cameraFeedID: CAMERA_IDS[0], cameraFeedID: CAMERA_IDS[0],
brushSize: 1,
paintedCells: CAMERA_IDS.reduce( paintedCells: CAMERA_IDS.reduce(
(acc, id) => { (acc, id) => {
acc[id] = new Map<string, PaintedCell>(); acc[id] = new Map<string, PaintedCell>();
@@ -110,6 +111,12 @@ export function reducer(state: CameraFeedState, action: CameraFeedAction) {
[action.payload.cameraFeedID]: action.payload.zoomLevel, [action.payload.cameraFeedID]: action.payload.zoomLevel,
}, },
}; };
case "SET_BRUSH_SIZE":
return {
...state,
brushSize: action.payload.brushSize,
};
default: default:
return state; return state;
} }

View File

@@ -7,6 +7,7 @@ import { toast } from "sonner";
import { useCameraFeedSocket } from "../../../../app/context/WebSocketContext"; import { useCameraFeedSocket } from "../../../../app/context/WebSocketContext";
import type { CameraID } from "../../../../app/config/cameraConfig"; import type { CameraID } from "../../../../app/config/cameraConfig";
import { useEffect } from "react"; import { useEffect } from "react";
import SliderComponent from "../../../../ui/SliderComponent";
type RegionSelectorProps = { type RegionSelectorProps = {
regions: Region[]; regions: Region[];
@@ -32,6 +33,7 @@ const RegionSelector = ({
const { state, dispatch } = useCameraFeedContext(); const { state, dispatch } = useCameraFeedContext();
const { blackboardMutation } = useBlackBoard(); const { blackboardMutation } = useBlackBoard();
const paintedCells = state.paintedCells[cameraFeedID]; const paintedCells = state.paintedCells[cameraFeedID];
const brushSize = state.brushSize;
const cameraSocket = useCameraFeedSocket(); const cameraSocket = useCameraFeedSocket();
useEffect(() => { useEffect(() => {
if (subTabIndex === 0) { if (subTabIndex === 0) {
@@ -171,7 +173,7 @@ const RegionSelector = ({
<div className="flex flex-col md:flex-row gap-3"> <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"> <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> <h2 className="text-2xl mb-2">Tools</h2>
<div className="flex flex-col"> <div className="flex flex-col gap-2">
<label <label
htmlFor="paintMode" htmlFor="paintMode"
className={`p-4 border rounded-lg mb-2 className={`p-4 border rounded-lg mb-2
@@ -204,6 +206,19 @@ const RegionSelector = ({
/> />
<span className="text-xl">Erase mode</span> <span className="text-xl">Erase mode</span>
</label> </label>
<div className="flex flex-col border border-gray-600 rounded-lg p-4">
<span className="text-lg mb-2">
{mode === "painter" ? "Brush" : "Eraser"} Size: {brushSize}
</span>
<SliderComponent
id="brushSize"
onChange={(value) => dispatch({ type: "SET_BRUSH_SIZE", payload: { brushSize: value as number } })}
value={brushSize}
min={1}
max={5}
step={1}
/>
</div>
<label <label
htmlFor="magnifyMode" htmlFor="magnifyMode"
className={`p-4 border rounded-lg mb-2 className={`p-4 border rounded-lg mb-2

View File

@@ -23,6 +23,8 @@ const VideoFeedGridPainter = () => {
const regions = state.regionsByCamera[cameraFeedID]; const regions = state.regionsByCamera[cameraFeedID];
const selectedRegionIndex = state.selectedRegionIndex; const selectedRegionIndex = state.selectedRegionIndex;
const mode = state.modeByCamera[cameraFeedID]; const mode = state.modeByCamera[cameraFeedID];
const brushSize = state.brushSize;
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);
@@ -85,35 +87,37 @@ const VideoFeedGridPainter = () => {
const image = draw(latestBitmapRef); const image = draw(latestBitmapRef);
const paintCell = (x: number, y: number) => { const paintCell = (x: number, y: number, brushSize: number) => {
if (mode === "controller" || mode === "zoom" || mode === "magnify") return; if (mode === "controller" || mode === "zoom" || mode === "magnify") return;
const col = Math.floor(x / (size + gap)); const col = Math.floor(x / (size + gap));
const row = Math.floor(y / (size + gap)); const row = Math.floor(y / (size + gap));
const radius = Math.floor(brushSize / 2);
if (row < 0 || row >= rows || col < 0 || col >= cols) return; if (row < 0 || row >= rows || col < 0 || col >= cols) return;
const activeRegion = regions[selectedRegionIndex]; const activeRegion = regions[selectedRegionIndex];
if (!activeRegion) return; if (!activeRegion) return;
const key = `${row}-${col}`;
const currentColour = regions[selectedRegionIndex].brushColour; const currentColour = regions[selectedRegionIndex].brushColour;
const map = paintedCells; for (let r = row - radius; r <= row + radius; r++) {
const existing = map.get(key); for (let c = col - radius; c <= col + radius; c++) {
if (r < 0 || r >= rows || c < 0 || c >= cols) continue;
if (mode === "eraser") { const key = `${r}-${c}`;
if (map.has(key)) { const map = paintedCells;
map.delete(key); const existing = map.get(key);
paintLayerRef.current?.batchDraw(); if (mode === "eraser") {
if (map.has(key)) {
map.delete(key);
paintLayerRef.current?.batchDraw();
}
continue;
}
if (existing && existing.colour === currentColour) continue;
map.set(key, { colour: currentColour, region: activeRegion });
} }
return;
} }
if (existing && existing.colour === currentColour) return;
map.set(key, { colour: currentColour, region: activeRegion });
paintLayerRef.current?.batchDraw(); paintLayerRef.current?.batchDraw();
}; };
@@ -121,14 +125,14 @@ const VideoFeedGridPainter = () => {
if (!regions[selectedRegionIndex] || mode === "magnify" || mode === "zoom") return; if (!regions[selectedRegionIndex] || mode === "magnify" || 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, brushSize);
}; };
const handleStageMouseMove = (e: KonvaEventObject<MouseEvent>) => { const handleStageMouseMove = (e: KonvaEventObject<MouseEvent>) => {
if (!isDrawingRef.current || mode === "magnify") return; if (!isDrawingRef.current || mode === "magnify") 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, brushSize);
}; };
const handleStageMouseUp = () => { const handleStageMouseUp = () => {

View File

@@ -175,6 +175,7 @@ export type OptionalBOF2LaneIDs = {
export type CameraFeedState = { export type CameraFeedState = {
cameraFeedID: CameraID; cameraFeedID: CameraID;
brushSize: number;
paintedCells: Record<CameraID, Map<string, PaintedCell>>; paintedCells: Record<CameraID, Map<string, PaintedCell>>;
regionsByCamera: Record<CameraID, Region[]>; regionsByCamera: Record<CameraID, Region[]>;
@@ -221,6 +222,10 @@ export type CameraFeedAction =
| { | {
type: "SET_ZOOM_LEVEL"; type: "SET_ZOOM_LEVEL";
payload: { cameraFeedID: CameraID; zoomLevel: number }; payload: { cameraFeedID: CameraID; zoomLevel: number };
}
| {
type: "SET_BRUSH_SIZE";
payload: { brushSize: number };
}; };
export type DecodeReading = { export type DecodeReading = {