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

added set camera by index and bugfix in current camera

Browse Source
This commit is contained in:
ori agranat
2019-10-25 06:37:04 -07:00
parent 583154090b
commit a89ab3393f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
View File

@@ -118,6 +118,10 @@ public class CameraManager {
SettingsManager.GeneralSettings.currentCamera = cameraName;
SettingsManager.updateCameraSetting(cameraName, getCurrentCamera().getCurrentPipelineIndex());
}
public static void setCurrentCamera(int cameraIndex) throws CameraException {
List<String> s = new ArrayList<String>(AllCamerasByName.keySet());
setCurrentCamera(s.get(cameraIndex));
}
public static Pipeline getCurrentPipeline() throws CameraException {
return getCurrentCamera().getCurrentPipeline();

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

@@ -111,7 +111,7 @@ public class ServerHandler {
break;
}
case "currentCamera": {
CameraManager.setCurrentCamera((String) entry.getValue());
CameraManager.setCurrentCamera((Integer) entry.getValue());
sendFullSettings();
break;
}