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

replace CameraSerializer with helper function in CameraConfig

Browse Source
This commit is contained in:
Banks Troutman
2019-11-23 12:13:16 -05:00
parent faf03e7ba2
commit cb401997ca
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}
}

25
Main/src/main/java/com/chameleonvision/config/CameraSerializer.java
View File

@@ -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<USBCameraProcess> {
public CameraSerializer(Class<USBCameraProcess> 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());
}
}