From b1e8fb53a5415b379438aa28ecd3552388cbdef4 Mon Sep 17 00:00:00 2001 From: Banks Troutman Date: Sun, 10 Nov 2019 17:55:28 -0500 Subject: [PATCH] Add PipelineType enum for config --- .../chameleonvision/classabstraction/VisionManager.java | 6 +++--- .../classabstraction/camera/USBCameraProcess.java | 1 + .../classabstraction/{camera => config}/CameraConfig.java | 2 +- .../classabstraction/config/PipelineConfig.java | 8 ++++++++ .../classabstraction/pipeline/PipelineType.java | 7 +++++++ 5 files changed, 20 insertions(+), 4 deletions(-) rename Main/src/main/java/com/chameleonvision/classabstraction/{camera => config}/CameraConfig.java (80%) create mode 100644 Main/src/main/java/com/chameleonvision/classabstraction/config/PipelineConfig.java create mode 100644 Main/src/main/java/com/chameleonvision/classabstraction/pipeline/PipelineType.java diff --git a/Main/src/main/java/com/chameleonvision/classabstraction/VisionManager.java b/Main/src/main/java/com/chameleonvision/classabstraction/VisionManager.java index e5d735f2f..7e8ae11bc 100644 --- a/Main/src/main/java/com/chameleonvision/classabstraction/VisionManager.java +++ b/Main/src/main/java/com/chameleonvision/classabstraction/VisionManager.java @@ -47,9 +47,9 @@ public class VisionManager { 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()) - } +// try { +// Gson gson = new GsonBuilder().registerTypeAdapter(USBCameraProcess.class, new CameraDeserializer()); +// } } }) diff --git a/Main/src/main/java/com/chameleonvision/classabstraction/camera/USBCameraProcess.java b/Main/src/main/java/com/chameleonvision/classabstraction/camera/USBCameraProcess.java index be5b506ef..f24b15e3d 100644 --- a/Main/src/main/java/com/chameleonvision/classabstraction/camera/USBCameraProcess.java +++ b/Main/src/main/java/com/chameleonvision/classabstraction/camera/USBCameraProcess.java @@ -1,5 +1,6 @@ package com.chameleonvision.classabstraction.camera; +import com.chameleonvision.classabstraction.config.CameraConfig; import edu.wpi.cscore.CvSink; import edu.wpi.cscore.UsbCamera; import edu.wpi.cscore.VideoException; diff --git a/Main/src/main/java/com/chameleonvision/classabstraction/camera/CameraConfig.java b/Main/src/main/java/com/chameleonvision/classabstraction/config/CameraConfig.java similarity index 80% rename from Main/src/main/java/com/chameleonvision/classabstraction/camera/CameraConfig.java rename to Main/src/main/java/com/chameleonvision/classabstraction/config/CameraConfig.java index 830b9a358..22944dd27 100644 --- a/Main/src/main/java/com/chameleonvision/classabstraction/camera/CameraConfig.java +++ b/Main/src/main/java/com/chameleonvision/classabstraction/config/CameraConfig.java @@ -1,4 +1,4 @@ -package com.chameleonvision.classabstraction.camera; +package com.chameleonvision.classabstraction.config; public class CameraConfig { public double FOV; diff --git a/Main/src/main/java/com/chameleonvision/classabstraction/config/PipelineConfig.java b/Main/src/main/java/com/chameleonvision/classabstraction/config/PipelineConfig.java new file mode 100644 index 000000000..7fa50505f --- /dev/null +++ b/Main/src/main/java/com/chameleonvision/classabstraction/config/PipelineConfig.java @@ -0,0 +1,8 @@ +package com.chameleonvision.classabstraction.config; + +import com.chameleonvision.classabstraction.pipeline.PipelineType; + +public class PipelineConfig { + public PipelineType type; + // TODO: config stuff +} diff --git a/Main/src/main/java/com/chameleonvision/classabstraction/pipeline/PipelineType.java b/Main/src/main/java/com/chameleonvision/classabstraction/pipeline/PipelineType.java new file mode 100644 index 000000000..4b705fd36 --- /dev/null +++ b/Main/src/main/java/com/chameleonvision/classabstraction/pipeline/PipelineType.java @@ -0,0 +1,7 @@ +package com.chameleonvision.classabstraction.pipeline; + +public enum PipelineType { + PIPELINE_2D, + PIPELINE_3D, + PIPELINE_DRIVER; +}