Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-01 02:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

added nickname call in server handler

Browse Source
This commit is contained in:
ori agranat
2019-10-25 14:05:00 +03:00
parent 666cf66a99
commit dfe88d8df5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Main/src/main/java/com/chameleonvision/web/ServerHandler.java
View File

@@ -91,6 +91,7 @@ public class ServerHandler {
switch ((String) entry.getValue()) { switch ((String) entry.getValue()) {
case "addNewPipeline": case "addNewPipeline":
cam.addPipeline(); cam.addPipeline();
sendFullSettings();
break; break;
case "deleteCurrentPipeline": case "deleteCurrentPipeline":
cam.deleteCurrentPipeline(); cam.deleteCurrentPipeline();
@@ -223,10 +224,10 @@ public class ServerHandler {
try { try {
fullSettings.put("settings", getOrdinalSettings()); fullSettings.put("settings", getOrdinalSettings());
fullSettings.put("cameraSettings", getOrdinalCameraSettings()); fullSettings.put("cameraSettings", getOrdinalCameraSettings());
fullSettings.put("cameraList", CameraManager.getAllCamerasByName().keySet()); fullSettings.put("cameraList", CameraManager.getAllCameraByNickname());
var currentCamera = CameraManager.getCurrentCamera(); var currentCamera = CameraManager.getCurrentCamera();
fullSettings.put("pipeline", getOrdinalPipeline()); fullSettings.put("pipeline", getOrdinalPipeline());
fullSettings.put("pipelineList", currentCamera.getPipelines().keySet()); fullSettings.put("pipelineList", currentCamera.getPipelinesNickname());
fullSettings.put("resolutionList", currentCamera.getResolutionList()); fullSettings.put("resolutionList", currentCamera.getResolutionList());
fullSettings.put("port", currentCamera.getStreamPort()); fullSettings.put("port", currentCamera.getStreamPort());
} catch (CameraException | IllegalAccessException e) { } catch (CameraException | IllegalAccessException e) {