pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
sfop
2016-11-04 11:22:01 +01:00
parent fe7571339c
commit 62166155fc
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/ScreenPanel.java
View File

@@ -45,6 +45,7 @@ import ch.psi.pshell.swing.ValueSelection.ValueSelectionListener;
import ch.psi.utils.Arr;
import ch.psi.utils.ArrayProperties;
import ch.psi.utils.Convert;
import ch.psi.utils.Str;
import ch.psi.utils.swing.Editor.EditorDialog;
import ch.psi.utils.swing.MainFrame;
import ch.psi.utils.swing.SwingUtils.OptionResult;
@@ -435,8 +436,14 @@ public class ScreenPanel extends Panel {
config = (CameraConfig) JsonSerializer.decode(cameraConfigJson, CameraConfig.class);
camera.getConfig().flipHorizontally = config.getMirrorX();
camera.getConfig().flipVertically = config.getMirrorY();
camera.getConfig().rotation = config.getRotate();
camera.getConfig().rotationCrop = true;
//camera.getConfig().rotation = config.getRotate();
//camera.getConfig().rotationCrop = true;
switch (config.getRotate()){
case 1: camera.getConfig().rotation = 270; break;
case 2: camera.getConfig().rotation = 180; break;
case 3: camera.getConfig().rotation = 90; break;
}
camera.getConfig().rotationCrop = false;
camera.getConfig().roiX = config.getRoiEnable() ? config.getRoi().get(0) : 0;
camera.getConfig().roiY = config.getRoiEnable() ? config.getRoi().get(1) : 0;
camera.getConfig().roiWidth = config.getRoiEnable() ? config.getRoi().get(2) : -1;
@@ -462,8 +469,12 @@ public class ScreenPanel extends Panel {
try {
camera.getConfig().spatialCalOffsetX = ((Camtool) camera).calOffX.read();
camera.getConfig().spatialCalOffsetY = ((Camtool) camera).calOffY.read();
camera.getConfig().spatialCalScaleX = -((Camtool) camera).calScaleX.read();
camera.getConfig().spatialCalScaleY = -((Camtool) camera).calScaleY.read();
double[] origin = ((Camtool) camera).origin.read();
//TODO: not working on camtool
//camera.getConfig().spatialCalScaleX = -origin[0];
//camera.getConfig().spatialCalScaleY = -origin[1];
camera.getConfig().spatialCalScaleX = ((Camtool) camera).calScaleX.read();
camera.getConfig().spatialCalScaleY = ((Camtool) camera).calScaleY.read();
} catch (Exception ex) {
System.err.println(ex.getMessage());
camera.getConfig().spatialCalOffsetX = 0.0;