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

changed general settings naming and added general settings save in ui

Browse Source
This commit is contained in:
ori agranat
2019-10-15 21:00:18 +03:00
parent 91a1338022
commit cd94c9f8c0
13 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,8 +48,9 @@ public class ServerHandler {
try {
switch (entry.getKey()) {
case "generalSettings": {
System.out.println("asdds");
//change general settings using a general settings object
for (HashMap.Entry<String,Object> e : ((HashMap<String,Object>)entry.getValue()).entrySet()){
setField(SettingsManager.GeneralSettings,e.getKey(),e.getValue());
}
break;
}
case "cameraSettings": {
@@ -133,7 +134,7 @@ public class ServerHandler {
broadcastMessage(obj, null);//Broadcasts the message to every user
}
public static HashMap<String,Object> getOrdinalPipeline() throws CameraException, IllegalAccessException {
private static HashMap<String,Object> getOrdinalPipeline() throws CameraException, IllegalAccessException {
HashMap<String,Object> tmp = new HashMap<>();
for (Field f : Pipeline.class.getFields()){
@@ -146,12 +147,22 @@ public class ServerHandler {
}
return tmp;
}
private static HashMap<String,Object> getOrdinalSettings() throws IllegalAccessException {
HashMap<String,Object> tmp = new HashMap<>();
tmp.put("teamNumber",SettingsManager.GeneralSettings.teamNumber);
tmp.put("connectionType",SettingsManager.GeneralSettings.connectionType.ordinal());
tmp.put("ip",SettingsManager.GeneralSettings.ip);
tmp.put("gateway",SettingsManager.GeneralSettings.gateway);
tmp.put("netmask",SettingsManager.GeneralSettings.netmask);
tmp.put("hostname",SettingsManager.GeneralSettings.hostname);
return tmp;
}
public static void sendFullSettings() {
//General settings
Map<String, Object> fullSettings = new HashMap<String, Object>();
fullSettings.put("settings", SettingsManager.GeneralSettings);
fullSettings.put("cameraList", CameraManager.getAllCamerasByName().keySet());
Map<String, Object> fullSettings = new HashMap<>();
try {
fullSettings.put("settings", getOrdinalSettings());
fullSettings.put("cameraList", CameraManager.getAllCamerasByName().keySet());
var currentCamera = CameraManager.getCurrentCamera();
fullSettings.put("pipeline", getOrdinalPipeline());
fullSettings.put("pipelineList", currentCamera.getPipelines().keySet());