Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitlab.com/chameleon-vision/Chameleon-Vision into dev

Browse Source 
# Conflicts:
#	chameleon-client/src/views/CameraViewes/OutputTab.vue
This commit is contained in:
Omer
2019-10-30 14:34:19 +02:00
parent 120fa64f3c 1e02f114e1
commit bb49cddd1a
30 changed files with 737 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ public class ServerHandler {
setField(SettingsManager.GeneralSettings, e.getKey(), e.getValue());
}
SettingsManager.saveSettings();
sendFullSettings();
break;
}
case "cameraSettings": {
@@ -60,16 +61,19 @@ public class ServerHandler {
CameraManager.getCurrentCamera().setStreamDivisor((Integer) camSettings.get("streamDivisor"));
CameraManager.getCurrentCamera().setCamVideoMode((Integer) camSettings.get("resolution"), true);
SettingsManager.saveSettings();
sendFullSettings();
break;
}
case "changeCameraName": {
CameraManager.getCurrentCamera().setNickname((String) entry.getValue());
sendFullSettings();
SettingsManager.saveSettings();
break;
}
case "changePipelineName": {
CameraManager.getCurrentPipeline().nickname = (String) entry.getValue();
sendFullSettings();
SettingsManager.saveSettings();
break;
}
case "duplicatePipeline": {
@@ -84,6 +88,7 @@ public class ServerHandler {
} else {
CameraManager.getCurrentCamera().addPipeline(origPipeline);
}
SettingsManager.saveSettings();
break;
}
case "command": {
@@ -92,6 +97,7 @@ public class ServerHandler {
case "addNewPipeline":
cam.addPipeline();
sendFullSettings();
SettingsManager.saveSettings();
break;
case "deleteCurrentPipeline":
int currentIndex = cam.getCurrentPipelineIndex();
@@ -104,6 +110,10 @@ public class ServerHandler {
cam.deletePipeline();
cam.setCurrentPipelineIndex(nextIndex);
sendFullSettings();
SettingsManager.saveSettings();
break;
case "save":
SettingsManager.saveSettings();
break;
}
// used to define all incoming commands
@@ -117,9 +127,7 @@ public class ServerHandler {
case "currentPipeline": {
var cam = CameraManager.getCurrentCamera();
cam.setCurrentPipelineIndex((Integer) entry.getValue());
HashMap<String, Object> tmp = new HashMap<>();
tmp.put("pipeline", getOrdinalPipeline());
broadcastMessage(tmp);
sendFullSettings();
try {
cam.setBrightness(cam.getCurrentPipeline().brightness);
cam.setExposure(cam.getCurrentPipeline().exposure);