diff --git a/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java b/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java index 1b10ca177..a9721ab49 100644 --- a/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java +++ b/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java @@ -228,7 +228,13 @@ public class Camera { public void setExposure(int exposure) { getCurrentPipeline().exposure = exposure; - UsbCam.setExposureManual(exposure); + try { + UsbCam.setExposureManual(exposure); + } + catch (VideoException e) + { + System.err.println("Camera Does not support exposure change"); + } } public long grabFrame(Mat image) { @@ -252,6 +258,8 @@ public class Camera { } public void setNickname(String newNickname) { + //Deletes old camera nt table + NetworkTableInstance.getDefault().getTable("/chameleon-vision/" + this.nickname).getInstance().deleteAllEntries(); nickname = newNickname; if (CameraManager.AllVisionProcessesByName.containsKey(this.name)) { NetworkTable newNT = NetworkTableInstance.getDefault().getTable("/chameleon-vision/" + this.nickname); diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java index f50188d34..c2e52a55d 100644 --- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java @@ -97,7 +97,7 @@ public class ServerHandler { case "deleteCurrentPipeline": int currentIndex = cam.getCurrentPipelineIndex(); int nextIndex; - if (currentIndex == cam.getPipelines().size() - 1){ + if (currentIndex == cam.getPipelines().size() - 1) { nextIndex = currentIndex - 1; } else { nextIndex = currentIndex; @@ -124,7 +124,7 @@ public class ServerHandler { try { cam.setBrightness(cam.getCurrentPipeline().brightness); cam.setExposure(cam.getCurrentPipeline().exposure); - }catch (Exception e){ + } catch (Exception e) { continue; } break; @@ -133,11 +133,7 @@ public class ServerHandler { setField(CameraManager.getCurrentCamera().getCurrentPipeline(), entry.getKey(), entry.getValue()); switch (entry.getKey()) { case "exposure": { - try { - CameraManager.getCurrentCamera().setExposure((Integer) entry.getValue()); - } catch (Exception e) { - System.err.println("Camera Does not support exposure change"); - } + CameraManager.getCurrentCamera().setExposure((Integer) entry.getValue()); } case "brightness": { CameraManager.getCurrentCamera().setBrightness((Integer) entry.getValue()); @@ -239,7 +235,7 @@ public class ServerHandler { fullSettings.put("pipelineList", currentCamera.getPipelinesNickname()); fullSettings.put("resolutionList", currentCamera.getResolutionList()); fullSettings.put("port", currentCamera.getStreamPort()); - fullSettings.put("currentPipelineIndex",CameraManager.getCurrentCamera().getCurrentPipelineIndex()); + fullSettings.put("currentPipelineIndex", CameraManager.getCurrentCamera().getCurrentPipelineIndex()); fullSettings.put("currentCameraIndex", CameraManager.getCurrentCameraIndex()); } catch (CameraException | IllegalAccessException e) { System.err.println("No camera found!");