From ed6fbc94d6697dbc7d67de8f349ce4e18344110d Mon Sep 17 00:00:00 2001
From: sfop <sfop@sf-cons-04.psi.ch>
Date: Thu, 15 Sep 2016 10:00:16 +0200
Subject: [PATCH] Startup

---
 devices/CurrentCamera.properties           | 22 +++++++++----------
 plugins/CamerasSimple.java                 |  4 ++--
 plugins/{Cameras.form => ScreenPanel.form} |  0
 plugins/{Cameras.java => ScreenPanel.java} | 25 ++++++++++++++--------
 4 files changed, 29 insertions(+), 22 deletions(-)
 rename plugins/{Cameras.form => ScreenPanel.form} (100%)
 rename plugins/{Cameras.java => ScreenPanel.java} (96%)

diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 748e72d..aaf4cb8 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,13 +1,13 @@
-#Tue Sep 13 11:19:17 CEST 2016
-colormap=Grayscale
+#Thu Sep 15 09:19:12 CEST 2016
+colormap=Rainbow
 colormapAutomatic=true
 colormapMax=0.0
 colormapMin=0.0
-flipHorizontally=true
-flipVertically=true
+flipHorizontally=false
+flipVertically=false
 grayscale=false
-imageHeight=1628
-imageWidth=1280
+imageHeight=2160
+imageWidth=2560
 invert=false
 rescaleFactor=1.0
 rescaleOffset=0.0
@@ -15,12 +15,12 @@ roiHeight=-1
 roiWidth=-1
 roiX=0
 roiY=0
-rotation=0.0
+rotation=1.0
 rotationCrop=true
 scale=1.0
-spatialCalOffsetX=-685.0
-spatialCalOffsetY=-874.0
-spatialCalScaleX=14.146772767462423
-spatialCalScaleY=12.708498808578236
+spatialCalOffsetX=-1057.0
+spatialCalOffsetY=-1420.0
+spatialCalScaleX=8.51063829787234
+spatialCalScaleY=8.559201141226819
 spatialCalUnits=mm
 transpose=false
diff --git a/plugins/CamerasSimple.java b/plugins/CamerasSimple.java
index ff4b5a4..adad60d 100644
--- a/plugins/CamerasSimple.java
+++ b/plugins/CamerasSimple.java
@@ -402,9 +402,9 @@ public class CamerasSimple extends Panel {
             try {
                 ((Source)getDevice("image")).initialize();
             } catch (IOException ex) {
-                Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
+                Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
             } catch (InterruptedException ex) {
-                Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
+                Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
     }
diff --git a/plugins/Cameras.form b/plugins/ScreenPanel.form
similarity index 100%
rename from plugins/Cameras.form
rename to plugins/ScreenPanel.form
diff --git a/plugins/Cameras.java b/plugins/ScreenPanel.java
similarity index 96%
rename from plugins/Cameras.java
rename to plugins/ScreenPanel.java
index 0b2665d..1e45319 100644
--- a/plugins/Cameras.java
+++ b/plugins/ScreenPanel.java
@@ -68,9 +68,9 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 /**
  *
  */
-public class Cameras extends Panel {
+public class ScreenPanel extends Panel {
 
-    public Cameras() {
+    public ScreenPanel() {
         initComponents();
         renderer.setPersistenceFile(Paths.get(getController().getSetup().getContextPath(), "Renderer_Cameras.bin"));
         renderer.setProfileFactor(4);
@@ -480,10 +480,17 @@ public class Cameras extends Panel {
             if ((camera!=null) && (camera instanceof ColormapSource)){
                 ColormapSourceConfig config = ((ColormapSource)camera).getConfig();
                 switch (config.colormap){
-                    case Grayscale: buttonGrayscale.setSelected(true);
-                    case Rainbow: buttonRainbow.setSelected(true);
-                    case Temperature: buttonTemperature.setSelected(true);
-                    default: buttonGroup2.clearSelection();
+                    case Grayscale: 
+                        buttonGrayscale.setSelected(true);
+                        break;
+                    case Rainbow: 
+                        buttonRainbow.setSelected(true);
+                        break;
+                    case Temperature: 
+                        buttonTemperature.setSelected(true);
+                        break;
+                    default: 
+                        buttonGroup2.clearSelection();
                             
                 }
                 if (config.isDefaultColormap()){
@@ -518,9 +525,9 @@ public class Cameras extends Panel {
             try {
                 ((Source)getDevice("image")).initialize();
             } catch (IOException ex) {
-                Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
+                Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
             } catch (InterruptedException ex) {
-                Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
+                Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
         updateZoom();
@@ -1388,7 +1395,7 @@ public class Camtool extends ArraySource {
                 .addContainerGap()
                 .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                     .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
+                    .addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE)
                     .addComponent(jPanel5, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(panelScreen, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(panelScreen1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))