From 6470fa20ca2703395ac3cef694e9118c07bbb0f9 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 2 Oct 2023 13:05:20 -0700 Subject: [PATCH] fix Hamamatsu camera trigger property names --- .../lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java | 3 +-- .../model/devices/cameras/HamamatsuCamera.java | 4 ++-- 2 files changed, 3 insertions(+), 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 index fe8b6d9..6a2c11e 100644 --- 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 index 1521fbf..7f91ef6 100644 --- 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";