pymodaq_utils 5.2.7__tar.gz → 5.3.0__tar.gz

{pymodaq_utils-5.2.7 → pymodaq_utils-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pymodaq_utils
-Version: 5.2.7
+Version: 5.3.0
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ
@@ -76,11 +76,11 @@ PyMoDAQ Utils
    :target: https://pypi.org/project/pymodaq_utils/
    :alt: Latest Version
 
-.. image:: https://readthedocs.org/projects/pymodaq/badge/?version=malik-irain-patch-2
-   :target: https://pymodaq.readthedocs.io/en/stable/?badge=malik-irain-patch-2
+.. image:: https://readthedocs.org/projects/pymodaq/badge/?version=patch-3
+   :target: https://pymodaq.readthedocs.io/en/stable/?badge=patch-3
    :alt: Documentation Status
 
-.. image:: https://codecov.io/gh/PyMoDAQ/PyMoDAQ/branch/malik-irain-patch-2/graph/badge.svg?token=IQNJRCQDM2 
+.. image:: https://codecov.io/gh/PyMoDAQ/PyMoDAQ/branch/patch-3/graph/badge.svg?token=IQNJRCQDM2 
  :target: https://codecov.io/gh/PyMoDAQ/PyMoDAQ
 
 +-------------+-------------+---------------+
@@ -99,28 +99,28 @@ PyMoDAQ Utils
 
 
 
-.. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.10.svg
+.. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.10.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.11.svg
+.. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.11.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.12.svg
+.. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.12.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |313-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.13.svg
+.. |313-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.13.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.10.svg
+.. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.10.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.11.svg
+.. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.11.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.12.svg
+.. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.12.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |313-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.13.svg
+.. |313-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.13.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
 

{pymodaq_utils-5.2.7 → pymodaq_utils-5.3.0}/README.rst

@@ -11,11 +11,11 @@ PyMoDAQ Utils
    :target: https://pypi.org/project/pymodaq_utils/
    :alt: Latest Version
 
-.. image:: https://readthedocs.org/projects/pymodaq/badge/?version=malik-irain-patch-2
-   :target: https://pymodaq.readthedocs.io/en/stable/?badge=malik-irain-patch-2
+.. image:: https://readthedocs.org/projects/pymodaq/badge/?version=patch-3
+   :target: https://pymodaq.readthedocs.io/en/stable/?badge=patch-3
    :alt: Documentation Status
 
-.. image:: https://codecov.io/gh/PyMoDAQ/PyMoDAQ/branch/malik-irain-patch-2/graph/badge.svg?token=IQNJRCQDM2 
+.. image:: https://codecov.io/gh/PyMoDAQ/PyMoDAQ/branch/patch-3/graph/badge.svg?token=IQNJRCQDM2 
  :target: https://codecov.io/gh/PyMoDAQ/PyMoDAQ
 
 +-------------+-------------+---------------+
@@ -34,28 +34,28 @@ PyMoDAQ Utils
 
 
 
-.. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.10.svg
+.. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.10.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.11.svg
+.. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.11.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.12.svg
+.. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.12.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |313-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Linux_3.13.svg
+.. |313-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Linux_3.13.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.10.svg
+.. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.10.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.11.svg
+.. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.11.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.12.svg
+.. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.12.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
-.. |313-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/malik-irain-patch-2/tests_Windows_3.13.svg
+.. |313-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_utils/patch-3/tests_Windows_3.13.svg
     :target: https://github.com/PyMoDAQ/PyMoDAQ/actions/workflows/tests-utils.yml
 
 

pymodaq_utils-5.3.0/src/pymodaq_utils/categorizing.py

@@ -0,0 +1,61 @@
+def categorize_items(item_list, remote_items=None, mock_items=None):
+    """
+    Core function: categorize any list of items into Mock/Plugin/Remote.
+
+    Args:
+        item_list: List of items to categorize
+        remote_items: Custom set of remote items (optional)
+        mock_items: Custom set of mock items (optional)
+
+    Returns: dict {category: [items]} with only non-empty categories
+    """
+    remote_items = remote_items or REMOTE_ITEMS
+    mock_items = mock_items or MOCK_ITEMS
+
+    categorized = {'Remote': [], 'Mock': [], 'Plugin': []}
+
+    for item in item_list:
+        if item in remote_items:
+            categorized['Remote'].append(item)
+        elif item in mock_items or 'mock' in item.lower():
+            categorized['Mock'].append(item)
+        else:
+            categorized['Plugin'].append(item)
+
+    # Return only non-empty categories
+    return {k: v for k, v in categorized.items() if v}
+
+
+def add_category_layers(dimension_dict, remote_items=None, mock_items=None):
+    """
+    Add category layers to a dimension dictionary.
+    Uses categorize_items for each dimension.
+
+    Args:
+        dimension_dict: {dimension: [items]}
+
+    Returns: {dimension: {category: [items]}}
+    """
+    result = {}
+
+    for dimension, items in dimension_dict.items():
+        # Reuse the core categorization function
+        result[dimension] = categorize_items(items, remote_items, mock_items)
+
+    return result
+
+
+REMOTE_ITEMS = {'LECODirector', 'TCPServer'}
+MOCK_ITEMS = {}
+
+
+def find_last_index(list_children: list = None, name_prefix='', format_string='02.0f'):
+    if list_children is None:
+        list_children = []
+    # Custom function to find last available index
+    child_indexes = ([int(par.name()[len(name_prefix):]) for par in list_children if name_prefix in par.name()])
+    if len(child_indexes) == 0:
+        newindex = 0
+    else:
+        newindex = max(child_indexes) + 1
+    return f'{newindex:{format_string}}'

{pymodaq_utils-5.2.7 → pymodaq_utils-5.3.0}/src/pymodaq_utils/factory.py

@@ -34,13 +34,15 @@ class ObjectFactory(metaclass=ABCMeta):
 
     Examples
     --------
-    @ObjectFactory.register('custom')
-    def my_custom_builder():
-        pass
+    ::
+
+        @ObjectFactory.register('custom')
+        def my_custom_builder():
+            pass
 
     See Also
     --------
-    pymodaq.post_treatment.process_1d_to_scalar.Data1DProcessorFactory
+    pymodaq_data.post_treatment.process_to_scalar.DataProcessorFactory
     """
     _builders = {}
 

pymodaq_utils-5.3.0/src/pymodaq_utils/help.py

@@ -0,0 +1,47 @@
+"""Contextual help of the PyMoDAQ modules.
+
+By convention, the help of a module (control module, manager, extension...) is a short markdown text stored in a file
+named ``help.md`` in the same folder as the python file defining the module. The same text is used as the introduction
+of the module documentation.
+"""
+import inspect
+from pathlib import Path
+from types import ModuleType
+from typing import Optional, Union
+
+from pymodaq_utils.logger import set_logger, get_module_name
+
+logger = set_logger(get_module_name(__file__))
+
+HELP_FILE_NAME = 'help.md'
+
+
+def get_help_text(obj: Union[type, object, ModuleType, str, Path]) -> Optional[str]:
+    """Get the markdown help text associated with a module, a class or an object
+
+    Parameters
+    ----------
+    obj: type, object, ModuleType, str or Path
+        A class, an instance, a python module, or the path of a file (or a folder) from which the help is looked for.
+        The help file is ``help.md`` in the folder of the file defining the object.
+
+    Returns
+    -------
+    str or None
+        The markdown text, None if no help file is found.
+    """
+    if isinstance(obj, (str, Path)):
+        path = Path(obj)
+    else:
+        if not isinstance(obj, (type, ModuleType)):
+            obj = type(obj)
+        try:
+            path = Path(inspect.getfile(obj))
+        except (TypeError, OSError):
+            logger.warning(f'Could not find the source file of {obj}')
+            return None
+
+    help_path = (path if path.is_dir() else path.parent) / HELP_FILE_NAME
+    if not help_path.is_file():
+        return None
+    return help_path.read_text(encoding='utf-8')

{pymodaq_utils-5.2.7 → pymodaq_utils-5.3.0}/src/pymodaq_utils/math_utils.py

@@ -1,7 +1,7 @@
 import numbers
 from typing import Union
 
-import numpy
+
 import numpy as np
 from numbers import Number
 from typing import List, Union, Tuple
@@ -12,6 +12,31 @@ from pint import Quantity
 logger = set_logger(get_module_name(__file__))
 
 
+
+def get_si_prefix(number) -> tuple[Number, str]:
+    if number == 0:
+        return 0, ""
+
+    # Standard SI prefixes organized by their 10^(3*tier) powers
+    prefixes = {
+        24: 'Y', 21: 'Z', 18: 'E', 15: 'P', 12: 'T', 9: 'G', 6: 'M', 3: 'k',
+        0: '',
+        -3: 'm', -6: 'µ', -9: 'n', -12: 'p', -15: 'f', -18: 'a', -21: 'z', -24: 'y'
+    }
+
+    # Calculate the exponent tier (multiples of 3)
+    exponent = np.floor(np.log10(abs(number)) / 3) * 3
+
+    # Clip to maximum/minimum available prefixes
+    exponent = max(-24, min(24, exponent))
+
+    # Calculate the scaled number component
+    scaled_value = number / (10 ** exponent)
+    prefix_symbol = prefixes[exponent]
+
+    return scaled_value, prefix_symbol
+
+
 def my_moment(x, y):
     """Returns the moments of a distribution y over an axe x
 
@@ -165,7 +190,14 @@ def find_index(x, threshold: Union[Number, List[Number]]) -> List[tuple]:
         threshold = [threshold]
     out = []
     for value in threshold:
-        ix = int(np.argmin(np.abs(x - value)))
+        if np.any(np.isnan(x)):
+            try:
+                ix = int(np.nanargmin(np.abs(x - value)))
+            except ValueError:
+                x = np.nan_to_num(x, nan=np.max(x))
+                ix = int(np.argmin(np.abs(x - value)))
+        else:
+            ix = int(np.argmin(np.abs(x - value)))
         out.append((ix, x[ix]))
     return out
 
@@ -455,28 +487,29 @@ def flatten(xs):
 class LSqEllipse:
 
     def fit(self, data):
-        """Lest Squares fitting algorithm
+        """Least Squares fitting algorithm
 
         Theory taken from (*)
-        Solving equation Sa=lCa. with a = |a b c d f g> and a1 = |a b c>
-            a2 = |d f g>
+        Solving equation ``Sa=lCa``, with ``a = |a b c d f g>``, ``a1 = |a b c>`` and ``a2 = |d f g>``
 
-        Args
-        ----
-        data (list:list:float): list of two lists containing the x and y data of the
-            ellipse. of the form [[x1, x2, ..., xi],[y1, y2, ..., yi]]
+        Parameters
+        ----------
+        data: list of list of float
+            list of two lists containing the x and y data of the ellipse, of the form
+            ``[[x1, x2, ..., xi],[y1, y2, ..., yi]]``
 
         Returns
-        ------
-        coef (list): list of the coefficients describing an ellipse
-           [a,b,c,d,f,g] corresponding to ax**2+2bxy+cy**2+2dx+2fy+g
+        -------
+        list
+            the coefficients ``[a,b,c,d,f,g]`` describing an ellipse corresponding to
+            ``ax**2+2bxy+cy**2+2dx+2fy+g``
         """
-        x, y = numpy.asarray(data, dtype=float)
+        x, y = np.asarray(data, dtype=float)
 
         # Quadratic part of design matrix [eqn. 15] from (*)
-        D1 = numpy.mat(numpy.vstack([x ** 2, x * y, y ** 2])).T
+        D1 = np.mat(np.vstack([x ** 2, x * y, y ** 2])).T
         # Linear part of design matrix [eqn. 16] from (*)
-        D2 = numpy.mat(numpy.vstack([x, y, numpy.ones(len(x))])).T
+        D2 = np.mat(np.vstack([x, y, np.ones(len(x))])).T
 
         # forming scatter matrix [eqn. 17] from (*)
         S1 = D1.T * D1
@@ -484,23 +517,23 @@ class LSqEllipse:
         S3 = D2.T * D2
 
         # Constraint matrix [eqn. 18]
-        C1 = numpy.mat('0. 0. 2.; 0. -1. 0.; 2. 0. 0.')
+        C1 = np.mat('0. 0. 2.; 0. -1. 0.; 2. 0. 0.')
 
         # Reduced scatter matrix [eqn. 29]
         M = C1.I * (S1 - S2 * S3.I * S2.T)
 
         # M*|a b c >=l|a b c >. Find eigenvalues and eigenvectors from this equation [eqn. 28]
-        eval, evec = numpy.linalg.eig(M)
+        eval, evec = np.linalg.eig(M)
 
         # eigenvector must meet constraint 4ac - b^2 to be valid.
-        cond = 4 * numpy.multiply(evec[0, :], evec[2, :]) - numpy.power(evec[1, :], 2)
-        a1 = evec[:, numpy.nonzero(cond.A > 0)[1]]
+        cond = 4 * np.multiply(evec[0, :], evec[2, :]) - np.power(evec[1, :], 2)
+        a1 = evec[:, np.nonzero(cond.A > 0)[1]]
 
         # |d f g> = -S3^(-1)*S2^(T)*|a b c> [eqn. 24]
         a2 = -S3.I * S2.T * a1
 
         # eigenvectors |a b c d f g>
-        self.coef = numpy.vstack([a1, a2])
+        self.coef = np.vstack([a1, a2])
         self._save_parameters()
 
     def _save_parameters(self):
@@ -508,17 +541,22 @@ class LSqEllipse:
 
         Theory taken form http://mathworld.wolfram
 
-        Args
-        -----
-        coef (list): list of the coefficients describing an ellipse
-           [a,b,c,d,f,g] corresponding to ax**2+2bxy+cy**2+2dx+2fy+g
+        Parameters
+        ----------
+        coef: list
+            list of the coefficients describing an ellipse ``[a,b,c,d,f,g]`` corresponding to
+            ``ax**2+2bxy+cy**2+2dx+2fy+g``
 
         Returns
-        _______
-        center (List): of the form [x0, y0]
-        width (float): major axis
-        height (float): minor axis
-        phi (float): rotation of major axis form the x-axis in radians
+        -------
+        center: list
+            of the form [x0, y0]
+        width: float
+            major axis
+        height: float
+            minor axis
+        phi: float
+            rotation of major axis form the x-axis in radians
         """
 
         # eigenvectors are the coefficients of an ellipse in general form
@@ -536,14 +574,14 @@ class LSqEllipse:
 
         # Find the semi-axes lengths [eqn. 21 and 22] from (**)
         numerator = 2 * (a * f * f + c * d * d + g * b * b - 2 * b * d * f - a * c * g)
-        denominator1 = (b * b - a * c) * ((c - a) * numpy.sqrt(1 + 4 * b * b / ((a - c) * (a - c))) - (c + a))
-        denominator2 = (b * b - a * c) * ((a - c) * numpy.sqrt(1 + 4 * b * b / ((a - c) * (a - c))) - (c + a))
-        width = numpy.sqrt(numerator / denominator1)
-        height = numpy.sqrt(numerator / denominator2)
+        denominator1 = (b * b - a * c) * ((c - a) * np.sqrt(1 + 4 * b * b / ((a - c) * (a - c))) - (c + a))
+        denominator2 = (b * b - a * c) * ((a - c) * np.sqrt(1 + 4 * b * b / ((a - c) * (a - c))) - (c + a))
+        width = np.sqrt(numerator / denominator1)
+        height = np.sqrt(numerator / denominator2)
 
         # angle of counterclockwise rotation of major-axis of ellipse to x-axis [eqn. 23] from (**)
         # or [eqn. 26] from (***).
-        phi = .5 * numpy.arctan((2. * b) / (a - c))
+        phi = .5 * np.arctan((2. * b) / (a - c))
 
         self._center = [x0, y0]
         self._width = width
@@ -576,25 +614,29 @@ class LSqEllipse:
 def make_test_ellipse(center=[1, 1], width=1, height=.6, phi=3.14 / 5):
     """Generate Elliptical data with noise
 
-    Args
-    ----
-    center (list:float): (<x_location>, <y_location>)
-    width (float): semimajor axis. Horizontal dimension of the ellipse (**)
-    height (float): semiminor axis. Vertical dimension of the ellipse (**)
-    phi (float:radians): tilt of the ellipse, the angle the semimajor axis
-        makes with the x-axis
+    Parameters
+    ----------
+    center: list of float
+        (<x_location>, <y_location>)
+    width: float
+        semimajor axis. Horizontal dimension of the ellipse
+    height: float
+        semiminor axis. Vertical dimension of the ellipse
+    phi: float
+        tilt of the ellipse in radians, the angle the semimajor axis makes with the x-axis
 
     Returns
     -------
-    data (list:list:float): list of two lists containing the x and y data of the
-        ellipse. of the form [[x1, x2, ..., xi],[y1, y2, ..., yi]]
+    list of list of float
+        list of two lists containing the x and y data of the ellipse, of the form
+        ``[[x1, x2, ..., xi],[y1, y2, ..., yi]]``
     """
-    t = numpy.linspace(0, 2 * numpy.pi, 1000)
-    x_noise, y_noise = numpy.random.rand(2, len(t))
+    t = np.linspace(0, 2 * np.pi, 1000)
+    x_noise, y_noise = np.random.rand(2, len(t))
 
-    ellipse_x = center[0] + width * numpy.cos(t) * numpy.cos(phi) - height * numpy.sin(t) * numpy.sin(
+    ellipse_x = center[0] + width * np.cos(t) * np.cos(phi) - height * np.sin(t) * np.sin(
         phi) + x_noise / 2.
-    ellipse_y = center[1] + width * numpy.cos(t) * numpy.sin(phi) + height * numpy.sin(t) * numpy.cos(
+    ellipse_y = center[1] + width * np.cos(t) * np.sin(phi) + height * np.sin(t) * np.cos(
         phi) + y_noise / 2.
 
     return [ellipse_x, ellipse_y]

{pymodaq_utils-5.2.7 → pymodaq_utils-5.3.0}/src/pymodaq_utils/serialize/serializer_legacy.py

@@ -229,8 +229,7 @@ class Serializer:
 
 class DeSerializer:
     """Used to DeSerialize bytes to python objects, numpy arrays and PyMoDAQ Axis,
-     DataWithAxes and DataToExport
-    objects
+    DataWithAxes and DataToExport objects
 
     Parameters
     ----------
@@ -240,8 +239,8 @@ class DeSerializer:
 
     See Also
     --------
-    :py:class:`~pymodaq_data.serialize.mysocket.SocketString`
-    :py:class:`~pymodaq_data.serialize.mysocket.Socket`
+    pymodaq_utils.serialize.mysocket.SocketString
+    pymodaq_utils.serialize.mysocket.Socket
     """
 
     def __init__(self, bytes_string:  Union[bytes, Socket] = None) -> None:

{pymodaq_utils-5.2.7 → pymodaq_utils-5.3.0}/src/pymodaq_utils/utils.py

@@ -31,7 +31,7 @@ else:
 
 
 logger = logger_module.set_logger(logger_module.get_module_name(__file__))
-
+ser_factory = SerializableFactory()
 config = Config()
 
 
@@ -359,7 +359,7 @@ def elt_as_first_element_dicts(elt_list, match_word='Mock', key='name'):
     return plugins
 
 
-def find_keys_from_val(dict_tmp: dict, val: object):
+def find_keys_from_val(dict_tmp: dict, val: object) -> list:
     """Returns the keys from a dict if its value is matching val"""
     return [k for k, v in dict_tmp.items() if v == val]
 
@@ -623,12 +623,27 @@ def format_dir_path(path: Path) -> str:
         return f'{path}{dir_trailing_symbol if path.is_dir() else ""}'
 
 
+def read_binary_and_deserialize(fname: Path) -> list[SerializableBase]:
+    if not fname.exists():
+        return []
+    with open(fname, 'rb') as file:
+        lines = file.readlines()
+    all_lines = b''
+    for line in lines:
+        all_lines += line
+    data = []
+    while len(all_lines) > 0:
+        entry, all_lines = ser_factory.get_apply_deserializer(all_lines, only_object=False)
+        data.append(entry)
+    return data
+
+
 if __name__ == '__main__':
 
     #plugins = get_plugins()  # pragma: no cover
     #extensions = get_extension()
     #models = get_models()
-    #count = count_lines('C:\\Users\\weber\\Labo\\Programmes Python\\PyMoDAQ_Git\\pymodaq\src')
+    #count = count_lines(r'C:\\Users\\weber\\Labo\\Programmes Python\\PyMoDAQ_Git\\pymodaq\src')
 
 
     # import license

pymodaq_utils-5.3.0/src/pymodaq_utils/warnings.py

@@ -0,0 +1,13 @@
+import warnings
+warnings.filterwarnings("ignore", message=".*libpyside.*", category=RuntimeWarning)
+# deactivate messages when disconnect fails (catched by TypeError for pyqt6 and pyqt5
+# but pyside6 do not do errors but throw this Runtimewarning)
+
+
+def deprecation_msg(message, stacklevel=3):
+    warnings.warn(message, DeprecationWarning, stacklevel=stacklevel)
+
+
+def user_warning(message, stacklevel=3):
+    warnings.warn(message, UserWarning, stacklevel=stacklevel)
+

pymodaq_utils-5.2.7/src/pymodaq_utils/warnings.py

@@ -1,10 +0,0 @@
-import warnings
-
-
-def deprecation_msg(message, stacklevel=2):
-    warnings.warn(message, DeprecationWarning, stacklevel=stacklevel)
-
-
-def user_warning(message, stacklevel=3):
-    warnings.warn(message, UserWarning, stacklevel=stacklevel)
-