From 0b5f2b16f8290a0a55628584f5c8d9b2e505e4d1 Mon Sep 17 00:00:00 2001 From: Omer Date: Tue, 24 Sep 2019 03:06:04 +0300 Subject: [PATCH] Fov whole number fix, send full settings on cam change --- .../main/java/com/chameleonvision/web/ServerHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java index c94b381d5..2388b4e49 100644 --- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java @@ -94,10 +94,9 @@ public class ServerHandler { String newCamera = (String) value; System.out.printf("Changing camera to %s\n", newCamera); CameraManager.setCurrentCamera(newCamera); - HashMap portMap = new HashMap(); + HashMap portMap = new HashMap<>(); portMap.put("port", CameraManager.getCurrentCamera().getStreamPort()); - broadcastMessage(portMap); - broadcastMessage(CameraManager.getCurrentCamera()); //TODO CHECK JSON FOR CAMERA CHANGE + sendFullSettings(); break; case "curr_pipeline": String newPipeline = (String) value; @@ -113,7 +112,7 @@ public class ServerHandler { CameraManager.getCurrentCamera().setCamVideoMode(newVideoMode, true); break; case "FOV": - double newFov = (double) value; + double newFov = Double.parseDouble(value.toString()); System.out.printf("Changing FOV to %f\n", newFov); CameraManager.getCurrentCamera().setFOV(newFov); break;