Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-22 01:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved res and divisor into pipeline in ui

Browse Source 
-- added handling of divisor and res in socket handler 
-- moved pipeline to be index -1 in ui
-- removed driver mode object
This commit is contained in:
ori agranat
2019-11-30 19:24:03 +02:00
parent 9efb6373a6
commit 5fe728751d
9 changed files with 55 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipelineSettings.java
View File

@@ -2,6 +2,7 @@ package com.chameleonvision.vision.pipeline;
import com.chameleonvision.vision.enums.ImageFlipMode;
import com.chameleonvision.vision.enums.ImageRotationMode;
import com.chameleonvision.vision.enums.StreamDivisor;
@SuppressWarnings("ALL")
public class CVPipelineSettings {
@@ -12,4 +13,6 @@ public class CVPipelineSettings {
public double exposure = 50.0;
public double brightness = 50.0;
public double gain = 0;
public int VideoModeIndex = 0;
public StreamDivisor streamDivisor = StreamDivisor.NONE;
}

6
Main/src/main/java/com/chameleonvision/web/RequestHandler.java
View File

@@ -49,13 +49,7 @@ public class RequestHandler {
} catch (Exception ignored) {
newFOV = (Integer) camSettings.get("fov");
}
Integer newStreamDivisor = (Integer) camSettings.get("streamDivisor");
Integer newResolution = (Integer) camSettings.get("resolution");
currentCamera.getProperties().setFOV(newFOV);
currentVisionProcess.cameraStreamer.setDivisor(StreamDivisor.values()[newStreamDivisor], true);
currentCamera.setVideoMode(newResolution);
VisionManager.saveCurrentCameraSettings();
SocketHandler.sendFullSettings();
ctx.status(200);

19
Main/src/main/java/com/chameleonvision/web/SocketHandler.java
View File

@@ -4,6 +4,7 @@ import com.chameleonvision.config.ConfigManager;
import com.chameleonvision.vision.VisionManager;
import com.chameleonvision.vision.VisionProcess;
import com.chameleonvision.vision.camera.CameraCapture;
import com.chameleonvision.vision.enums.StreamDivisor;
import com.chameleonvision.vision.pipeline.CVPipeline;
import com.chameleonvision.vision.pipeline.CVPipelineSettings;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -148,6 +149,13 @@ public class SocketHandler {
case "brightness": {
currentCamera.setBrightness((Integer) entry.getValue());
}
case "videoMode":{
currentCamera.setVideoMode((Integer) entry.getValue());
}
case "streamDivisor":{
VisionProcess currentVisionProcess = VisionManager.getCurrentUIVisionProcess();
currentVisionProcess.cameraStreamer.setDivisor(StreamDivisor.values()[(Integer) entry.getValue()], true);
}
}
VisionManager.saveCurrentCameraPipelines();
@@ -230,16 +238,6 @@ public class SocketHandler {
return tmp;
}
private static HashMap<String, Object> getOrdinalDriver() {
HashMap<String, Object> tmp = new HashMap<>();
VisionProcess currentProcess = VisionManager.getCurrentUIVisionProcess();
CVPipelineSettings driverModeSettings = currentProcess.pipelineManager.driverModePipeline.settings;
tmp.put("isDriver", currentProcess.pipelineManager.getDriverMode());
tmp.put("driverBrightness", driverModeSettings.brightness);
tmp.put("driverExposure", driverModeSettings.exposure);
return tmp;
}
public static void sendFullSettings() {
//General settings
Map<String, Object> fullSettings = new HashMap<>();
@@ -252,7 +250,6 @@ public class SocketHandler {
fullSettings.put("cameraSettings", getOrdinalCameraSettings());
fullSettings.put("cameraList", VisionManager.getAllCameraNicknames());
fullSettings.put("pipeline", getOrdinalPipeline(currentPipeline.settings.getClass()));
fullSettings.put("driverMode", getOrdinalDriver());
fullSettings.put("pipelineList", VisionManager.getCurrentCameraPipelineNicknames());
fullSettings.put("resolutionList", VisionManager.getCurrentCameraResolutionList());
fullSettings.put("port", currentProcess.cameraStreamer.getStreamPort());