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

camera and pipeline changes synced

Browse Source
This commit is contained in:
Omer
2019-09-16 18:50:00 +03:00
parent 86b811a36d
commit 8374b9af7b
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
View File

@@ -153,6 +153,7 @@ public class SettingsManager {
Cameras.put(CameraName, cam);
CreateNewPipeline(null, CameraName);
CreateNewPipeline(null, CameraName);//Created 2 pipeline for testing TODO add a create pipeline button
}

25
Main/src/main/java/com/chameleonvision/web/Server.java
View File

@@ -49,13 +49,11 @@ public class Server {
case "curr_camera":
SettingsManager.getInstance().SetCurrentCamera((String) value);
//broadcastMessage((Map<String, Object>) new HashMap<String, Object>(){}.put("port",SettingsManager.CameraPorts.get(SettingsManager.GeneralSettings.curr_camera)));
//broadcastMessage(SettingsManager.getInstance().GetCurrentCamera());//TODO CHECK JSON FOR CAMERA CHANGE
// broadcastMessage(ctx, SettingsManager.getInstance().GetCurrentCamera());//TODO CHECK JSON FOR CAMERA CHANGE
break;
case "curr_pipeline":
System.out.println("change pipeline");
SettingsManager.getInstance().SetCurrentPipeline((String) value);
SettingsManager.CamerasCurrentPipeline.put(SettingsManager.GeneralSettings.curr_camera, (String) value);
// broadcastMessage(SettingsManager.getInstance().GetCurrentPipeline());//TODO CHECK JSON FOR PIPELINE CHANGE
break;
case "resolution":
System.out.println("change res");
@@ -118,21 +116,20 @@ public class Server {
return successful;
}
private static void broadcastMessage(WsContext sendingUser, String message) {
private static void broadcastMessage(WsContext sendingUser, Object obj) {//TODO chekc if session id is a good way to differentiate users
for (var user : users) {
if (user != sendingUser) {
user.send(message);
if (sendingUser!=null&&user.getSessionId()==sendingUser.getSessionId()) {
continue;
}
if (obj.getClass() == String.class)
user.send((String) obj);
else if (obj.getClass() == HashMap.class)
user.send(new JSONObject((HashMap<String, Object>) obj).toString());
else
user.send(new JSONObject(obj).toString());
}
}
private static void broadcastMessage(Map<String, Object> map) {
for (var user : users) {
user.send(new JSONObject(map).toString());
}
}
private static void addAllFieldsToMap(Map<String, Object> map, Object obj) {
try {
Field[] fields = obj.getClass().getFields();
@@ -159,7 +156,7 @@ public class Server {
System.err.println("No camera found!");
//TODO: add message to ui to inform that there are no cameras
}
broadcastMessage(fullSettings);
broadcastMessage(null, fullSettings);
}