diff --git a/Main/src/main/java/com/chameleonvision/config/CameraConfig.java b/Main/src/main/java/com/chameleonvision/config/CameraConfig.java index 6413934dc..e4162bec3 100644 --- a/Main/src/main/java/com/chameleonvision/config/CameraConfig.java +++ b/Main/src/main/java/com/chameleonvision/config/CameraConfig.java @@ -1,5 +1,6 @@ package com.chameleonvision.config; +import com.chameleonvision.vision.camera.USBCameraProcess; import com.chameleonvision.vision.camera.USBCameraProperties; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -28,4 +29,9 @@ public class CameraConfig { this.name = name; this.nickname = name; } + + public static CameraConfig fromUSBCameraProcess(USBCameraProcess process) { + USBCameraProperties camProps = process.getProperties(); + return new CameraConfig(camProps.FOV, camProps.name, camProps.path, camProps.getNickname()); + } } diff --git a/Main/src/main/java/com/chameleonvision/config/CameraSerializer.java b/Main/src/main/java/com/chameleonvision/config/CameraSerializer.java deleted file mode 100644 index fd0386f73..000000000 --- a/Main/src/main/java/com/chameleonvision/config/CameraSerializer.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.chameleonvision.config; - -import com.chameleonvision.vision.camera.USBCameraProperties; -import com.chameleonvision.vision.camera.USBCameraProcess; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; - -import java.io.IOException; - -public class CameraSerializer extends StdSerializer { - public CameraSerializer(Class t) { - super(t); - } - - @Override - public void serialize(USBCameraProcess value, JsonGenerator gen, SerializerProvider provider) throws IOException { - gen.writeStartObject(); - USBCameraProperties camProps = value.getProperties(); - gen.writeNumberField("FOV", camProps.FOV); - gen.writeStringField("Name", camProps.name); - gen.writeStringField("Path", camProps.path); - gen.writeStringField("Nickname", camProps.getNickname()); - } -}