microeye 2.3.9__tar.gz → 2.3.10__tar.gz

{microeye-2.3.9/src/microeye.egg-info → microeye-2.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microeye
-Version: 2.3.9
+Version: 2.3.10
 Summary: A python toolkit for fluorescence microscopy         that features hardware control, data analysis and vizualization         for super-resolution single-molecule localization microscopy and         single-partical tracking.
 Home-page: https://github.com/samhitech/microEye
 Author: Mohammad Nour Alsamsam
@@ -71,10 +71,10 @@ The **`microEye`** is a Python toolkit for fluorescence microscopy that supports
 This toolkit is compatible with the [hardware](#hardware) used in our microscope. For further details, refer to the [miEye microscope paper](https://doi.org/10.1016/j.ohx.2022.e00368) and [OSF project](http://doi.org/10.17605/osf.io/j2fqy).
 
 ```bash
- __  __ _            ___               ___   ____ ___ 
-|  \/  (_)__ _ _ ___| __|  _ ___  __ _|_  ) |__ // _ \
-| |\/| | / _| '_/ _ \ _| || / -_) \ V // / _ |_ \\_, /
-|_|  |_|_\__|_| \___/___\_, \___|  \_//___(_)___(_)_/ 
+ __  __ _            ___               ___   ____  _  __  
+|  \/  (_)__ _ _ ___| __|  _ ___  __ _|_  ) |__ / / |/  \
+| |\/| | / _| '_/ _ \ _| || / -_) \ V // / _ |_ \_| | () |
+|_|  |_|_\__|_| \___/___\_, \___|  \_//___(_)___(_)_|\__/
                         |__/
 ```
 

{microeye-2.3.9 → microeye-2.3.10}/README.md

@@ -7,10 +7,10 @@ The **`microEye`** is a Python toolkit for fluorescence microscopy that supports
 This toolkit is compatible with the [hardware](#hardware) used in our microscope. For further details, refer to the [miEye microscope paper](https://doi.org/10.1016/j.ohx.2022.e00368) and [OSF project](http://doi.org/10.17605/osf.io/j2fqy).
 
 ```bash
- __  __ _            ___               ___   ____ ___ 
-|  \/  (_)__ _ _ ___| __|  _ ___  __ _|_  ) |__ // _ \
-| |\/| | / _| '_/ _ \ _| || / -_) \ V // / _ |_ \\_, /
-|_|  |_|_\__|_| \___/___\_, \___|  \_//___(_)___(_)_/ 
+ __  __ _            ___               ___   ____  _  __  
+|  \/  (_)__ _ _ ___| __|  _ ___  __ _|_  ) |__ / / |/  \
+| |\/| | / _| '_/ _ \ _| || / -_) \ V // / _ |_ \_| | () |
+|_|  |_|_\__|_| \___/___\_, \___|  \_//___(_)___(_)_|\__/
                         |__/
 ```
 

{microeye-2.3.9 → microeye-2.3.10}/src/microEye/_version.py

@@ -1,2 +1,2 @@
-version_info = (2, 3, 9)
+version_info = (2, 3, 10)
 __version__ = '.'.join(map(str, version_info))

{microeye-2.3.9 → microeye-2.3.10}/src/microEye/hardware/mieye/devices_manager.py

@@ -438,7 +438,21 @@ class DeviceManager(QtCore.QObject):
             max_um = int(match.group(1))
             stage = PzFoc(max_um=max_um)
         elif 'Pycromanager' in value and PycroCore._instances.keys().__len__() > 0:
-            stage = PycroStage(port=list(PycroCore._instances.keys())[0])
+            if len(PycroCore._instances) == 1:
+                # If there is only one instance, use it
+                stage = PycroStage(port=list(PycroCore._instances.keys())[0])
+            else:
+                # If there are multiple instances, prompt the user to select one
+                port, ok = QtWidgets.QInputDialog.getItem(
+                    None,
+                    'Select PycroManager Instance',
+                    'Select the PycroManager instance to use:',
+                    list(map(str, PycroCore._instances.keys())),
+                )
+                if ok and port:
+                    stage = PycroStage(port=int(port))
+                else:
+                    return
         else:
             return
 

{microeye-2.3.9 → microeye-2.3.10}/src/microEye/hardware/pycromanager/core.py

@@ -109,7 +109,7 @@ class CoreWorker(threading.Thread):
             time.sleep(0.1)
         return True
 
-    def send_command(self, cmd: str, *args, **kwargs) -> Any:
+    def send_command(self, cmd: str, wait_res: bool, *args, **kwargs) -> Any:
         '''
         Send a command to the core worker thread and wait for the result.
 
@@ -139,7 +139,7 @@ class CoreWorker(threading.Thread):
 
         self.cmd_queue.put((cmd, args, kwargs, result_queue))
 
-        result = result_queue.get()
+        result = result_queue.get() if wait_res else None
 
         if isinstance(result, Exception):
             raise result
@@ -151,7 +151,8 @@ class CoreWorker(threading.Thread):
         '''
 
         def method(*args, **kwargs):
-            return self.send_command(name, *args, **kwargs)
+            wait_res = kwargs.pop('wait_res', True)
+            return self.send_command(name, wait_res, *args, **kwargs)
 
         return method
 
@@ -1240,11 +1241,13 @@ class PycroCore:
     def set_pixel_size_um(self, resolution_id: str, pix_size: float) -> None:
         self._core_worker.set_pixel_size_um(resolution_id, pix_size)
 
-    def set_position(self, position: float, stage_label: Optional[str] = None) -> None:
+    def set_position(
+        self, position: float, stage_label: Optional[str] = None, wait_res=False
+    ) -> None:
         if stage_label is None:
-            self._core_worker.set_position(position)
+            self._core_worker.set_position(position, wait_res=False)
         else:
-            self._core_worker.set_position(stage_label, position)
+            self._core_worker.set_position(stage_label, position, wait_res=False)
 
     def set_primary_log_file(self, filename: str, truncate: bool = False) -> None:
         '''TODO: test'''
@@ -1275,12 +1278,12 @@ class PycroCore:
             raise ValueError(f'Property {prop_name} must be of type {type}')
 
     def set_relative_position(
-        self, d: float, stage_label: Optional[str] = None
+        self, d: float, stage_label: Optional[str] = None, wait_res=False
     ) -> None:
         if stage_label is None:
-            self._core_worker.set_relative_position(d)
+            self._core_worker.set_relative_position(d, wait_res=False)
         else:
-            self._core_worker.set_relative_position(stage_label, d)
+            self._core_worker.set_relative_position(stage_label, d, wait_res=False)
 
     def set_relative_xy_position(
         self, dx: float, dy: float, xy_stage_label: Optional[str] = None

{microeye-2.3.9 → microeye-2.3.10/src/microeye.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microeye
-Version: 2.3.9
+Version: 2.3.10
 Summary: A python toolkit for fluorescence microscopy         that features hardware control, data analysis and vizualization         for super-resolution single-molecule localization microscopy and         single-partical tracking.
 Home-page: https://github.com/samhitech/microEye
 Author: Mohammad Nour Alsamsam
@@ -71,10 +71,10 @@ The **`microEye`** is a Python toolkit for fluorescence microscopy that supports
 This toolkit is compatible with the [hardware](#hardware) used in our microscope. For further details, refer to the [miEye microscope paper](https://doi.org/10.1016/j.ohx.2022.e00368) and [OSF project](http://doi.org/10.17605/osf.io/j2fqy).
 
 ```bash
- __  __ _            ___               ___   ____ ___ 
-|  \/  (_)__ _ _ ___| __|  _ ___  __ _|_  ) |__ // _ \
-| |\/| | / _| '_/ _ \ _| || / -_) \ V // / _ |_ \\_, /
-|_|  |_|_\__|_| \___/___\_, \___|  \_//___(_)___(_)_/ 
+ __  __ _            ___               ___   ____  _  __  
+|  \/  (_)__ _ _ ___| __|  _ ___  __ _|_  ) |__ / / |/  \
+| |\/| | / _| '_/ _ \ _| || / -_) \ V // / _ |_ \_| | () |
+|_|  |_|_\__|_| \___/___\_, \___|  \_//___(_)___(_)_|\__/
                         |__/
 ```