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' into 'V2.0/single-point-calibration'

Browse Source 
# Conflicts:
#   Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#   Main/src/main/java/com/chameleonvision/web/Server.java
This commit is contained in:
ori agranat
2019-10-29 20:30:42 +00:00
parent e24cc5564a a7f306d0b9
commit bddb9c0935
6 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,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;
@@ -132,7 +132,7 @@ public class ServerHandler {
try {
cam.setBrightness(cam.getCurrentPipeline().brightness);
cam.setExposure(cam.getCurrentPipeline().exposure);
}catch (Exception e){
} catch (Exception e) {
continue;
}
break;
@@ -141,11 +141,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());
@@ -247,7 +243,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!");