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

Fixed video mode not being set when loading from json

Browse Source
This commit is contained in:
Banks Troutman
2019-09-22 13:35:19 -04:00
parent 33c35cda86
commit 07d0274753
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Main/src/main/java/com/chameleonvision/vision/camera/CameraDeserializer.java
View File

@@ -16,6 +16,8 @@ public class CameraDeserializer implements JsonDeserializer<Camera> {
var jsonObj = jsonElement.getAsJsonObject();
var camFOV = jsonObj.get("FOV").getAsDouble();
var camName = jsonObj.get("name").getAsString();
var videoModeIndex = jsonObj.get("resolution").getAsInt();
var pipelines = jsonObj.get("pipelines");
HashMap<Integer, Pipeline> actualPipelines = new HashMap<>();
@@ -28,6 +30,6 @@ public class CameraDeserializer implements JsonDeserializer<Camera> {
e.printStackTrace();
}
return actualPipelines != null ? new Camera(camName, camFOV, actualPipelines) : new Camera(camName, camFOV);
return actualPipelines != null ? new Camera(camName, camFOV, actualPipelines, videoModeIndex) : new Camera(camName, camFOV, videoModeIndex);
}
}