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

Various cleanup, slowed down UI FPS counter

Browse Source
This commit is contained in:
Banks Troutman
2019-09-21 13:05:00 -04:00
parent e45b679dc9
commit 038e84ce0d
12 changed files with 45 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
View File

@@ -1,6 +1,5 @@
package com.chameleonvision.vision.camera;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.Pipeline;
import edu.wpi.cscore.*;
import edu.wpi.first.cameraserver.CameraServer;
@@ -70,7 +69,7 @@ public class Camera {
cvSink = cs.getVideo(UsbCam);
cvSource = cs.putVideo(name, camVals.ImageWidth, camVals.ImageHeight);
var s = (MjpegServer) cs.getServer("serve_" + name);
SettingsManager.CameraPorts.put(name, s.getPort());
CameraManager.CameraPorts.put(name, s.getPort());
}
public void setCamVideoMode(int videoMode) {
@@ -160,10 +159,6 @@ public class Camera {
return cvSink.grabFrame(image);
}
public long grabFrame(Mat image, double timeout) {
return cvSink.grabFrame(image, timeout);
}
public CameraValues getCamVals() {
return camVals;
}