From 276ef995de776d83583898552e0e3e2266e551f2 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:18:55 -0400
Subject: [PATCH 01/10] Show pipeline name in pipeline deletion dialouge

---
 .../src/components/dashboard/CameraAndPipelineSelectCard.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue
index b01b4a4dd8..defa00303c 100644
--- a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue
+++ b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue
@@ -340,7 +340,7 @@ useCameraSettingsStore().$subscribe((mutation, state) => {
     <v-dialog v-model="showPipelineDeletionConfirmationDialog" dark width="500">
       <v-card dark color="primary">
         <v-card-title> Pipeline Deletion Confirmation </v-card-title>
-        <v-card-text> Are you sure you want to delete this pipeline? This cannot be undone. </v-card-text>
+        <v-card-text> Are you sure you want to delete the pipeline <b style="color: white; font-weight: bold">{{useCameraSettingsStore().currentPipelineSettings.pipelineNickname}}</b>? This cannot be undone. </v-card-text>
         <v-divider />
         <v-card-actions>
           <v-spacer />

From e99f05870a6ebe226111c04a7c4d15cf8011d6b9 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:19:03 -0400
Subject: [PATCH 02/10] fix centering on camera view

---
 photon-client/src/components/cameras/CamerasView.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/photon-client/src/components/cameras/CamerasView.vue b/photon-client/src/components/cameras/CamerasView.vue
index 4448dcde1e..b72791afee 100644
--- a/photon-client/src/components/cameras/CamerasView.vue
+++ b/photon-client/src/components/cameras/CamerasView.vue
@@ -125,6 +125,7 @@ th {
 
 .stream-container {
   display: flex;
+  justify-content: center;
   flex-wrap: wrap;
   align-items: center;
   gap: 12px;

From 55348c84f9c9bc99d8aadfb43cb1584b3a76e8aa Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:22:02 -0400
Subject: [PATCH 03/10] hide decimation selector unless you are calibrating

---
 photon-client/src/components/cameras/CameraCalibrationCard.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/photon-client/src/components/cameras/CameraCalibrationCard.vue b/photon-client/src/components/cameras/CameraCalibrationCard.vue
index f9bdbf1332..2c40c28b23 100644
--- a/photon-client/src/components/cameras/CameraCalibrationCard.vue
+++ b/photon-client/src/components/cameras/CameraCalibrationCard.vue
@@ -233,6 +233,7 @@ const endCalibration = () => {
                 :items="getUniqueVideoResolutionStrings()"
               />
               <pv-select
+                v-show="isCalibrating"
                 v-model="useCameraSettingsStore().currentPipelineSettings.streamingFrameDivisor"
                 label="Decimation"
                 tooltip="Resolution to which camera frames are downscaled for detection. Calibration still uses full-res"

From fb8347cb009b126c478b041da90cff1247444399 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:26:05 -0400
Subject: [PATCH 04/10] fix issue with pv naming change

---
 photon-client/src/components/dashboard/tabs/OutputTab.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/photon-client/src/components/dashboard/tabs/OutputTab.vue b/photon-client/src/components/dashboard/tabs/OutputTab.vue
index 5116b6ee38..e4a65478eb 100644
--- a/photon-client/src/components/dashboard/tabs/OutputTab.vue
+++ b/photon-client/src/components/dashboard/tabs/OutputTab.vue
@@ -84,7 +84,7 @@ const interactiveCols = computed(
         (value) => useCameraSettingsStore().changeCurrentPipelineSetting({ outputShowMultipleTargets: value }, false)
       "
     />
-    <cv-switch
+    <pv-switch
       v-if="
         currentPipelineSettings.pipelineType === PipelineType.AprilTag &&
         useCameraSettingsStore().isCurrentVideoFormatCalibrated
@@ -96,7 +96,7 @@ const interactiveCols = computed(
       :disabled="!isTagPipeline"
       @input="(value) => useCameraSettingsStore().changeCurrentPipelineSetting({ doMultiTarget: value }, false)"
     />
-    <cv-switch
+    <pv-switch
       v-if="
         currentPipelineSettings.pipelineType === PipelineType.AprilTag &&
         useCameraSettingsStore().isCurrentVideoFormatCalibrated

From 77d19ef57142a90c012fbca2fd94fe738478336c Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:32:37 -0400
Subject: [PATCH 05/10] Fix issue with multitarget section showing when it
 shouldnt

---
 photon-client/src/components/dashboard/tabs/TargetsTab.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/photon-client/src/components/dashboard/tabs/TargetsTab.vue b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
index e6b01fd1d4..074b4a0e4e 100644
--- a/photon-client/src/components/dashboard/tabs/TargetsTab.vue
+++ b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
@@ -2,6 +2,8 @@
 import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
 import { PipelineType } from "@/types/PipelineTypes";
 import { useStateStore } from "@/stores/StateStore";
+
+const currentPipelineSettings = useCameraSettingsStore().currentPipelineSettings;
 </script>
 
 <template>
@@ -77,10 +79,7 @@ import { useStateStore } from "@/stores/StateStore";
       </v-simple-table>
     </v-row>
     <v-row
-      v-if="
-        useCameraSettingsStore().currentPipelineSettings.pipelineType === PipelineType.AprilTag &&
-        useCameraSettingsStore().currentPipelineSettings.doMultiTarget
-      "
+      v-if="currentPipelineSettings.pipelineType === PipelineType.AprilTag && currentPipelineSettings.doMultiTarget"
       align="start"
       class="pb-4 white--text"
     >

From 28acd5dc1873ffa5a299bd739086aa4e825ea12e Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:33:18 -0400
Subject: [PATCH 06/10] Follow standard unit repersentations across the client

(angle)&deg;
(distance)&nbsp;m
---
 photon-client/src/components/dashboard/tabs/TargetsTab.vue  | 6 +++---
 .../src/components/settings/ApriltagControlCard.vue         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/photon-client/src/components/dashboard/tabs/TargetsTab.vue b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
index 074b4a0e4e..8f5b300090 100644
--- a/photon-client/src/components/dashboard/tabs/TargetsTab.vue
+++ b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
@@ -92,9 +92,9 @@ const currentPipelineSettings = useCameraSettingsStore().currentPipelineSettings
           <th class="text-center">Tags</th>
         </thead>
         <tbody>
-          <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.x.toFixed(2) }}</td>
-          <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.y.toFixed(2) }}</td>
-          <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.angle_z.toFixed(2) }}</td>
+          <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.x.toFixed(2) }}&nbsp;m</td>
+          <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.y.toFixed(2) }}&nbsp;m</td>
+          <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.angle_z.toFixed(2) }}&deg;</td>
           <td>{{ useStateStore().currentPipelineResults?.multitagResult?.fiducialIDsUsed }}</td>
         </tbody>
       </v-simple-table>
diff --git a/photon-client/src/components/settings/ApriltagControlCard.vue b/photon-client/src/components/settings/ApriltagControlCard.vue
index f6a3e30629..bf3d245fa8 100644
--- a/photon-client/src/components/settings/ApriltagControlCard.vue
+++ b/photon-client/src/components/settings/ApriltagControlCard.vue
@@ -40,10 +40,10 @@ const quaternionToEuler = (rot_quat: Quaternion): { x: number; y: number; z: num
             <tr v-for="(tag, index) in useSettingsStore().currentFieldLayout.tags" :key="index">
               <td>{{ tag.ID }}</td>
               <td v-for="(val, idx) in Object.values(tag.pose.translation)" :key="idx">
-                {{ val.toFixed(2) }}
+                {{ val.toFixed(2) }}&nbsp;m
               </td>
               <td v-for="(val, idx) in Object.values(quaternionToEuler(tag.pose.rotation.quaternion))" :key="idx + 4">
-                {{ val.toFixed(2) }}
+                {{ val.toFixed(2) }}&deg;
               </td>
             </tr>
           </tbody>

From f14cd3f2085373e8cffb7f91bba2928881b6c5cb Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:33:59 -0400
Subject: [PATCH 07/10] Formatting fixes

---
 .../components/dashboard/CameraAndPipelineSelectCard.vue  | 8 +++++++-
 .../src/components/settings/ApriltagControlCard.vue       | 4 +---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue
index defa00303c..d3f27ebdaa 100644
--- a/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue
+++ b/photon-client/src/components/dashboard/CameraAndPipelineSelectCard.vue
@@ -340,7 +340,13 @@ useCameraSettingsStore().$subscribe((mutation, state) => {
     <v-dialog v-model="showPipelineDeletionConfirmationDialog" dark width="500">
       <v-card dark color="primary">
         <v-card-title> Pipeline Deletion Confirmation </v-card-title>
-        <v-card-text> Are you sure you want to delete the pipeline <b style="color: white; font-weight: bold">{{useCameraSettingsStore().currentPipelineSettings.pipelineNickname}}</b>? This cannot be undone. </v-card-text>
+        <v-card-text>
+          Are you sure you want to delete the pipeline
+          <b style="color: white; font-weight: bold">{{
+            useCameraSettingsStore().currentPipelineSettings.pipelineNickname
+          }}</b
+          >? This cannot be undone.
+        </v-card-text>
         <v-divider />
         <v-card-actions>
           <v-spacer />
diff --git a/photon-client/src/components/settings/ApriltagControlCard.vue b/photon-client/src/components/settings/ApriltagControlCard.vue
index bf3d245fa8..b0c64ff7cc 100644
--- a/photon-client/src/components/settings/ApriltagControlCard.vue
+++ b/photon-client/src/components/settings/ApriltagControlCard.vue
@@ -39,9 +39,7 @@ const quaternionToEuler = (rot_quat: Quaternion): { x: number; y: number; z: num
           <tbody>
             <tr v-for="(tag, index) in useSettingsStore().currentFieldLayout.tags" :key="index">
               <td>{{ tag.ID }}</td>
-              <td v-for="(val, idx) in Object.values(tag.pose.translation)" :key="idx">
-                {{ val.toFixed(2) }}&nbsp;m
-              </td>
+              <td v-for="(val, idx) in Object.values(tag.pose.translation)" :key="idx">{{ val.toFixed(2) }}&nbsp;m</td>
               <td v-for="(val, idx) in Object.values(quaternionToEuler(tag.pose.rotation.quaternion))" :key="idx + 4">
                 {{ val.toFixed(2) }}&deg;
               </td>

From 9287cb163fec367dbb2ddd071458674aac8ce699 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:46:09 -0400
Subject: [PATCH 08/10] actually fix multitag target section

Styling fixes on the multitag subsection
---
 .../src/components/dashboard/tabs/TargetsTab.vue       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/photon-client/src/components/dashboard/tabs/TargetsTab.vue b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
index 8f5b300090..c00def9a7c 100644
--- a/photon-client/src/components/dashboard/tabs/TargetsTab.vue
+++ b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
@@ -79,11 +79,15 @@ const currentPipelineSettings = useCameraSettingsStore().currentPipelineSettings
       </v-simple-table>
     </v-row>
     <v-row
-      v-if="currentPipelineSettings.pipelineType === PipelineType.AprilTag && currentPipelineSettings.doMultiTarget"
+      v-if="
+        currentPipelineSettings.pipelineType === PipelineType.AprilTag &&
+        currentPipelineSettings.doMultiTarget &&
+        useCameraSettingsStore().isCurrentVideoFormatCalibrated
+      "
       align="start"
       class="pb-4 white--text"
     >
-      <v-card-subtitle>Multi-tag pose, field-to-camera</v-card-subtitle>
+      <v-card-subtitle class="ma-0 pa-0 pb-4" style="font-size: 16px">Multi-tag pose, field-to-camera</v-card-subtitle>
       <v-simple-table fixed-header height="100%" dense dark>
         <thead style="font-size: 1.25rem">
           <th class="text-center">X meters</th>
@@ -91,7 +95,7 @@ const currentPipelineSettings = useCameraSettingsStore().currentPipelineSettings
           <th class="text-center">Z Angle &theta;&deg;</th>
           <th class="text-center">Tags</th>
         </thead>
-        <tbody>
+        <tbody v-show="useStateStore().currentPipelineResults?.multitagResult">
           <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.x.toFixed(2) }}&nbsp;m</td>
           <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.y.toFixed(2) }}&nbsp;m</td>
           <td>{{ useStateStore().currentPipelineResults?.multitagResult?.bestTransform.angle_z.toFixed(2) }}&deg;</td>

From 1a8855d18689be57f9f0e4d247f2357840eb9a4c Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Fri, 20 Oct 2023 03:42:43 -0400
Subject: [PATCH 09/10] Ensure SolvePNP is enabled before showing multitag
 options

---
 photon-client/src/components/dashboard/tabs/OutputTab.vue  | 6 ++++--
 photon-client/src/components/dashboard/tabs/TargetsTab.vue | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/photon-client/src/components/dashboard/tabs/OutputTab.vue b/photon-client/src/components/dashboard/tabs/OutputTab.vue
index e4a65478eb..bc9fb8ca0c 100644
--- a/photon-client/src/components/dashboard/tabs/OutputTab.vue
+++ b/photon-client/src/components/dashboard/tabs/OutputTab.vue
@@ -87,7 +87,8 @@ const interactiveCols = computed(
     <pv-switch
       v-if="
         currentPipelineSettings.pipelineType === PipelineType.AprilTag &&
-        useCameraSettingsStore().isCurrentVideoFormatCalibrated
+        useCameraSettingsStore().isCurrentVideoFormatCalibrated &&
+        useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled
       "
       v-model="currentPipelineSettings.doMultiTarget"
       label="Do Multi-Target Estimation"
@@ -99,7 +100,8 @@ const interactiveCols = computed(
     <pv-switch
       v-if="
         currentPipelineSettings.pipelineType === PipelineType.AprilTag &&
-        useCameraSettingsStore().isCurrentVideoFormatCalibrated
+        useCameraSettingsStore().isCurrentVideoFormatCalibrated &&
+        useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled
       "
       v-model="currentPipelineSettings.doSingleTargetAlways"
       label="Always Do Single-Target Estimation"
diff --git a/photon-client/src/components/dashboard/tabs/TargetsTab.vue b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
index c00def9a7c..26c7d77e11 100644
--- a/photon-client/src/components/dashboard/tabs/TargetsTab.vue
+++ b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
@@ -82,7 +82,8 @@ const currentPipelineSettings = useCameraSettingsStore().currentPipelineSettings
       v-if="
         currentPipelineSettings.pipelineType === PipelineType.AprilTag &&
         currentPipelineSettings.doMultiTarget &&
-        useCameraSettingsStore().isCurrentVideoFormatCalibrated
+        useCameraSettingsStore().isCurrentVideoFormatCalibrated &&
+        useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled
       "
       align="start"
       class="pb-4 white--text"

From 640b19952ffb07d6a808d33876771ad9c73664c5 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Fri, 20 Oct 2023 03:48:33 -0400
Subject: [PATCH 10/10] Update TargetsTab.vue

---
 photon-client/src/components/dashboard/tabs/TargetsTab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/photon-client/src/components/dashboard/tabs/TargetsTab.vue b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
index 26c7d77e11..144e76f1ea 100644
--- a/photon-client/src/components/dashboard/tabs/TargetsTab.vue
+++ b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
@@ -60,7 +60,7 @@ const currentPipelineSettings = useCameraSettingsStore().currentPipelineSettings
                 <td>{{ target.skew.toFixed(2) }}&deg;</td>
                 <td>{{ target.area.toFixed(2) }}&deg;</td>
               </template>
-              <template v-else-if="useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled">
+              <template v-else>
                 <td>{{ target.pose?.x.toFixed(2) }}&nbsp;m</td>
                 <td>{{ target.pose?.y.toFixed(2) }}&nbsp;m</td>
                 <td>{{ (((target.pose?.angle_z || 0) * 180.0) / Math.PI).toFixed(2) }}&deg;</td>