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

Replace classes with new classabstraction classes

Browse Source
This commit is contained in:
Banks Troutman
2019-11-23 11:55:20 -05:00
parent 4bcae6590f
commit 4dc86c6f25
64 changed files with 396 additions and 2066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
package com.chameleonvision.web;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.config.ConfigManager;
import io.javalin.Javalin;
@@ -20,7 +20,8 @@ public class Server {
ws.onClose(ctx -> {
handler.onClose(ctx);
System.out.println("Socket Disconnected");
SettingsManager.saveSettings();
// TODO: (HIGH) add generalSettingsSave
ConfigManager.saveSettings();
});
ws.onBinaryMessage(ctx -> {
handler.onBinaryMessage(ctx);

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

@@ -1,16 +1,12 @@
package com.chameleonvision.web;
import com.chameleonvision.classabstraction.VisionManager;
import com.chameleonvision.classabstraction.VisionProcess;
import com.chameleonvision.classabstraction.camera.CameraProcess;
import com.chameleonvision.classabstraction.config.ConfigManager;
import com.chameleonvision.classabstraction.pipeline.CVPipeline;
import com.chameleonvision.classabstraction.pipeline.CVPipelineSettings;
import com.chameleonvision.vision.*;
import com.chameleonvision.vision.camera.StreamDivisor;
import com.chameleonvision.vision.camera.USBCamera;
import com.chameleonvision.vision.camera.CameraException;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.VisionManager;
import com.chameleonvision.vision.VisionProcess;
import com.chameleonvision.vision.camera.CameraProcess;
import com.chameleonvision.config.ConfigManager;
import com.chameleonvision.vision.pipeline.CVPipeline;
import com.chameleonvision.vision.pipeline.CVPipelineSettings;
import com.chameleonvision.vision.enums.StreamDivisor;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -58,7 +54,7 @@ public class ServerHandler {
for (HashMap.Entry<String, Object> e : data.entrySet()) {
setField(ConfigManager.settings, e.getKey(), e.getValue());
}
SettingsManager.saveSettings();
ConfigManager.saveSettings();
sendFullSettings();
break;
}
@@ -99,13 +95,13 @@ public class ServerHandler {
case "changeCameraName": {
currentCamera.getProperties().setNickname((String) entry.getValue());
sendFullSettings();
SettingsManager.saveSettings();
ConfigManager.saveSettings();
break;
}
case "changePipelineName": {
currentPipeline.settings.nickname = ((String) entry.getValue());
sendFullSettings();
SettingsManager.saveSettings();
ConfigManager.saveSettings();
break;
}
case "duplicatePipeline": {
@@ -124,7 +120,7 @@ public class ServerHandler {
currentProcess.addPipeline(origPipeline);
}
// TODO: (HIGH) switch to ConfigManager
SettingsManager.saveSettings();
ConfigManager.saveSettings();
break;
}
case "command": {
@@ -133,7 +129,7 @@ public class ServerHandler {
currentProcess.addPipeline();
sendFullSettings();
// TODO: (HIGH) switch to ConfigManager
SettingsManager.saveSettings();
ConfigManager.saveSettings();
break;
// TODO: (HIGH) this never worked before, re-visit now that VisionProcess is written sanely
case "deleteCurrentPipeline":
@@ -147,11 +143,11 @@ public class ServerHandler {
// cam.deletePipeline();
// cam.setCurrentPipelineIndex(nextIndex);
// sendFullSettings();
// SettingsManager.saveSettings();
// ConfigManager.saveSettings();
break;
case "save":
// TODO: (HIGH) switch to ConfigManager
SettingsManager.saveSettings();
ConfigManager.saveSettings();
System.out.println("saved Settings");
break;
}
@@ -237,9 +233,9 @@ public class ServerHandler {
broadcastMessage(obj, null);//Broadcasts the message to every user
}
private static HashMap<String, Object> getOrdinalPipeline() throws CameraException, IllegalAccessException {
private static HashMap<String, Object> getOrdinalPipeline() throws IllegalAccessException {
HashMap<String, Object> tmp = new HashMap<>();
for (Field f : Pipeline.class.getFields()) {
for (Field f : CVPipelineSettings.class.getFields()) {
if (!f.getType().isEnum()) {
tmp.put(f.getName(), f.get(VisionManager.getCurrentUIVisionProcess().getCurrentPipeline()));
} else {