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

Merge branch 'class-abstraction' of https://gitlab.com/chameleon-vision/Chameleon-Vision into class-abstraction

Browse Source
This commit is contained in:
Matt
2019-11-16 11:50:53 -08:00
parent 3f5c14b992 98bfe7e029
commit ad992c8cab
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Main/src/main/java/com/chameleonvision/classabstraction/VisionManager.java
View File

@@ -7,6 +7,7 @@ import edu.wpi.cscore.UsbCameraInfo;
import org.opencv.videoio.VideoCapture;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -51,6 +52,12 @@ public class VisionManager {
File cameraConfigFile = new File(cameraConfigPath.toString());
}
} else {
try {
Files.createDirectory(cameraConfigFolder);
} catch (IOException e) {
e.printStackTrace();
}
}
});

2
Main/src/main/java/com/chameleonvision/classabstraction/camera/CameraProperties.java
View File

@@ -30,8 +30,6 @@ public class CameraProperties {
public CameraProperties(UsbCamera baseCamera, double fov) {
FOV = fov;
// TODO: determine how to set the initial videomode properly
videoModes = filterVideoModes(baseCamera.enumerateVideoModes());
}

5
Main/src/main/java/com/chameleonvision/classabstraction/camera/USBCameraProcess.java
View File

@@ -18,8 +18,9 @@ public class USBCameraProcess implements CameraProcess {
public USBCameraProcess(UsbCamera camera, CameraConfig config) {
baseCamera = camera;
cvSink = CameraServer.getInstance().getVideo(baseCamera);
VideoMode vidMode = new VideoMode(VideoMode.PixelFormat.kYUYV, 640, 480, 60);
properties = new CameraProperties(baseCamera, config.FOV);
setVideoMode(properties.videoModes.get(0));
}
@Override
@@ -58,7 +59,7 @@ public class USBCameraProcess implements CameraProcess {
public void setVideoMode(VideoMode mode) {
try {
baseCamera.setVideoMode(mode);
properties = new CameraProperties(baseCamera, properties.FOV);
properties.updateVideoMode(mode);
} catch (VideoException e) {
System.err.println("Current camera does not support resolution change");
}