From eb5cb0bea0f0b226a89bfcf92d5389c9cc5e7334 Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Tue, 7 Jan 2020 21:58:45 -0800
Subject: [PATCH] Always send FPS to UI, remove target width/height box from UI

---
 chameleon-client/src/views/CameraViewes/3D.vue        | 11 -----------
 .../com/chameleonvision/vision/VisionProcess.java     |  7 ++++---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/chameleon-client/src/views/CameraViewes/3D.vue b/chameleon-client/src/views/CameraViewes/3D.vue
index 295d1d1c6..4dfd9fc59 100644
--- a/chameleon-client/src/views/CameraViewes/3D.vue
+++ b/chameleon-client/src/views/CameraViewes/3D.vue
@@ -4,17 +4,6 @@
             <v-col :cols="6">
                 <CVswitch :disabled="allow3D" v-model="value.is3D" name="Enable 3D" @input="handleData('is3D')"/>
             </v-col>
-            <v-col>
-                <CVnumberInput name="Max Height:" v-model="value.targetHeight" @input="handleData('targetHeight')"/>
-                <CVnumberInput name="Max Width:" v-model="value.targetWidth" @input="handleData('targetWidth')"/>
-            </v-col>
-<!--            <v-col>-->
-<!--                <input type="file" ref="file" style="display: none" accept=".csv" @change="readFile">-->
-<!--                <v-btn @click="$refs.file.click()" small>-->
-<!--                    upload model-->
-<!--                </v-btn>-->
-<!--            </v-col>-->
-
         </v-row>
         <mini-map class="miniMapClass" :targets="targets" :horizontal-f-o-v="horizontalFOV"/>
     </div>
diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
index 05479d3b0..573506c0c 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
@@ -220,10 +220,11 @@ public class VisionProcess {
                     point.put("fps", visionRunnable.fps);
                     point.put("targets", webTargets);
                     point.put("rawPoint", center);
-                    WebSend.put("point", point);
-                    SocketHandler.broadcastMessage(WebSend);
+                } else {
+                    point.put("fps", visionRunnable.fps);
                 }
-
+                WebSend.put("point", point);
+                SocketHandler.broadcastMessage(WebSend);
             }
         }
     }