Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-21 01:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further abstract image capture, fix some UI bugs

Browse Source
This commit is contained in:
Banks Troutman
2019-11-25 05:34:04 -05:00
parent 26e0bb733b
commit ddba967793
23 changed files with 165 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Main/src/main/java/com/chameleonvision/config/CameraConfig.java
View File

@@ -1,6 +1,6 @@
package com.chameleonvision.config;
import com.chameleonvision.vision.camera.USBCameraProcess;
import com.chameleonvision.vision.camera.USBCameraCapture;
import com.chameleonvision.vision.camera.USBCameraProperties;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -30,7 +30,7 @@ public class CameraConfig {
this.nickname = name;
}
public static CameraConfig fromUSBCameraProcess(USBCameraProcess process) {
public static CameraConfig fromUSBCameraProcess(USBCameraCapture process) {
USBCameraProperties camProps = process.getProperties();
return new CameraConfig(camProps.FOV, camProps.name, camProps.path, camProps.getNickname());
}

4
Main/src/main/java/com/chameleonvision/config/ConfigManager.java
View File

@@ -4,6 +4,7 @@ import com.chameleonvision.util.ProgramDirectoryUtilities;
import com.chameleonvision.util.FileHelper;
import com.chameleonvision.vision.pipeline.CVPipelineSettings;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -34,7 +35,8 @@ public class ConfigManager {
}
private static void checkSettingsFile() {
if (!settingsFileExists()) {
boolean settingsFileEmpty = settingsFileExists() && new File(settingsFilePath.toString()).length() == 0;
if (settingsFileEmpty || !settingsFileExists()) {
try {
FileHelper.Serializer(settingsFilePath, settings);
} catch (IOException e) {