From 3342ecb1f09b90a66a83be42557da628831166c9 Mon Sep 17 00:00:00 2001 From: Brandon Date: Tue, 24 Oct 2023 17:44:49 -0700 Subject: [PATCH] detect and create camera object for PVCAM device library --- .../lightsheetmanager/api/data/CameraLibrary.java | 3 ++- .../micromanager/lightsheetmanager/model/DeviceManager.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/api/data/CameraLibrary.java b/src/main/java/org/micromanager/lightsheetmanager/api/data/CameraLibrary.java index aa0def4..6f5a28a 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/api/data/CameraLibrary.java +++ b/src/main/java/org/micromanager/lightsheetmanager/api/data/CameraLibrary.java @@ -11,7 +11,8 @@ public enum CameraLibrary { DEMOCAMERA("DemoCamera"), HAMAMATSU("HamamatsuHam"), PCOCAMERA("PCO_Camera"), - ANDORSDK3("AndorSDK3"); + ANDORSDK3("AndorSDK3"), + PVCAM("PVCAM"); private final String text_; diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java b/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java index ca6f36e..3985c93 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java @@ -16,6 +16,7 @@ import org.micromanager.lightsheetmanager.model.devices.cameras.DemoCamera; import org.micromanager.lightsheetmanager.model.devices.cameras.HamamatsuCamera; import org.micromanager.lightsheetmanager.model.devices.cameras.PCOCamera; +import org.micromanager.lightsheetmanager.model.devices.cameras.PVCamera; import org.micromanager.lightsheetmanager.model.devices.vendor.ASIPLogic; import org.micromanager.lightsheetmanager.model.devices.vendor.ASIPiezo; import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner; @@ -193,6 +194,10 @@ private void createCameraDevice(final String propertyName, final String deviceNa PCOCamera pcoCamera = new PCOCamera(studio_, deviceName); addDevice(propertyName, deviceName, pcoCamera); break; + case PVCAM: + PVCamera pvCamera = new PVCamera(studio_, deviceName); + addDevice(propertyName, deviceName, pvCamera); + break; case DEMOCAMERA: DemoCamera demoCamera = new DemoCamera(studio_, deviceName); addDevice(propertyName, deviceName, demoCamera);