diff --git a/config/config.properties b/config/config.properties
index 4cff53b2..72c8c063 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,4 +1,4 @@
-#Fri Aug 13 10:12:07 CEST 2021
+#Wed Aug 25 12:21:23 CEST 2021
autoSaveScanData=true
simulation=false
commandExecutionEvents=false
diff --git a/config/settings.properties b/config/settings.properties
index 31efbbb9..2e17b521 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,7 +1,7 @@
-#Fri Aug 13 10:12:07 CEST 2021
+#Wed Aug 25 12:26:26 CEST 2021
pgroup=p17274
proposal=
proposer=bl-dev
prefix=
-sample=FEDS
-authors=Matthias Muntwiler
+sample=no sample
+authors=
diff --git a/config/variables.properties b/config/variables.properties
index 7e8cd899..02834872 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Fri Aug 13 11:10:13 CEST 2021
-LastRunDate=210813
-FileSequentialNumber=7885
-DaySequentialNumber=5
+#Wed Aug 25 12:29:15 CEST 2021
+LastRunDate=210825
+FileSequentialNumber=7989
+DaySequentialNumber=2
diff --git a/devices/dummy.properties b/devices/dummy.properties
index 4e9e7de0..ea06094c 100644
--- a/devices/dummy.properties
+++ b/devices/dummy.properties
@@ -1,4 +1,4 @@
-#Wed Apr 22 12:03:08 CEST 2020
+#Wed Aug 25 13:47:10 CEST 2021
precision=3
scale=1.0
estbilizationDelay=0
@@ -15,5 +15,5 @@ rotation=false
maxSpeed=100.0
homingType=None
startRetries=1
-unit=
+unit=units
hasEnable=false
diff --git a/devices/ps1img.properties b/devices/ps1img.properties
index c65618d5..3f87aa07 100644
--- a/devices/ps1img.properties
+++ b/devices/ps1img.properties
@@ -1,8 +1,8 @@
-#Fri Jul 09 11:41:21 CEST 2021
+#Wed Aug 18 13:47:49 CEST 2021
spatialCalOffsetY=NaN
spatialCalOffsetX=NaN
dataPolling=500
-colormapLogarithmic=true
+colormapLogarithmic=false
pollingInterval=0
scale=1.0
grayscale=false
diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form
index 49aef1d0..5ff6c684 100644
--- a/plugins/ManipulatorScan.form
+++ b/plugins/ManipulatorScan.form
@@ -77,7 +77,7 @@
-
+
@@ -250,7 +250,7 @@
-
+
@@ -529,7 +529,7 @@
-
+
diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java
index 4c4b9760..f9cb58da 100644
--- a/plugins/ManipulatorScan.java
+++ b/plugins/ManipulatorScan.java
@@ -243,7 +243,7 @@ public class ManipulatorScan extends Panel {
}
});
- spinnerStepSize.setModel(new javax.swing.SpinnerNumberModel(0.1d, 0.001d, 10.0d, 0.1d));
+ spinnerStepSize.setModel(new javax.swing.SpinnerNumberModel(0.1d, 0.001d, 1000.0d, 0.1d));
spinnerSteps.setModel(new javax.swing.SpinnerNumberModel(10, 1, 1000, 1));
spinnerSteps.setEnabled(false);
@@ -300,7 +300,7 @@ public class ManipulatorScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(motorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(comboMotor, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addComponent(comboMotor, 0, 152, Short.MAX_VALUE)))
.addGroup(panelPositionerLayout.createSequentialGroup()
.addComponent(jLabel3)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -537,7 +537,7 @@ public class ManipulatorScan extends Panel {
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
- .addGap(0, 0, Short.MAX_VALUE)
+ .addGap(0, 9, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(labelAcqTime)
.addComponent(labelTotalTime))
@@ -648,7 +648,7 @@ public class ManipulatorScan extends Panel {
spinnerFrom.setModel(new SpinnerNumberModel(motor.getMinValue(), motor.getMinValue(), motor.getMaxValue(), 1.0));
spinnerTo.setModel(new SpinnerNumberModel(motor.getMaxValue(), motor.getMinValue(), motor.getMaxValue(), 1.0));
}
- txtSize.setText("Size (" + motor.getUnit() +")");
+ txtSize.setText("Size (" + motor.getUnit() +"):");
}
} catch (Exception ex) {
ex.printStackTrace();