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 enums ordinal

Browse Source
This commit is contained in:
ori agranat
2019-10-14 22:36:56 +03:00
parent ce29e904b9
commit 221c1b7bfd
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Main/src/main/java/com/chameleonvision/vision/Pipeline.java
View File

@@ -1,6 +1,7 @@
package com.chameleonvision.vision;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
public class Pipeline {

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

@@ -1,10 +1,7 @@
package com.chameleonvision.web;
import com.chameleonvision.settings.GeneralSettings;
import com.chameleonvision.vision.Orientation;
import com.chameleonvision.vision.SortMode;
import com.chameleonvision.vision.TargetGroup;
import com.chameleonvision.vision.TargetIntersection;
import com.chameleonvision.vision.*;
import com.chameleonvision.vision.camera.Camera;
import com.chameleonvision.vision.camera.CameraException;
import com.chameleonvision.settings.SettingsManager;
@@ -126,7 +123,19 @@ public class ServerHandler {
broadcastMessage(obj, null);//Broadcasts the message to every user
}
public static HashMap<String,Object> getOrdinalPipeline() throws CameraException, IllegalAccessException {
HashMap<String,Object> tmp = new HashMap<>();
for (Field f : Pipeline.class.getFields()){
if (!f.getType().isEnum()){
tmp.put(f.getName(),f.get(CameraManager.getCurrentCamera().getCurrentPipeline()));
} else{
var i = (Enum) f.get(CameraManager.getCurrentCamera().getCurrentPipeline());
tmp.put(f.getName(),i.ordinal());
}
}
return tmp;
}
public static void sendFullSettings() {
//General settings
Map<String, Object> fullSettings = new HashMap<String, Object>();
@@ -134,13 +143,12 @@ public class ServerHandler {
fullSettings.put("cameraList", CameraManager.getAllCamerasByName().keySet());
try {
var currentCamera = CameraManager.getCurrentCamera();
fullSettings.put("pipeline",currentCamera.getCurrentPipeline());
fullSettings.put("pipeline", getOrdinalPipeline());
fullSettings.put("pipelineList", currentCamera.getPipelines().keySet());
fullSettings.put("resolutionList", CameraManager.getResolutionList());
fullSettings.put("port", currentCamera.getStreamPort());
} catch (CameraException e) {
} catch (CameraException | IllegalAccessException e) {
System.err.println("No camera found!");
//TODO: add message to ui to inform that there are no cameras
}
broadcastMessage(fullSettings);
}