ScreenPanel7

config/config.properties

@@ -1,4 +1,4 @@
-#Mon Oct 12 18:15:57 CEST 2020
+#Tue Oct 13 10:42:18 CEST 2020
 autoSaveScanData=true
 simulation=true
 commandExecutionEvents=true
@@ -17,7 +17,7 @@ instanceName=Dev
 dataServerPort=5573
 hideServerMessages=false
 serverPort=8080
-versionTrackingEnabled=false
+versionTrackingEnabled=true
 dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
 serverEnabled=false
 dataScanReleaseRecords=false

config/settings.properties

@@ -1,4 +1,4 @@
-#Mon Oct 12 18:01:19 CEST 2020
+#Tue Oct 13 10:42:09 CEST 2020
 test=1
 geometry=fourcv
 ScanIndex=5

devices/CurrentCamera.properties

@@ -1,11 +1,11 @@
-#Mon Oct 12 17:46:55 CEST 2020
-spatialCalOffsetY=-485.427166868422
-spatialCalOffsetX=-638.5965043983313
+#Tue Oct 13 09:58:45 CEST 2020
+spatialCalOffsetY=-243.68687682073843
+spatialCalOffsetX=-319.849247649355
 colormapLogarithmic=false
 scale=1.0
 grayscale=false
-spatialCalScaleX=-35.21126791588346
-spatialCalScaleY=-48.38709170854271
+spatialCalScaleX=-70.42253749214824
+spatialCalScaleY=-96.77418718434343
 colormapMax=50660.0
 serverURL=http\://gfa-lc6-64\:8889
 rescaleOffset=0.0

plugins/ScreenPanel7.java

@@ -121,6 +121,9 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
  *
  */
 public class ScreenPanel7 extends Panel {
+    
+    public static final String ARG_TYPE = "cam_type";
+    public static final String ARG_LIST = "cam_list";
 
     public static final String LASER_TYPE = "Laser";
     public static final String ELECTRONS_TYPE = "Electrons";
@@ -404,7 +407,7 @@ public class ScreenPanel7 extends Panel {
             setPersistedComponents(new Component[]{buttonTitle});
             comboCameras.setEnabled(false);
             comboType.setEnabled(false);
-            if (App.hasArgument("list")){
+            if (App.hasArgument(ARG_LIST) || App.hasArgument(ARG_TYPE)){
                 comboType.setVisible(false);
                 labelType.setVisible(false);
             }
@@ -850,13 +853,16 @@ public class ScreenPanel7 extends Panel {
     }
 
     boolean isVisible(String camera) {
+        if (App.hasArgument(ARG_TYPE)){
+            return getCameraTypes(camera).contains(App.getArgumentValue(ARG_TYPE));
+        }
         return ((comboType.getSelectedIndex() == 0) || (getCameraTypes(camera).contains(comboType.getSelectedItem())));
     }
 
     DefaultComboBoxModel getCameraList(boolean fromServer) throws Exception {
         DefaultComboBoxModel model = new DefaultComboBoxModel();
-        if (App.hasArgument("list")){
-            List<String> lists = App.getArgumentValues("list");
+        if (App.hasArgument(ARG_LIST)){
+            List<String> lists = App.getArgumentValues(ARG_LIST);
             for (String list: lists){
                 String[] tokens = list.split(",");
                 for (String token : tokens){