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

More UI fixes, add videomode and StreamDivisor to config

Browse Source
This commit is contained in:
Banks Troutman
2019-11-29 14:24:34 -05:00
parent 3ff1f56bd5
commit 5b2af86f87
10 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,21 +43,17 @@ public class RequestHandler {
VisionProcess currentVisionProcess = VisionManager.getCurrentUIVisionProcess();
CameraCapture currentCamera = currentVisionProcess.getCamera();
Number newFOV = (Number) camSettings.get("fov");
Double newFOV = (Double) camSettings.get("fov");
Integer newStreamDivisor = (Integer) camSettings.get("streamDivisor");
Integer newResolution = (Integer) camSettings.get("resolution");
currentCamera.getProperties().setFOV((double) newFOV);
currentCamera.getProperties().setFOV(newFOV);
currentVisionProcess.cameraStreamer.setDivisor(StreamDivisor.values()[newStreamDivisor], true);
// TODO: Video Mode Index!!!!
// var currentResolutionIndex = curCam.getVideoModeIndex();
// if (currentResolutionIndex != newResolution) {
// curCam.setCamVideoMode(newResolution, true);
// }
currentCamera.setVideoMode(newResolution);
VisionManager.saveAllCameras();
VisionManager.saveCurrentCameraSettings();
SocketHandler.sendFullSettings();
ctx.status(200);
} catch (JsonProcessingException e) {

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

@@ -4,7 +4,6 @@ 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.ImageRotationMode;
import com.chameleonvision.vision.pipeline.CVPipeline;
import com.chameleonvision.vision.pipeline.CVPipelineSettings;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -105,6 +104,7 @@ public class SocketHandler {
case "command": {
switch ((String) entry.getValue()) {
case "addNewPipeline":
currentProcess.addBlankPipeline();
sendFullSettings();
VisionManager.saveCurrentCameraPipelines();
@@ -117,7 +117,6 @@ public class SocketHandler {
currentProcess.deletePipeline(currentIndex);
sendFullSettings();
VisionManager.saveCurrentCameraPipelines();
// TODO remove pipeline file after deleting
break;
case "save":
ConfigManager.saveGeneralSettings();
@@ -225,7 +224,7 @@ public class SocketHandler {
CameraCapture currentCamera = VisionManager.getCurrentUIVisionProcess().getCamera();
tmp.put("fov", currentCamera.getProperties().getFOV());
tmp.put("streamDivisor", currentVisionProcess.cameraStreamer.getDivisor().ordinal());
// TODO: (HIGH) get videomode index!
tmp.put("resolution", currentVisionProcess.getCamera().getProperties().getCurrentVideoModeIndex());
return tmp;
}