Closedown

devices/CurrentCamera.properties

@@ -1,4 +1,4 @@
-#Fri Mar 17 11:09:48 CET 2017
+#Fri Mar 17 11:16:21 CET 2017
 colormap=Temperature
 colormapAutomatic=false
 colormapMax=NaN
@@ -6,8 +6,8 @@ colormapMin=NaN
 flipHorizontally=false
 flipVertically=false
 grayscale=false
-imageHeight=1040
-imageWidth=1392
+imageHeight=1200
+imageWidth=1246
 invert=false
 rescaleFactor=1.0
 rescaleOffset=0.0
@@ -19,9 +19,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=localhost\:10000
-spatialCalOffsetX=-50.0
-spatialCalOffsetY=-50.0
-spatialCalScaleX=-1.0
-spatialCalScaleY=-1.0
+spatialCalOffsetX=-327.26264532238156
+spatialCalOffsetY=-605.5045783900576
+spatialCalScaleX=-26.761820720381525
+spatialCalScaleY=-26.595745478002502
 spatialCalUnits=mm
 transpose=false

plugins/ScreenPanel.java

@@ -102,6 +102,7 @@ public class ScreenPanel extends Panel {
     Overlay[] fitOv;
     Overlay errorOverlay;
     boolean requestCameraListUpdate;
+    Integer localServerPort;
 
     Double getCamtoolDouble(String name) {
         return (Double) Convert.toDouble(((Camtool) camera).getValue(name));
@@ -176,7 +177,16 @@ public class ScreenPanel extends Panel {
                 ex.printStackTrace();
             }
         }
+        
+        if (App.hasArgument("priv_srv")) {
+            localServerPort = 1000;
+        }
+        
+        if (App.hasArgument("srv_port")) {
+            localServerPort = Integer.valueOf(App.getArgumentValue("srv_port"));
+        }
 
+        
         if (App.hasArgument("calc")) {
             useCamtoolStats = false;
         }
@@ -355,7 +365,7 @@ public class ScreenPanel extends Panel {
 
     DefaultComboBoxModel getCameraListFromCamtool() throws IOException, InterruptedException {
         DefaultComboBoxModel model = new DefaultComboBoxModel();
-        Camtool camtool = new Camtool(CAMERA_DEVICE_NAME);
+        Camtool camtool = (localServerPort != null) ? new Camtool(CAMERA_DEVICE_NAME, "localhost:"+localServerPort) : new Camtool(CAMERA_DEVICE_NAME);        
         try {
             camtool.initialize();
             List<String> cameras = camtool.getCameras();