Added Runnables for VisionProcess threads

This commit is contained in:
Banks Troutman
2019-11-15 16:01:50 -05:00
parent cd21186bf7
commit 1e613ee342
9 changed files with 108 additions and 62 deletions

View File

@@ -16,7 +16,6 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
@@ -28,7 +27,6 @@ public class VisionManager {
public static final LinkedHashMap<String, UsbCameraInfo> UsbCameraInfosByCameraName = new LinkedHashMap<>();
public static final LinkedHashMap<String, VisionProcess> VisionProcessesByCameraName = new LinkedHashMap<>();
public static boolean initializeSources() {
int suffix = 0;
for (UsbCameraInfo info : UsbCamera.enumerateUsbCameras()) {
@@ -48,19 +46,26 @@ public class VisionManager {
return false;
}
FileHelper.CheckPath(CamConfigPath);
UsbCameraInfosByCameraName.forEach((cameraName, cameraInfo) -> {
Path cameraConfigPath = Paths.get(CamConfigPath.toString(), String.format("%s.json", cameraName));
File cameraConfigFile = new File(cameraConfigPath.toString());
if (cameraConfigFile.exists() && cameraConfigFile.length() != 0) {
// try {
// Gson gson = new GsonBuilder().registerTypeAdapter(USBCameraProcess.class, new CameraDeserializer());
// }
}
});
// FileHelper.CheckPath(CamConfigPath);
// UsbCameraInfosByCameraName.forEach((cameraName, cameraInfo) -> {
// Path cameraConfigPath = Paths.get(CamConfigPath.toString(), String.format("%s.json", cameraName));
// File cameraConfigFile = new File(cameraConfigPath.toString());
// if (cameraConfigFile.exists() && cameraConfigFile.length() != 0) {
//// try {
//// Gson gson = new GsonBuilder().registerTypeAdapter(USBCameraProcess.class, new CameraDeserializer());
//// }
// }
// })
// TODO: implement new camera JSON loads
return true;
}
public void PipelineSerializer(List<CVPipelineSettings> list, Path path) throws IOException {
File pipelineFile = new File(path.toString());
ObjectMapper objectMapper = new ObjectMapper().enableDefaultTyping();
objectMapper.writeValue(pipelineFile,list);
}
public static void initializeProcesses() {