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

Added enums, msgpack - new ui intergration

Browse Source
This commit is contained in:
Omer
2019-10-12 03:38:42 +03:00
parent 2eb4cbc950
commit 5f879f9d98
17 changed files with 239 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ import java.util.stream.IntStream;
public class Camera {
private static final double DEFAULT_FOV = 60.8;
private static final float DEFAULT_FOV = 60.8f;
private static final int MINIMUM_FPS = 30;
private static final int MINIMUM_WIDTH = 320;
private static final int MINIMUM_HEIGHT = 200;
@@ -29,7 +29,7 @@ public class Camera {
private final CvSink cvSink;
private final Object cvSourceLock = new Object();
private CvSource cvSource;
private double FOV;
private float FOV;
private CameraValues camVals;
private CamVideoMode camVideoMode;
private int currentPipelineIndex;
@@ -39,23 +39,23 @@ public class Camera {
this(cameraName, DEFAULT_FOV);
}
public Camera(String cameraName, double fov) {
public Camera(String cameraName, float fov) {
this(cameraName,CameraManager.AllUsbCameraInfosByName.get(cameraName), fov);
}
public Camera(String cameraName, UsbCameraInfo usbCamInfo, double fov) {
public Camera(String cameraName, UsbCameraInfo usbCamInfo, float fov) {
this(cameraName ,usbCamInfo, fov, new HashMap<>(), 0);
}
public Camera(String cameraName, double fov, int videoModeIndex) {
public Camera(String cameraName, float fov, int videoModeIndex) {
this(cameraName, fov, new HashMap<>(), videoModeIndex);
}
public Camera(String cameraName, double fov, HashMap<Integer, Pipeline> pipelines, int videoModeIndex) {
public Camera(String cameraName, float fov, HashMap<Integer, Pipeline> pipelines, int videoModeIndex) {
this(cameraName, CameraManager.AllUsbCameraInfosByName.get(cameraName), fov, pipelines, videoModeIndex);
}
public Camera(String cameraName, UsbCameraInfo usbCamInfo, double fov, HashMap<Integer, Pipeline> pipelines, int videoModeIndex) {
public Camera(String cameraName, UsbCameraInfo usbCamInfo, float fov, HashMap<Integer, Pipeline> pipelines, int videoModeIndex) {
FOV = fov;
name = cameraName;
path = usbCamInfo.path;
@@ -158,11 +158,11 @@ public class Camera {
.orElse(-1);
}
public double getFOV() {
public float getFOV() {
return FOV;
}
public void setFOV(double fov) {
public void setFOV(float fov) {
FOV = fov;
camVals = new CameraValues(this);
}

2
Main/src/main/java/com/chameleonvision/vision/camera/CameraDeserializer.java
View File

@@ -14,7 +14,7 @@ public class CameraDeserializer implements JsonDeserializer<Camera> {
@Override
public Camera deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext context) throws JsonParseException {
var jsonObj = jsonElement.getAsJsonObject();
var camFOV = jsonObj.get("FOV").getAsDouble();
var camFOV = jsonObj.get("FOV").getAsFloat();
var camName = jsonObj.get("name").getAsString();
var videoModeIndex = jsonObj.get("resolution").getAsInt();

4
Main/src/main/java/com/chameleonvision/vision/camera/CameraValues.java
View File

@@ -7,7 +7,7 @@ import org.apache.commons.math3.util.FastMath;
public class CameraValues {
public final int ImageWidth;
public final int ImageHeight;
public final double FOV;
public final float FOV;
public final double ImageArea;
public final double CenterX;
public final double CenterY;
@@ -24,7 +24,7 @@ public class CameraValues {
this(camera.getVideoMode().width, camera.getVideoMode().height, camera.getFOV());
}
public CameraValues(int imageWidth, int imageHeight, double fov) {
public CameraValues(int imageWidth, int imageHeight, float fov) {
ImageWidth = imageWidth;
ImageHeight = imageHeight;
FOV = fov;