format

PhotonVision · Oct 15, 2023 · 6be6c04 · 6be6c04
1 parent 9eed5b4
commit 6be6c04
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/photon-client/src/components/dashboard/tabs/ArucoTab.vue b/photon-client/src/components/dashboard/tabs/ArucoTab.vue
@@ -15,10 +15,9 @@ const currentPipelineSettings = useCameraSettingsStore().currentPipelineSettings
 const threshWinSizes = computed<[number, number]>({
   get: () => {
     if (currentPipelineSettings.pipelineType === PipelineType.Aruco) {
-      return (Object.values(currentPipelineSettings.threshWinSizes) as [number, number]);
-    }
-    else {
-      return ([0, 0] as [number, number]);
+      return Object.values(currentPipelineSettings.threshWinSizes) as [number, number];
+    } else {
+      return [0, 0] as [number, number];
     }
   },
   set: (v) => {

diff --git a/photon-client/src/components/dashboard/tabs/TargetsTab.vue b/photon-client/src/components/dashboard/tabs/TargetsTab.vue
@@ -35,9 +35,9 @@ import { useStateStore } from "@/stores/StateStore";
               </template>
               <template
                 v-if="
-                  (useCameraSettingsStore().currentPipelineType === PipelineType.AprilTag
-                  || useCameraSettingsStore().currentPipelineType === PipelineType.Aruco)
-                  && useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled
+                  (useCameraSettingsStore().currentPipelineType === PipelineType.AprilTag ||
+                    useCameraSettingsStore().currentPipelineType === PipelineType.Aruco) &&
+                  useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled
                 "
               >
                 <th class="text-center">Ambiguity %</th>
@@ -49,8 +49,8 @@ import { useStateStore } from "@/stores/StateStore";
               <td>{{ index }}</td>
               <td
                 v-if="
-                  useCameraSettingsStore().currentPipelineType === PipelineType.AprilTag
-                  || useCameraSettingsStore().currentPipelineType === PipelineType.Aruco
+                  useCameraSettingsStore().currentPipelineType === PipelineType.AprilTag ||
+                  useCameraSettingsStore().currentPipelineType === PipelineType.Aruco
                 "
               >
                 {{ target.fiducialId }}
@@ -68,9 +68,9 @@ import { useStateStore } from "@/stores/StateStore";
               </template>
               <template
                 v-if="
-                  (useCameraSettingsStore().currentPipelineType === PipelineType.AprilTag
-                  || useCameraSettingsStore().currentPipelineType === PipelineType.Aruco)
-                  && useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled
+                  (useCameraSettingsStore().currentPipelineType === PipelineType.AprilTag ||
+                    useCameraSettingsStore().currentPipelineType === PipelineType.Aruco) &&
+                  useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled
                 "
               >
                 <td>{{ target.ambiguity?.toFixed(2) }}%</td>

diff --git a/photon-client/src/types/PipelineTypes.ts b/photon-client/src/types/PipelineTypes.ts
@@ -247,7 +247,7 @@ export interface ArucoPipelineSettings extends PipelineSettings {
   threshConstant: number;
   debugThreshold: boolean;
 
-  useCornerRefinement: boolean,
+  useCornerRefinement: boolean;
 
   useAruco3: boolean;
   aruco3MinMarkerSideRatio: number;

diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipeline.java
@@ -122,7 +122,9 @@ protected CVPipelineResult process(Frame frame, ArucoPipelineSettings settings)
         if (settings.debugThreshold) {
             var thresh =
                     drawThresholdFrame(
-                            frame.processedImage.getMat(), settings.threshWinSizes.getFirst(), settings.threshConstant);
+                            frame.processedImage.getMat(),
+                            settings.threshWinSizes.getFirst(),
+                            settings.threshConstant);
             thresh.copyTo(frame.colorImage.getMat());
             thresh.release();
         }

diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipelineSettings.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipelineSettings.java
@@ -18,7 +18,6 @@
 package org.photonvision.vision.pipeline;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
-
 import org.photonvision.common.util.numbers.IntegerCouple;
 import org.photonvision.vision.target.TargetModel;