UI 3d mode, ConfigManager bugfixes (#103)

* stupid bugs I guess idk where else to put this commit

* Run spotless

* Fix config file loading

Splits load into own method

* Run spotless

photon-client/src/assets/FRCtargets.json

@@ -1,20 +1,52 @@
 {
-  "2020 Hex Goal": [
-    [-19.625, 0],
-    [-9.819867, -17],
-    [9.819867, -17],
-    [19.625,0]
-  ],
-  "2020 Loading Station": [
-    [-3.54,5.5],
-    [-3.54,-5.5],
-    [3.54,-5.5],
-    [3.54,5.5]
-  ],
-  "2019 Dual Target": [
-    [-7.75, 3],
-    [-7.75, -3],
-    [7.75, -3],
-    [7.75, 3]
-  ]
+  "2020 Hex Goal": {
+    "realWorldCoordinatesArray": [
+      {
+        "x": -0.49847498536109924,
+        "y": 0.0,
+        "z": 0.0
+      },
+      {
+        "x": -0.24942462146282196,
+        "y": -0.4318000078201294,
+        "z": 0.0
+      },
+      {
+        "x": 0.24942462146282196,
+        "y": -0.4318000078201294,
+        "z": 0.0
+      },
+      {
+        "x": 0.49847498536109924,
+        "y": 0.0,
+        "z": 0.0
+      }
+    ],
+    "boxHeight": 0.30479999999999996
+  },
+  "2019 Dual Target": {
+    "realWorldCoordinatesArray": [
+      {
+        "x": -0.15077440440654755,
+        "y": 0.06761480122804642,
+        "z": 0.0
+      },
+      {
+        "x": -0.18575020134449005,
+        "y": -0.06761480122804642,
+        "z": 0.0
+      },
+      {
+        "x": 0.18575020134449005,
+        "y": -0.06761480122804642,
+        "z": 0.0
+      },
+      {
+        "x": 0.15077440440654755,
+        "y": 0.06761480122804642,
+        "z": 0.0
+      }
+    ],
+    "boxHeight": 0.1
+  }
 }

photon-client/src/components/pipeline/3D/MiniMap.vue

@@ -94,7 +94,7 @@
                 // move the rotation point to the center of the rect
                 this.ctx.translate(y + this.targetWidth / 2, x + this.targetHeight / 2); // wpi lib makes x forward and back and y left to right
                 // rotate the rect
-                this.ctx.rotate(target.rotation.radians * -1);
+                this.ctx.rotate(target.rot * -1 * Math.PI / 180.0);
 
                 // draw the rect on the transformed context
                 // Note: after transforming [0,0] is visually [x,y]

photon-client/src/store/index.js

@@ -93,7 +93,7 @@ export default new Vuex.Store({
                     skew: 0,
                     area: 0,
                     // 3D only
-                    pose: {x: 0, y: 0, rotation: 0},
+                    pose: {x: 0, y: 0, rot: 0},
                 }]
             },
         settings: {

photon-client/src/views/PipelineViews/PnPTab.vue

@@ -66,7 +66,10 @@
                     color: "Success",
                     text: ""
                 },
-                snack: false
+                snack: false,
+                selectedModel: {
+                    isCustom: false
+                }
             }
         },
         computed: {
@@ -164,7 +167,10 @@
                 this.uploadModel(this.selectedModel, true);
             },
             uploadModel(model, premade = false) {
-                this.axios.post("http://" + this.$address + "/api/vision/pnpModel", model).then(() => {
+                this.axios.post("http://" + this.$address + "/api/vision/pnpModel", {
+                    ['targetModel']: model,
+                    ['index']: this.$store.getters.currentCameraIndex
+                }).then(() => {
                     this.snackbar = {
                         color: "success",
                         text: premade ? "Target model changed successfully" : "Custom target model uploaded and selected successfully"

photon-client/src/views/PipelineViews/ThresholdTab.vue

@@ -195,7 +195,6 @@
                             'hsvHue': s.hsvHue,
                             'hsvSaturation': s.hsvSaturation,
                             'hsvValue': s.hsvValue,
-                            'outputShowThresholded': this.showThresholdState,
                             'cameraIndex': this.$store.state.currentCameraIndex
                         }
                     });
@@ -208,6 +207,7 @@
                     case 0:
                         this.currentFunction = undefined;
                         this.$store.state.colorPicking = false;
+                        this.handlePipelineUpdate("outputShouldDraw", true);
                         return;
                     case 1:
                         this.currentFunction = this.colorPicker.eyeDrop;