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

fixed empty lists in ui

Browse Source
This commit is contained in:
ori
2019-09-20 01:25:53 -07:00
parent c143e18f3e
commit 61f21e6b1b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,6 @@ public class CameraManager {
private static HashMap<String, Camera> AllCamerasByName = new HashMap<>();
private static String currentCameraName;
public static HashMap<String, Camera> getAllCamerasByName() { return AllCamerasByName; }
public static void initializeCameras() {
@@ -62,17 +60,17 @@ public class CameraManager {
ex.printStackTrace();
}
} else {
if (!addCamera(new Camera(entry.getKey()))) {
if (!addCamera(new Camera(entry.getKey()),entry.getKey())) {
System.err.println("Failed to add camera! Already exists!");
}
}
}
}
private static boolean addCamera(Camera camera) {
if (AllCamerasByName.containsKey(camera.name)) return false;
private static boolean addCamera(Camera camera, String cameraName) {
if (AllCamerasByName.containsKey(cameraName)) return false;
camera.addPipeline();
AllCamerasByName.put(camera.name, camera);
AllCamerasByName.put(cameraName, camera);
return true;
}
@@ -82,13 +80,13 @@ public class CameraManager {
public static void setCurrentCamera(String cameraName) throws CameraException {
if (!AllCamerasByName.containsKey(cameraName)) throw new CameraException(CameraException.CameraExceptionType.BAD_CAMERA);
currentCameraName = cameraName;
SettingsManager.GeneralSettings.curr_camera = cameraName;
SettingsManager.getInstance().updateCameraSetting(cameraName, getCurrentCamera().getCurrentPipelineIndex());
}
public static Camera getCurrentCamera() throws CameraException {
if (AllCamerasByName.size() == 0) throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
var curCam = AllCamerasByName.get(currentCameraName);
var curCam = AllCamerasByName.get(SettingsManager.GeneralSettings.curr_camera);
if (curCam == null) throw new CameraException(CameraException.CameraExceptionType.BAD_CAMERA);
return curCam;
}
@@ -104,9 +102,9 @@ public class CameraManager {
}
public static List<String> getResolutionList() throws CameraException {
if (!currentCameraName.equals("")) {
if (!SettingsManager.GeneralSettings.curr_camera.equals("")) {
List<String> list = new ArrayList<>();
var cam = CameraManager.getCamera(currentCameraName).UsbCam;
var cam = CameraManager.getCamera(SettingsManager.GeneralSettings.curr_camera).UsbCam;
for (var res : cam.enumerateVideoModes()) {
list.add(String.format("%s X %s at %s fps", res.width, res.height, res.fps));
}