From 717e4f35686e913c092d8a6b0c6d82e11bfa79e0 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Mon, 21 Oct 2019 20:22:39 +0300
Subject: [PATCH] type fix and added full setting save

---
 Main/src/main/java/com/chameleonvision/web/ServerHandler.java | 3 +++
 chameleon-client/src/views/SettingsViewes/Cameras.vue         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
index f2d1e0e17..f270dd1be 100644
--- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
@@ -52,6 +52,7 @@ public class ServerHandler {
                         for (HashMap.Entry<String, Object> e : ((HashMap<String, Object>) entry.getValue()).entrySet()) {
                             setField(SettingsManager.GeneralSettings, e.getKey(), e.getValue());
                         }
+                        SettingsManager.saveSettings();
                         break;
                     }
                     case "cameraSettings": {
@@ -59,6 +60,7 @@ public class ServerHandler {
                         CameraManager.getCurrentCamera().setFOV((Number) camSettings.get("fov"));
                         CameraManager.getCurrentCamera().setStreamDivisor((Integer) camSettings.get("streamDivisor"));
                         CameraManager.getCurrentCamera().setCamVideoMode((Integer) camSettings.get("resolution"), true);
+                        SettingsManager.saveSettings();
                         break;
                     }
                     case "changeCameraName": {
@@ -89,6 +91,7 @@ public class ServerHandler {
                         CameraManager.setCurrentCamera((String) entry.getValue());
                         HashMap<String, Object> tmp = new HashMap<>();
                         tmp.put("pipeline", CameraManager.getCurrentCamera().getCurrentPipeline());
+                        tmp.put("pipelineList", CameraManager.getCurrentCamera().getPipelines().keySet());
                         tmp.put("port", CameraManager.getCurrentCamera().getStreamPort());
                         tmp.put("resolutionList", CameraManager.getResolutionList());
                         broadcastMessage(tmp);
diff --git a/chameleon-client/src/views/SettingsViewes/Cameras.vue b/chameleon-client/src/views/SettingsViewes/Cameras.vue
index 349f21261..9ee8ec314 100644
--- a/chameleon-client/src/views/SettingsViewes/Cameras.vue
+++ b/chameleon-client/src/views/SettingsViewes/Cameras.vue
@@ -1,8 +1,8 @@
 <template>
     <div>
         <CVselect name="Camera" :list="cameraList" v-model="currentCameraIndex"></CVselect>
-        <CVselect name="Resulotion" v-model="cameraSettings.resolution" :list="resolutionList"></CVselect>
-        <CVselect name="Stream Resulotion" v-model="cameraSettings.streamDivisor"  :list="['1:1','1:2','1:4','1:6']"></CVselect>
+        <CVselect name="Resolution" v-model="cameraSettings.resolution" :list="resolutionList"></CVselect>
+        <CVselect name="Stream Resolution" v-model="cameraSettings.streamDivisor" :list="['1:1','1:2','1:4','1:6']"></CVselect>
         <CVnumberinput name="Diagonal FOV" v-model="cameraSettings.fov" ></CVnumberinput>
         <v-btn style="margin-top:10px" small color="#4baf62" @click="sendCameraSettings">Save Camera Settings</v-btn>
     </div>