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

Rename Camera and CamProcess to USBCamera and USBCameraProcess

Browse Source 
Further changes:
- Add CameraProcess interface
- Change VisionProcess to pass the interface as parameter
This commit is contained in:
Matt
2019-11-02 10:10:02 -07:00
parent 570a042e35
commit 24313ba45b
12 changed files with 290 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,9 @@
package com.chameleonvision.vision.camera;
import com.chameleonvision.settings.GeneralSettings;
import com.chameleonvision.util.FileHelper;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.Pipeline;
import com.chameleonvision.vision.process.USBCameraProcess;
import com.chameleonvision.vision.process.VisionProcess;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -21,10 +21,10 @@ public class CameraManager {
private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "cameras");
private static LinkedHashMap<String, Camera> AllCamerasByName = new LinkedHashMap<>();
public static HashMap<String, VisionProcess> AllVisionProcessesByName = new HashMap<>();
private static LinkedHashMap<String, USBCamera> allCamerasByName = new LinkedHashMap<>();
public static HashMap<String, VisionProcess> allVisionProcessesByName = new HashMap<>();
static HashMap<String, UsbCameraInfo> AllUsbCameraInfosByName = new HashMap<>() {{
static HashMap<String, UsbCameraInfo> allUsbCameraInfosByName = new HashMap<>() {{
var suffix = 0;
for (var info : UsbCamera.enumerateUsbCameras()) {
var cap = new VideoCapture(info.dev);
@@ -40,31 +40,31 @@ public class CameraManager {
}
}};
public static HashMap<String, Camera> getAllCamerasByName() {
return AllCamerasByName;
public static HashMap<String, USBCamera> getAllCamerasByName() {
return allCamerasByName;
}
public static List<String> getAllCameraByNickname(){
var cameras = getAllCamerasByName();
return cameras.values().stream().map(Camera::getNickname).collect(Collectors.toList());
return cameras.values().stream().map(USBCamera::getNickname).collect(Collectors.toList());
}
public static boolean initializeCameras() {
if (AllUsbCameraInfosByName.size() == 0) return false;
if (allUsbCameraInfosByName.size() == 0) return false;
FileHelper.CheckPath(CamConfigPath);
AllUsbCameraInfosByName.forEach((key, value) -> {
allUsbCameraInfosByName.forEach((key, value) -> {
var camPath = Paths.get(CamConfigPath.toString(), String.format("%s.json", key));
File camJsonFile = new File(camPath.toString());
if (camJsonFile.exists() && camJsonFile.length() != 0) {
try {
Gson gson = new GsonBuilder().registerTypeAdapter(Camera.class, new CameraDeserializer()).create();
Gson gson = new GsonBuilder().registerTypeAdapter(USBCamera.class, new CameraDeserializer()).create();
var camJsonFileReader = new FileReader(camPath.toString());
var gsonRead = gson.fromJson(camJsonFileReader, Camera.class);
AllCamerasByName.put(key, gsonRead);
var gsonRead = gson.fromJson(camJsonFileReader, USBCamera.class);
allCamerasByName.put(key, gsonRead);
} catch (FileNotFoundException ex) {
ex.printStackTrace();
}
} else {
if (!addCamera(new Camera(key), key)) {
if (!addCamera(new USBCamera(key), key)) {
System.err.println("Failed to add camera! Already exists!");
}
}
@@ -73,39 +73,39 @@ public class CameraManager {
}
public static void initializeThreads(){
AllCamerasByName.forEach((key, value) -> {
VisionProcess visionProcess = new VisionProcess(value);
AllVisionProcessesByName.put(key, visionProcess);
allCamerasByName.forEach((name, camera) -> {
VisionProcess visionProcess = new VisionProcess(new USBCameraProcess(camera));
allVisionProcessesByName.put(name, visionProcess);
new Thread(visionProcess).start();
});
}
private static boolean addCamera(Camera camera, String cameraName) {
if (AllCamerasByName.containsKey(cameraName)) return false;
camera.addPipeline();
AllCamerasByName.put(cameraName, camera);
private static boolean addCamera(USBCamera USBCamera, String cameraName) {
if (allCamerasByName.containsKey(cameraName)) return false;
USBCamera.addPipeline();
allCamerasByName.put(cameraName, USBCamera);
return true;
}
private static Camera getCamera(String cameraName) {
return AllCamerasByName.get(cameraName);
private static USBCamera getCamera(String cameraName) {
return allCamerasByName.get(cameraName);
}
public static Camera getCameraByIndex(int index) {
return AllCamerasByName.get( (AllCamerasByName.keySet().toArray())[ index ] );
public static USBCamera getCameraByIndex(int index) {
return allCamerasByName.get( (allCamerasByName.keySet().toArray())[ index ] );
}
public static Camera getCurrentCamera() throws CameraException {
if (AllCamerasByName.size() == 0) throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
var curCam = AllCamerasByName.get(SettingsManager.GeneralSettings.currentCamera);
public static USBCamera getCurrentCamera() throws CameraException {
if (allCamerasByName.size() == 0) throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
var curCam = allCamerasByName.get(SettingsManager.generalSettings.currentCamera);
if (curCam == null) throw new CameraException(CameraException.CameraExceptionType.BAD_CAMERA);
return curCam;
}
public static Integer getCurrentCameraIndex() throws CameraException {
if (AllCamerasByName.size() == 0) throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
List<String> arr = new ArrayList<>(AllCamerasByName.keySet());
for (var i = 0; i < AllCamerasByName.size(); i++){
if (SettingsManager.GeneralSettings.currentCamera.equals(arr.get(i))){
if (allCamerasByName.size() == 0) throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
List<String> arr = new ArrayList<>(allCamerasByName.keySet());
for (var i = 0; i < allCamerasByName.size(); i++){
if (SettingsManager.generalSettings.currentCamera.equals(arr.get(i))){
return i;
}
}
@@ -113,13 +113,13 @@ public class CameraManager {
}
public static void setCurrentCamera(String cameraName) throws CameraException {
if (!AllCamerasByName.containsKey(cameraName))
if (!allCamerasByName.containsKey(cameraName))
throw new CameraException(CameraException.CameraExceptionType.BAD_CAMERA);
SettingsManager.GeneralSettings.currentCamera = cameraName;
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());
List<String> s = new ArrayList<String>(allCamerasByName.keySet());
setCurrentCamera(s.get(cameraIndex));
}
@@ -136,20 +136,20 @@ public class CameraManager {
}
public static VisionProcess getVisionProcessByCameraName(String cameraName) {
return AllVisionProcessesByName.get(cameraName);
return allVisionProcessesByName.get(cameraName);
}
public static VisionProcess getCurrentVisionProcess() throws CameraException {
if (!SettingsManager.GeneralSettings.currentCamera.equals("")){
return AllVisionProcessesByName.get(SettingsManager.GeneralSettings.currentCamera);
if (!SettingsManager.generalSettings.currentCamera.equals("")){
return allVisionProcessesByName.get(SettingsManager.generalSettings.currentCamera);
}
throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
}
public static void saveCameras() {
for (var entry : AllCamerasByName.entrySet()) {
for (var entry : allCamerasByName.entrySet()) {
try {
Gson gson = new GsonBuilder().setPrettyPrinting().registerTypeAdapter(Camera.class, new CameraSerializer()).create();
Gson gson = new GsonBuilder().setPrettyPrinting().registerTypeAdapter(USBCamera.class, new CameraSerializer()).create();
FileWriter writer = new FileWriter(Paths.get(CamConfigPath.toString(), String.format("%s.json", entry.getKey())).toString());
gson.toJson(entry.getValue(), writer);
writer.flush();