pymmcore-plus 0.13.0__tar.gz → 0.13.1__tar.gz

{pymmcore_plus-0.13.0 → pymmcore_plus-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymmcore-plus
-Version: 0.13.0
+Version: 0.13.1
 Summary: pymmcore superset providing improved APIs, event handling, and a pure python acquisition engine
 Project-URL: Source, https://github.com/pymmcore-plus/pymmcore-plus
 Project-URL: Tracker, https://github.com/pymmcore-plus/pymmcore-plus/issues

{pymmcore_plus-0.13.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/mda/_engine.py

@@ -248,7 +248,12 @@ class MDAEngine(PMDAEngine):
                 self._mmc.setExposure(event.exposure)
             except Exception as e:
                 logger.warning("Failed to set exposure. %s", e)
-
+        if event.properties is not None:
+            try:
+                for dev, prop, value in event.properties:
+                    self._mmc.setProperty(dev, prop, value)
+            except Exception as e:
+                logger.warning("Failed to set properties. %s", e)
         if (
             # (if autoshutter wasn't set at the beginning of the sequence
             # then it never matters...)

{pymmcore_plus-0.13.0 → pymmcore_plus-0.13.1}/src/pymmcore_plus/mocks.py

@@ -28,9 +28,7 @@ class MockSequenceableCore(MagicMock):
             self.loadExposureSequence.return_value = None
             self.loadStageSequence.return_value = None
             self.loadXYStageSequence.return_value = None
-            # TODO: add support in pymmcore-nano
-            if hasattr(CMMCorePlus, "loadSLMSequence"):
-                self.loadSLMSequence.return_value = None
+            self.loadSLMSequence.return_value = None
 
             self.loadPropertySequence.return_value = None
 

{pymmcore_plus-0.13.0 → pymmcore_plus-0.13.1}/tests/test_mda.py

@@ -49,19 +49,33 @@ def test_mda_waiting(core: CMMCorePlus) -> None:
 
 def test_setting_position(core: CMMCorePlus) -> None:
     core.mda._running = True
-    event1 = MDAEvent(exposure=123, x_pos=123, y_pos=456, z_pos=1)
+    event1 = MDAEvent(
+        exposure=123,
+        x_pos=123,
+        y_pos=456,
+        z_pos=1,
+        properties=[("Camera", "TestProperty1", 0.05)],
+    )
     core.mda.engine.setup_event(event1)
     assert tuple(core.getXYPosition()) == (123, 456)
     assert core.getPosition() == 1
     assert core.getExposure() == 123
+    assert core.getProperty("Camera", "TestProperty1") == "0.0500"
 
     # check that we aren't check things like: if event.x_pos
     # because then we will not set to zero
-    event2 = MDAEvent(exposure=321, x_pos=0, y_pos=0, z_pos=0)
+    event2 = MDAEvent(
+        exposure=321,
+        x_pos=0,
+        y_pos=0,
+        z_pos=0,
+        properties=[("Camera", "TestProperty2", -0.07)],
+    )
     core.mda.engine.setup_event(event2)
     assert tuple(core.getXYPosition()) == (0, 0)
     assert core.getPosition() == 0
     assert core.getExposure() == 321
+    assert core.getProperty("Camera", "TestProperty2") == "-0.0700"
 
 
 class BrokenEngine: