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

opencv cam open bugfix

Browse Source
This commit is contained in:
ori
2019-09-20 11:08:16 +03:00
parent 07c21aca1d
commit c143e18f3e
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,21 +25,20 @@ public class CameraManager {
private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "Cams");
// TODO: Fix suffix for camera
// TODO: throw a camera Exception if no camera is connected
static HashMap<String, UsbCameraInfo> AllUsbCameraInfosByName = new HashMap<>() {{
var suffix = 0;
for (var info : UsbCamera.enumerateUsbCameras()) {
var cap = new VideoCapture(info.name);
var cap = new VideoCapture(info.dev);
if (cap.isOpened()) {
cap.release();
var name = info.name;
while (this.containsKey(name)) {
suffix++;
name = String.format("%s(%s)", info.name, suffix);
}
put(name, info);
}
var name = info.name;
while (this.containsKey(name)) {
suffix++;
name = String.format("%s(%s)", info.name, suffix);
}
put(name, info);
}
}};
@@ -67,10 +66,6 @@ public class CameraManager {
System.err.println("Failed to add camera! Already exists!");
}
}
// TODO: Set currentCameraName from GeneralSettings instead of this
if (currentCameraName == null && AllCamerasByName.size() == 1) { // set current camera to first found
currentCameraName = AllCamerasByName.keySet().stream().findFirst().get();
}
}
}