Merge pull request #217 from bls337/main

detect and create camera object for PVCAM device library
micro-manager · Oct 25, 2023 · 9d3b1ed · 9d3b1ed
2 parents 5caa228 + 3342ecb
commit 9d3b1ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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);