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 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java

Browse Source
This commit is contained in:
Omer
2019-09-18 03:06:10 +03:00
parent 5fd3dc8f6c 45916b3e11
commit 7fdab7d3db
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
View File

@@ -93,8 +93,9 @@ public class SettingsManager {
private void InitiateUsbCameras() {
for (Map.Entry<String, UsbCameraInfo> entry : USBCamerasInfo.entrySet()) {
var device = entry.getValue();
var camera = new UsbCamera(device.name, device.dev);
UsbCameras.put(device.name, camera);
var name = entry.getKey();
UsbCamera camera = new UsbCamera(name, device.dev);
UsbCameras.put(name, camera);
}
}
@@ -222,27 +223,6 @@ public class SettingsManager {
}
public void SetCameraSettings(String cameraName, String field, Object value) {
switch (field) {
case "brightness":
UsbCameras.get(cameraName).setBrightness((int) value);
break;
case "exposure":
UsbCameras.get(cameraName).setExposureManual((int) value);
break;
case "resolution":
VideoMode videoMode = UsbCameras.get(cameraName).enumerateVideoModes()[(int) value];
Camera cam = Cameras.get(cameraName);
cam.camVideoMode.height = videoMode.height;
cam.camVideoMode.width = videoMode.width;
cam.camVideoMode.fps = videoMode.fps;
//cam.camVideoMode.pixel_format=videoMode.pixelFormat.toString().split(".")[1];//legacy from python
cam.camVideoMode.pixel_format = videoMode.pixelFormat.toString();
break;
}
}
//Savers
public void SaveSettings() {
SaveCameras();

1
Main/src/main/java/com/chameleonvision/web/Server.java
View File

@@ -69,7 +69,6 @@ public class Server {
int newResolution = (int) value;
System.out.printf("Changing resolution mode to %d\n", newResolution);
SettingsManager.getInstance().GetCurrentCamera().resolution = newResolution;
SettingsManager.getInstance().SetCameraSettings(SettingsManager.GeneralSettings.curr_camera, "resolution", newResolution);
SettingsManager.getInstance().SaveSettings();
break;
case "fov":