initial pipeline update

This commit is contained in:
ori agranat
2019-09-29 17:39:58 +03:00
parent 1548d3aa14
commit b13f145ee6
4 changed files with 22 additions and 7 deletions

View File

@@ -3,7 +3,9 @@ package com.chameleonvision.vision.camera;
import com.chameleonvision.CameraException;
import com.chameleonvision.FileHelper;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.GeneralSettings;
import com.chameleonvision.vision.Pipeline;
import com.chameleonvision.vision.process.VisionProcess;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import edu.wpi.cscore.UsbCamera;
@@ -22,6 +24,7 @@ public class CameraManager {
private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "cameras");
private static HashMap<String, Camera> AllCamerasByName = new HashMap<>();
private static HashMap<String, VisionProcess> AllVisionProcessesByName = new HashMap<>();
static HashMap<String, UsbCameraInfo> AllUsbCameraInfosByName = new HashMap<>() {{
var suffix = 0;
@@ -67,6 +70,14 @@ public class CameraManager {
return true;
}
public static void initializeThreads(){
for (var camSet : AllCamerasByName.entrySet()) {
VisionProcess visionProcess = new VisionProcess(camSet.getValue());
AllVisionProcessesByName.put(camSet.getKey(),visionProcess);
new Thread(visionProcess).start();
}
}
private static boolean addCamera(Camera camera, String cameraName) {
if (AllCamerasByName.containsKey(cameraName)) return false;
for (int i = 0; i < 10;i++){
@@ -115,6 +126,12 @@ public class CameraManager {
}
throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
}
public static VisionProcess getCurrentCameraProcess() throws CameraException{
if (!SettingsManager.GeneralSettings.curr_camera.equals("")){
return AllVisionProcessesByName.get(SettingsManager.GeneralSettings.curr_camera);
}
throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
}
public static void saveCameras() {
for (var entry : AllCamerasByName.entrySet()) {