From 62166155fc14f18dc975cdba79751ee90680ebd7 Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-02.psi.ch>
Date: Fri, 4 Nov 2016 11:22:01 +0100
Subject: [PATCH] Startup

---
 devices/CurrentCamera.properties | 18 +++++++++---------
 plugins/ScreenPanel.java         | 19 +++++++++++++++----
 script/testSH84.py               |  1 +
 3 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 script/testSH84.py

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index f34cec5..f9230eb 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,13 +1,13 @@
-#Thu Nov 03 15:30:51 CET 2016
-colormap=Grayscale
+#Fri Nov 04 11:15:53 CET 2016
+colormap=Temperature
 colormapAutomatic=true
 colormapMax=0.0
 colormapMin=0.0
 flipHorizontally=false
 flipVertically=false
 grayscale=false
-imageHeight=500
-imageWidth=500
+imageHeight=1200
+imageWidth=1246
 invert=false
 rescaleFactor=1.0
 rescaleOffset=0.0
@@ -16,11 +16,11 @@ roiWidth=-1
 roiX=0
 roiY=0
 rotation=0.0
-rotationCrop=true
+rotationCrop=false
 scale=1.0
-spatialCalOffsetX=258.0
-spatialCalOffsetY=-250.0
-spatialCalScaleX=-0.2840909090909091
-spatialCalScaleY=-0.5649717514124294
+spatialCalOffsetX=0.0
+spatialCalOffsetY=0.0
+spatialCalScaleX=1.0
+spatialCalScaleY=1.0
 spatialCalUnits=mm
 transpose=false
diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java
index 09da098..ec7ef8b 100644
--- a/plugins/ScreenPanel.java
+++ b/plugins/ScreenPanel.java
@@ -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;
diff --git a/script/testSH84.py b/script/testSH84.py
new file mode 100644
index 0000000..9b15a4d
--- /dev/null
+++ b/script/testSH84.py
@@ -0,0 +1 @@
+lscan(Channel('SINBC01-MCRX070:I-SET'), Channel('SINBC01-DBPM100:X1'), -0.5,0.5,101,latency=0.5)