From 5b2219a9833fa70c768d70eb7aa5134f641ffe8f Mon Sep 17 00:00:00 2001
From: gobbo_a <gobbo_a@sf-lc6a-64.psi.ch>
Date: Fri, 30 Sep 2016 12:09:53 +0200
Subject: [PATCH] Startup

---
 devices/CurrentCamera.properties | 18 +++++++++---------
 devices/cam1.properties          |  6 +++---
 devices/cam2.properties          |  6 +++---
 plugins/ScreenPanel.java         |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 94dd96d..848c0bf 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,13 +1,13 @@
-#Thu Sep 29 15:13:32 CEST 2016
+#Fri Sep 30 10:17:03 CEST 2016
 colormap=Temperature
-colormapAutomatic=true
+colormapAutomatic=false
 colormapMax=0.0
 colormapMin=0.0
 flipHorizontally=false
-flipVertically=true
+flipVertically=false
 grayscale=false
-imageHeight=1200
-imageWidth=1246
+imageHeight=1024
+imageWidth=1280
 invert=false
 rescaleFactor=1.0
 rescaleOffset=0.0
@@ -18,9 +18,9 @@ roiY=0
 rotation=0.0
 rotationCrop=true
 scale=1.0
-spatialCalOffsetX=-630.0
-spatialCalOffsetY=-612.0
-spatialCalScaleX=26.761819803746654
-spatialCalScaleY=-26.595744680851062
+spatialCalOffsetX=NaN
+spatialCalOffsetY=NaN
+spatialCalScaleX=NaN
+spatialCalScaleY=NaN
 spatialCalUnits=mm
 transpose=false
diff --git a/devices/cam1.properties b/devices/cam1.properties
index 09cd72e..36dd838 100644
--- a/devices/cam1.properties
+++ b/devices/cam1.properties
@@ -1,4 +1,4 @@
-#Thu Sep 29 08:47:56 CEST 2016
+#Fri Sep 30 12:09:42 CEST 2016
 colormap=Grayscale
 colormapAutomatic=true
 colormapMax=30000.0
@@ -6,8 +6,8 @@ colormapMin=0.0
 flipHorizontally=false
 flipVertically=false
 grayscale=false
-imageHeight=0
-imageWidth=0
+imageHeight=1628
+imageWidth=1280
 invert=false
 offsetX=0.0
 offsetY=0.0
diff --git a/devices/cam2.properties b/devices/cam2.properties
index 54d94bd..ddf244b 100644
--- a/devices/cam2.properties
+++ b/devices/cam2.properties
@@ -1,4 +1,4 @@
-#Thu Sep 29 08:47:56 CEST 2016
+#Fri Sep 30 12:09:42 CEST 2016
 colormap=Grayscale
 colormapAutomatic=true
 colormapMax=255.0
@@ -6,8 +6,8 @@ colormapMin=0.0
 flipHorizontally=false
 flipVertically=false
 grayscale=false
-imageHeight=0
-imageWidth=0
+imageHeight=1680
+imageWidth=1744
 invert=false
 offsetX=0.0
 offsetY=0.0
diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java
index 006a89f..6b4e326 100644
--- a/plugins/ScreenPanel.java
+++ b/plugins/ScreenPanel.java
@@ -508,6 +508,7 @@ public class ScreenPanel extends Panel {
                 Overlay ov = null;
                 marker = new Overlays.Crosshairs(renderer.getPenMarker(), p, new Dimension(100, 100));
                 marker.setMovable(true);
+                marker.setPassive(false);
             } else {
                 marker = null;
             }
@@ -1052,7 +1053,7 @@ public class ScreenPanel extends Panel {
             if (index<imageBuffer.size()){
                 Data data = imageBuffer.get(index);
                 BufferedImage image = camera.generateImage(data);
-                renderer.setImage(null, image, data);
+                renderer.setImage(renderer.getOrigin(), image, data);
                 imageBufferOverlay.update(Chrono.getTimeStr(data.getTimestamp(), "HH:mm:ss.SSS"));
                 manageFit(image, data);