From 23170be844044481707346daa1e2dfbabdf4e827 Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Wed, 7 May 2025 19:21:16 -0400 Subject: [PATCH 01/18] Fix spacing on Camera Matching cards --- .../src/views/CameraMatchingView.vue | 427 ++++++++++-------- 1 file changed, 227 insertions(+), 200 deletions(-) diff --git a/photon-client/src/views/CameraMatchingView.vue b/photon-client/src/views/CameraMatchingView.vue index a421e0a9c9..6a3bfb1235 100644 --- a/photon-client/src/views/CameraMatchingView.vue +++ b/photon-client/src/views/CameraMatchingView.vue @@ -289,221 +289,234 @@ const openExportSettingsPrompt = () => { cols="12" sm="6" lg="4" + class="pr-0" > - {{ cameraInfoFor(module.matchedCameraInfo).name }} - Status: Disconnected - Status: Active - Status: Mismatch - - - - - Streams: - - Input - / - Output - - - - Pipelines - {{ module.pipelineNicknames.join(", ") }} - - - Calibrations - - {{ - module.completeCalibrations.map((it) => getResolutionString(it.resolution)).join(", ") || - "Not calibrated" - }} - - - - Frames Processed - - {{ useStateStore().backendResults[module.uniqueName].sequenceID }} ({{ - useStateStore().backendResults[module.uniqueName].fps - }} - FPS) - - - - -
+ {{ cameraInfoFor(module.matchedCameraInfo).name }} + Status: Disconnected - -
-
- - - - - Details - - - - - Deactivate - - - - - mdi-trash-can-outline - - - - + Status: Active + Status: Mismatch + + + + + Streams: + + Input + / + Output + + + + Pipelines + {{ module.pipelineNicknames.join(", ") }} + + + Calibrations + + {{ + module.completeCalibrations.map((it) => getResolutionString(it.resolution)).join(", ") || + "Not calibrated" + }} + + + + Frames Processed + + {{ useStateStore().backendResults[module.uniqueName].sequenceID }} ({{ + useStateStore().backendResults[module.uniqueName].fps + }} + FPS) + + + + +
+ +
+
+ + + + + Details + + + + + Deactivate + + + + + mdi-trash-can-outline + + + + +
- - - {{ module.nickname }} - Status: Deactivated - - - - - Name - - {{ module.cameraQuirks.baseName }} - - - - Pipelines - {{ module.pipelineNicknames.join(", ") }} - - - Connected - {{ cameraCononected(cameraInfoFor(module.matchedCameraInfo).uniquePath) }} - - - Calibrations - - {{ - module.calibrations.map((it2) => getResolutionString(it2.resolution)).join(", ") || - "Not calibrated" - }} - - - - - - - - - - Details - - - - - Activate - - - - - mdi-trash-can-outline - - - - + + +
+ {{ module.nickname }} + Status: Deactivated + + + + + Name + + {{ module.cameraQuirks.baseName }} + + + + Pipelines + {{ module.pipelineNicknames.join(", ") }} + + + Connected + {{ cameraCononected(cameraInfoFor(module.matchedCameraInfo).uniquePath) }} + + + Calibrations + + {{ + module.calibrations.map((it2) => getResolutionString(it2.resolution)).join(", ") || + "Not calibrated" + }} + + + + + + + + + + Details + + + + + Activate + + + + + mdi-trash-can-outline + + + + +
- - - - USB Camera: - CSI Camera: - File Camera: - Unknown Camera: -  {{ cameraInfoFor(camera)?.name ?? cameraInfoFor(camera)?.baseName }} - - Status: Unassigned - - {{ cameraInfoFor(camera)?.path }} - - - - - - Details - - - - - Activate - - - - + + +
+ + USB Camera: + CSI Camera: + File Camera: + Unknown Camera: +  {{ cameraInfoFor(camera)?.name ?? cameraInfoFor(camera)?.baseName }} + + Status: Unassigned + + {{ cameraInfoFor(camera)?.path }} + + + + + + Details + + + + + Activate + + + + +
- + { diff --git a/photon-client/src/components/common/pv-select.vue b/photon-client/src/components/common/pv-select.vue index 3ee221a763..2f7bd9e821 100644 --- a/photon-client/src/components/common/pv-select.vue +++ b/photon-client/src/components/common/pv-select.vue @@ -40,10 +40,10 @@ const items = computed(() => { diff --git a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue index 9a1d3dd644..860fcafe09 100644 --- a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue +++ b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue @@ -371,27 +371,25 @@ const wrappedCameras = computed(() => - Create New Pipeline - + Create New Pipeline + - - - + (() => - Pipeline Deletion Confirmation + Pipeline Deletion Confirmation Are you sure you want to delete the pipeline {{ @@ -414,9 +412,7 @@ const wrappedCameras = computed(() => }}? This cannot be undone. - - - + Yes, I'm sure (() => - Change Pipeline Type + Change Pipeline Type Are you sure you want to change the current pipeline type? This will cause all the pipeline settings to be overwritten and they will be lost. If this isn't what you want, duplicate this pipeline first or export settings. - - - + Yes, I'm sure No, take me back diff --git a/photon-client/src/components/dashboard/CamerasCard.vue b/photon-client/src/components/dashboard/CamerasCard.vue index c864ea7b9f..acb8fd34b3 100644 --- a/photon-client/src/components/dashboard/CamerasCard.vue +++ b/photon-client/src/components/dashboard/CamerasCard.vue @@ -88,9 +88,6 @@ const performanceRecommendation = computed(() => { From 19b0782d79c3f2bd3ed61c432660cbac7ce30a9f Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Sat, 5 Jul 2025 20:06:30 -0400 Subject: [PATCH 16/18] Clean up object detection UI --- .../settings/ObjectDetectionCard.vue | 94 +++++++++++-------- 1 file changed, 53 insertions(+), 41 deletions(-) diff --git a/photon-client/src/components/settings/ObjectDetectionCard.vue b/photon-client/src/components/settings/ObjectDetectionCard.vue index 827ab716aa..c86f02ab22 100644 --- a/photon-client/src/components/settings/ObjectDetectionCard.vue +++ b/photon-client/src/components/settings/ObjectDetectionCard.vue @@ -317,6 +317,7 @@ const handleBulkImport = () => { /> +
- + mdi-import Bulk Import @@ -377,16 +378,21 @@ const handleBulkImport = () => { - - + + - Available Models + Model Nicknames + Labels + Delete + Edit + Info {{ model.nickname }} + {{ model.labels.join(", ") }} { - + Delete Object Detection Model - - Are you sure you want to delete the model - {{ confirmDeleteDialog.model.nickname }}? - - Cancel - Delete - + + Are you sure you want to delete the model {{ confirmDeleteDialog.model.nickname }}? + + Delete + Cancel + Rename Object Detection Model - + Enter a new name for the model {{ showRenameDialog.model.nickname }}: - - - - - Cancel - + +
+ + Rename - + Cancel +
Object Detection Model Info - - mdi-export - Export Model - - - -

Model Path: {{ showInfo.model.modelPath }}

-

Model Nickname: {{ showInfo.model.nickname }}

-

Model Family: {{ showInfo.model.family }}

-

Model Version: {{ showInfo.model.version }}

-

Model Label(s): {{ showInfo.model.labels.join(", ") }}

-

Model Resolution: {{ showInfo.model.resolutionWidth }} x {{ showInfo.model.resolutionHeight }}

+ + + mdi-export + Export Model + +
+
+

Model Path: {{ showInfo.model.modelPath }}

+

Model Nickname: {{ showInfo.model.nickname }}

+

Model Family: {{ showInfo.model.family }}

+

Model Version: {{ showInfo.model.version }}

+

Model Label(s): {{ showInfo.model.labels.join(", ") }}

+

Model Resolution: {{ showInfo.model.resolutionWidth }} x {{ showInfo.model.resolutionHeight }}

+
@@ -487,7 +497,7 @@ const handleBulkImport = () => { - This will delete ALL OF YOUR MODELS and re-extract the default models. + This will delete ALL OF YOUR MODELS and re-extract the default models. @@ -515,6 +525,7 @@ const handleBulkImport = () => { @@ -530,7 +541,7 @@ const handleBulkImport = () => {