Merge pull request #158 from bls337/main

fix Hamamatsu camera trigger property names
micro-manager · Oct 2, 2023 · 3ffe226 · 3ffe226
2 parents 7f53b6f + 6470fa2
commit 3ffe226
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java
@@ -48,12 +48,11 @@ private void createUserInterface() {
         int periodY = 0;
         if (scanner != null) {
             pattern = scanner.sa().getPatternY().toString();
-            amplitudeY = (float)scanner.sa().getAmplitudeY();
+            amplitudeY = scanner.sa().getAmplitudeY();
             periodY = scanner.sa().getPeriodY();
         }
 
         cbxPattern_ = new ComboBox(patterns, pattern, 100, 24);
-
         spnAmplitude_ = Spinner.createDoubleSpinner(amplitudeY, 0.0, 100.0, 1.0);
         spnPeriod_ = Spinner.createIntegerSpinner(periodY, 0, 100, 1);
 

diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/devices/cameras/HamamatsuCamera.java b/src/main/java/org/micromanager/lightsheetmanager/model/devices/cameras/HamamatsuCamera.java
@@ -16,8 +16,8 @@ public static class Models {
     public static class Properties {
         public static final String CAMERA_NAME = "CameraName";
         public static final String CAMERA_BUS = "Camera Bus";
-        public static final String TRIGGER_SOURCE = "TRIGGER_SOURCE";
-        public static final String TRIGGER_ACTIVE = "TRIGGER_ACTIVE";
+        public static final String TRIGGER_SOURCE = "TRIGGER SOURCE";
+        public static final String TRIGGER_ACTIVE = "TRIGGER ACTIVE";
         public static final String SENSOR_MODE = "SENSOR MODE";
         public static final String INTERNAL_LINE_INTERVAL = "INTERNAL LINE INTERVAL";
         public static final String SCAN_MODE = "ScanMode";