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

UI now partially running, but errors still getting thrown

Browse Source
This commit is contained in:
Banks Troutman
2019-11-23 20:02:21 -05:00
parent bca207fc3f
commit d6e435a124
7 changed files with 98 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
View File

@@ -57,7 +57,7 @@ public class VisionProcess {
this.cameraProcess = cameraProcess;
pipelines.add(new CVPipeline2d("New Pipeline"));
setPipeline(0);
setPipeline(0, false);
// Thread to grab frames from the camera
// TODO: (HIGH) fix video modes!!!
@@ -125,7 +125,7 @@ public class VisionProcess {
if (driverMode) {
setPipelineInternal(driverModePipeline);
} else {
setPipeline(currentPipelineIndex);
setPipeline(currentPipelineIndex, true);
}
}
@@ -140,11 +140,11 @@ public class VisionProcess {
ntPipelineEntry.setNumber(currentPipelineIndex);
} else {
currentPipelineIndex = wantedPipelineIndex;
setPipeline(wantedPipelineIndex);
setPipeline(wantedPipelineIndex, true);
}
}
public void setPipeline(int pipelineIndex) {
public void setPipeline(int pipelineIndex, boolean updateUI) {
CVPipeline newPipeline = pipelines.get(pipelineIndex);
if (newPipeline != null) {
setPipelineInternal(newPipeline);
@@ -153,10 +153,13 @@ public class VisionProcess {
// update the configManager
if(ConfigManager.settings.currentCamera.equals(cameraProcess.getProperties().name)) {
ConfigManager.settings.currentPipeline = pipelineIndex;
HashMap<String, Object> pipeChange = new HashMap<>();
pipeChange.put("currentPipeline", pipelineIndex);
ServerHandler.broadcastMessage(pipeChange);
ServerHandler.sendFullSettings();
if (updateUI) {
HashMap<String, Object> pipeChange = new HashMap<>();
pipeChange.put("currentPipeline", pipelineIndex);
ServerHandler.broadcastMessage(pipeChange);
ServerHandler.sendFullSettings();
}
}
}
}