From 2eff2eddf3eca7cc00a976b25e7cb3b6493ae9b9 Mon Sep 17 00:00:00 2001
From: gobbo_a <gobbo_a@sf-lc6a-64.psi.ch>
Date: Fri, 11 Nov 2016 11:18:14 +0100
Subject: [PATCH] Startup

---
 config/jcae.properties           |  4 ++--
 devices/CurrentCamera.properties | 20 ++++++++++----------
 plugins/ScreenPanel.java         |  9 ++++++++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/config/jcae.properties b/config/jcae.properties
index 2994422..784f82b 100755
--- a/config/jcae.properties
+++ b/config/jcae.properties
@@ -1,4 +1,4 @@
-#Fri Nov 04 13:42:05 CET 2016
+#Fri Nov 11 11:14:32 CET 2016
 ch.psi.jcae.ContextFactory.addressList=172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.120.255
 ch.psi.jcae.ContextFactory.maxArrayBytes=50000000
 ch.psi.jcae.ChannelFactory.retries=1
@@ -7,5 +7,5 @@ ch.psi.jcae.impl.DefaultChannelService.retries=4
 ch.psi.jcae.impl.DefaultChannelService.timeout=1000
 ch.psi.jcae.ContextFactory.serverPort=
 ch.psi.jcae.ContextFactory.autoAddressList=true
-ch.psi.jcae.ContextFactory.useShellVariables=false
+ch.psi.jcae.ContextFactory.useShellVariables=true
 ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 44f52e4..f6413e2 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,13 +1,13 @@
-#Thu Nov 10 08:48:08 CET 2016
+#Thu Nov 10 19:41:49 CET 2016
 colormap=Grayscale
 colormapAutomatic=true
 colormapMax=2.0
 colormapMin=0.0
-flipHorizontally=true
-flipVertically=true
+flipHorizontally=false
+flipVertically=false
 grayscale=false
-imageHeight=652
-imageWidth=589
+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=270.0
+rotation=0.0
 rotationCrop=false
 scale=1.0
-spatialCalOffsetX=-299.0
-spatialCalOffsetY=-310.0
-spatialCalScaleX=-30.245746691871457
-spatialCalScaleY=-26.490066225165563
+spatialCalOffsetX=-50.0
+spatialCalOffsetY=-50.0
+spatialCalScaleX=-1.0
+spatialCalScaleY=-1.0
 spatialCalUnits=mm
 transpose=false
diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java
index f61c228..40f2429 100644
--- a/plugins/ScreenPanel.java
+++ b/plugins/ScreenPanel.java
@@ -273,6 +273,13 @@ public class ScreenPanel extends Panel {
                     model.addElement(prefix);
                 }
             }
+            if (App.hasArgument("cam")) {
+                String cam = App.getArgumentValue("cam");
+                if (model.getIndexOf(cam)<0){
+                    model.addElement(cam);
+                }
+            }
+            
             comboCameras.setModel(model);
             comboCameras.setEnabled(true);
             comboCameras.setSelectedItem(-1);
@@ -422,7 +429,7 @@ public class ScreenPanel extends Panel {
         }
         try {
             Path configFile = Paths.get(configFolder, cameraName + ".json");
-            cameraConfigJson = new String(Files.readAllBytes(configFile));
+            cameraConfigJson = configFile.toFile().exists() ? new String(Files.readAllBytes(configFile)) : null;
             this.cameraName = cameraName;
             try {
                 if (buttonCamtool.isSelected()) {