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

Fix sockethandler rotation mode/orientation bug

Browse Source
This commit is contained in:
Matt
2019-11-28 08:54:24 -08:00
parent 2347cade4e
commit 2a96ee917d
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Main/src/main/java/com/chameleonvision/vision/pipeline/CVPipeline2d.java
View File

@@ -4,7 +4,6 @@ import com.chameleonvision.Main;
import com.chameleonvision.vision.camera.CameraCapture;
import com.chameleonvision.vision.camera.CaptureStaticProperties;
import com.chameleonvision.vision.pipeline.pipes.*;
import com.chameleonvision.vision.enums.ImageRotationMode;
import org.apache.commons.lang3.tuple.Pair;
import org.opencv.core.*;

17
Main/src/main/java/com/chameleonvision/web/SocketHandler.java
View File

@@ -4,6 +4,7 @@ import com.chameleonvision.config.ConfigManager;
import com.chameleonvision.vision.VisionManager;
import com.chameleonvision.vision.VisionProcess;
import com.chameleonvision.vision.camera.CameraCapture;
import com.chameleonvision.vision.enums.ImageRotationMode;
import com.chameleonvision.vision.pipeline.CVPipeline;
import com.chameleonvision.vision.pipeline.CVPipeline2dSettings;
import com.chameleonvision.vision.pipeline.CVPipelineSettings;
@@ -135,7 +136,21 @@ public class SocketHandler {
break;
}
default: {
setField(currentPipeline.settings, entry.getKey(), entry.getValue());
// TODO fix this hack
String key;
Object value;
if(entry.getKey().equals("orientation")) { // FIXME the field is now called rotationMode
value = entry.getValue();
var int_ = (Integer) value;
if (int_ == 1) {
currentPipeline.settings.rotationMode = ImageRotationMode.DEG_180;
} else {
currentPipeline.settings.rotationMode = ImageRotationMode.DEG_0;
}
} else {
setField(currentPipeline.settings, entry.getKey(), entry.getValue());
}
switch (entry.getKey()) {
case "exposure": {
currentCamera.setExposure((Integer) entry.getValue());