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

Merge remote-tracking branch 'origin/Java' into Java

Browse Source
This commit is contained in:
ori
2019-09-21 09:42:27 -07:00
parent 4160b2aba7 305bd65e43
commit e45b679dc9
9 changed files with 93 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
View File

@@ -65,7 +65,10 @@ public class CameraProcess implements Runnable {
camera.setExposure(pipeline.exposure);
camera.setBrightness(pipeline.brightness);
//TODO Send Pipeline change using websocket to client
HashMap<String,Object> pipeChange = new HashMap<>();
pipeChange.put("curr_pipeline",ntPipelineIndex);
Server.handler.broadcastMessage(pipeChange);
} else {
ntPipelineEntry.setString("pipeline" + camera.getCurrentPipelineIndex());
}
@@ -113,7 +116,6 @@ public class CameraProcess implements Runnable {
ntTimeStampEntry.setNumber(TimeStamp);
}
// TODO: Separate video output to separate function, maybe even second thread
private PipelineResult runVisionProcess(Mat inputImage, Mat outputImage) {
var pipelineResult = new PipelineResult();