diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index c28690a..d3cbcc1 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,16 +1,16 @@ -#Wed May 24 10:37:50 CEST 2017 +#Fri May 26 10:13:54 CEST 2017 colormap=Flame colormapAutomatic=true -colormapMax=20.0 +colormapMax=30.0 colormapMin=0.0 flipHorizontally=false -flipVertically=true +flipVertically=false grayscale=false -imageHeight=1200 -imageWidth=1246 +imageHeight=2160 +imageWidth=2560 invert=false -regionStartX=304 -regionStartY=8 +regionStartX=1 +regionStartY=1 rescaleFactor=1.0 rescaleOffset=0.0 roiHeight=-1 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-642.0 -spatialCalOffsetY=-609.0 -spatialCalScaleX=-26.85765443151298 -spatialCalScaleY=-27.124773960217 +spatialCalOffsetX=-642.5156395013756 +spatialCalOffsetY=-609.5079128412647 +spatialCalScaleX=-26.85765405371486 +spatialCalScaleY=-27.12477275985196 spatialCalUnits=mm transpose=false diff --git a/plugins/GunSolenoidAlignment.form b/plugins/GunSolenoidAlignment.form index 00141d4..9c73277 100644 --- a/plugins/GunSolenoidAlignment.form +++ b/plugins/GunSolenoidAlignment.form @@ -233,7 +233,7 @@ - + diff --git a/plugins/GunSolenoidAlignment.java b/plugins/GunSolenoidAlignment.java index 80e4b3f..b93735d 100644 --- a/plugins/GunSolenoidAlignment.java +++ b/plugins/GunSolenoidAlignment.java @@ -177,7 +177,7 @@ public class GunSolenoidAlignment extends Panel { jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); jLabel3.setText("Step size:"); - spinnerStep.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.1d, 10.0d, 1.0d)); + spinnerStep.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.01d, 10.0d, 1.0d)); spinnerStep.setName("spinnerStep"); // NOI18N jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); diff --git a/plugins/LaserGunAlignment.form b/plugins/LaserGunAlignment.form index 307345f..54d4613 100644 --- a/plugins/LaserGunAlignment.form +++ b/plugins/LaserGunAlignment.form @@ -233,7 +233,7 @@ - + diff --git a/plugins/LaserGunAlignment.java b/plugins/LaserGunAlignment.java index 5a6f79c..dbb9bc3 100644 --- a/plugins/LaserGunAlignment.java +++ b/plugins/LaserGunAlignment.java @@ -176,7 +176,7 @@ public class LaserGunAlignment extends Panel { jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); jLabel3.setText("Step size:"); - spinnerStep.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.1d, 10.0d, 1.0d)); + spinnerStep.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.01d, 10.0d, 1.0d)); spinnerStep.setName("spinnerStep"); // NOI18N jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);