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 8dbad40e4..367215705 100644 --- a/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java +++ b/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java @@ -192,6 +192,10 @@ public class Camera { public HashMap getPipelines() { return pipelines; } + public List getPipelinesNickname(){ + var pipelines = getPipelines(); + return pipelines.values().stream().map(pipeline -> pipeline.nickname).collect(Collectors.toList()); + } public CamVideoMode getVideoMode() { return camVideoMode; diff --git a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java index 1abeaa3e9..3584ef6f1 100644 --- a/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java +++ b/Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java @@ -45,6 +45,10 @@ public class CameraManager { public static HashMap getAllCamerasByName() { return AllCamerasByName; } + public static List getAllCameraByNickname(){ + var cameras = getAllCamerasByName(); + return cameras.values().stream().map(Camera::getNickname).collect(Collectors.toList()); + } public static boolean initializeCameras() { if (AllUsbCameraInfosByName.size() == 0) return false; diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java index 5842f1ccd..1163300a7 100644 --- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java @@ -65,6 +65,7 @@ public class ServerHandler { } case "changeCameraName": { CameraManager.getCurrentCamera().setNickname((String) entry.getValue()); + sendFullSettings(); break; } case "changePipelineName": {