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

Various cleanup, slowed down UI FPS counter

Browse Source
This commit is contained in:
Banks Troutman
2019-09-21 13:05:00 -04:00
parent e45b679dc9
commit 038e84ce0d
12 changed files with 45 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,7 @@
package com.chameleonvision.web;
import com.chameleonvision.CameraException;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.camera.CameraManager;
import edu.wpi.cscore.VideoException;
import io.javalin.Javalin;
import io.javalin.websocket.WsContext;
import java.lang.reflect.Field;
import java.util.*;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.BeanUtils;
public class Server {

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

@@ -23,11 +23,11 @@ public class ServerHandler {
private static List<WsContext> users;
public ServerHandler() {
this.users = new ArrayList<>();
ServerHandler() {
users = new ArrayList<>();
}
public void onConnect(WsConnectContext context) {
void onConnect(WsConnectContext context) {
users.add(context);
sendFullSettings();
}
@@ -36,7 +36,7 @@ public class ServerHandler {
users.remove(context);
}
public void onMessage(WsMessageContext data) throws CameraException {
void onMessage(WsMessageContext data) throws CameraException {
broadcastMessage(data.message(), data);
JSONObject jsonObject = new JSONObject(data.message());
@@ -83,7 +83,7 @@ public class ServerHandler {
String newCamera = (String) value;
System.out.printf("Changing camera to %s\n", newCamera);
CameraManager.setCurrentCamera(newCamera);
broadcastMessage(new HashMap<String, Object>(){}.put("port",SettingsManager.CameraPorts.get(SettingsManager.GeneralSettings.curr_camera)));
broadcastMessage(new HashMap<String, Object>(){}.put("port",CameraManager.CameraPorts.get(SettingsManager.GeneralSettings.curr_camera)));
broadcastMessage(CameraManager.getCurrentCamera()); //TODO CHECK JSON FOR CAMERA CHANGE
break;
@@ -183,7 +183,7 @@ public class ServerHandler {
fullSettings.put("resolutionList", CameraManager.getResolutionList());
fullSettings.put("resolution", currentCamera.getVideoModeIndex());
fullSettings.put("FOV", currentCamera.getFOV());
fullSettings.put("port", SettingsManager.CameraPorts.get(SettingsManager.GeneralSettings.curr_camera));
fullSettings.put("port", CameraManager.CameraPorts.get(SettingsManager.GeneralSettings.curr_camera));
} catch (CameraException e) {
System.err.println("No camera found!");
//TODO: add message to ui to inform that there are no cameras