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

Fix mixup between Pipeline and PipelineSettings in getOrdinalPipeline()

Browse Source
This commit is contained in:
Matt
2019-11-23 18:34:10 -08:00
parent d6e435a124
commit 45a1415a16
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Main/src/main/java/com/chameleonvision/web/ServerHandler.java
View File

@@ -222,12 +222,16 @@ public class ServerHandler {
private static HashMap<String, Object> getOrdinalPipeline() throws IllegalAccessException {
HashMap<String, Object> tmp = new HashMap<>();
for (Field f : CVPipelineSettings.class.getFields()) {
if (!f.getType().isEnum()) {
tmp.put(f.getName(), f.get(VisionManager.getCurrentUIVisionProcess().getCurrentPipeline()));
} else {
var i = (Enum) f.get(VisionManager.getCurrentUIVisionProcess().getCurrentPipeline());
tmp.put(f.getName(), i.ordinal());
for (Field field : CVPipelineSettings.class.getFields()) { // iterate over every field in CVPipelineSettings
try {
if (!field.getType().isEnum()) { // if the field is not an enum, get it based on the current pipeline
tmp.put(field.getName(), field.get(VisionManager.getCurrentUIVisionProcess().getCurrentPipeline().settings));
} else {
var ordinal = (Enum) field.get(VisionManager.getCurrentUIVisionProcess().getCurrentPipeline().settings);
tmp.put(field.getName(), ordinal.ordinal());
}
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
}
return tmp;