MultiPyVu 3.1.1__tar.gz → 3.2.0__tar.gz

{multipyvu-3.1.1/src/MultiPyVu.egg-info → multipyvu-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MultiPyVu
-Version: 3.1.1
+Version: 3.2.0
 Summary: Control MultiVu using Python
 Author-email: Damon D Jackson <djackson@qdusa.com>
 Maintainer-email: "Quantum Design, Inc." <apps@qdusa.com>
@@ -38,7 +38,6 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing
 Requires-Dist: pandas
 Requires-Dist: pywin32>=300; platform_system == "Windows"
 Requires-Dist: pillow
@@ -436,6 +435,14 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.2.0**
+- November 2024
+- Improvements in determining the running version of MultiVu.
+
+**3.1.2**
+- October 2024
+- Fixed a bug which truncated numbers
+
 **3.1.1**
 - October 2024
 - Updated the installer to include missing files.

{multipyvu-3.1.1 → multipyvu-3.2.0}/README.md

@@ -390,6 +390,14 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.2.0**
+- November 2024
+- Improvements in determining the running version of MultiVu.
+
+**3.1.2**
+- October 2024
+- Fixed a bug which truncated numbers
+
 **3.1.1**
 - October 2024
 - Updated the installer to include missing files.

{multipyvu-3.1.1 → multipyvu-3.2.0}/setup.py

@@ -53,7 +53,6 @@ setup(
         },
     python_requires=">=3.8",
     install_requires=[
-        "typing",
         "pandas",
         "pywin32>=300; platform_system=='Windows'",
         "pillow",

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/BRT.py

@@ -2,8 +2,8 @@
 BRT.py is an abstraction of the BRT module.
 """
 
-from typing import Tuple
 import time
+from typing import Tuple
 
 from .sdo_object import SdoObject, val_type
 

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/CommandChamber.py

@@ -11,6 +11,7 @@ from abc import abstractmethod
 from enum import IntEnum
 from typing import Union, Dict, Tuple, List
 
+from .exceptions import MultiPyVuError
 from .ICommand import (ICommand,
                        ICommandImp,
                        ISimulateChange,
@@ -18,7 +19,6 @@ from .ICommand import (ICommand,
                        catch_thread_error,
                        )
 from .IEventManager import IObserver
-from .exceptions import MultiPyVuError
 
 
 class modeEnum(IntEnum):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/CommandField.py

@@ -7,12 +7,13 @@ Created on Tue May 18 13:14:28 2021
 @author: djackson
 """
 
+from abc import abstractmethod
 import time
 from enum import IntEnum
-from abc import abstractmethod
 from typing import Union, Dict, Tuple, List
 
 from .check_windows_esc import _check_windows_esc
+from .exceptions import MultiPyVuError
 from .ICommand import (ICommand,
                        ICommandImp,
                        ISimulateChange,
@@ -21,7 +22,6 @@ from .ICommand import (ICommand,
                        )
 from .IEventManager import IObserver
 from .project_vars import CLOCK_TIME
-from .exceptions import MultiPyVuError
 
 
 class ApproachEnum(IntEnum):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/CommandMultiVu.py

@@ -10,14 +10,14 @@ Created on Sat June 12 17:35:28 2021
 @author: djackson
 """
 
-from sys import platform
+import logging
 from abc import abstractmethod
+from sys import platform
 from typing import Tuple, Dict
-import logging
 
+from .exceptions import MultiPyVuError, PythoncomImportError
 from .ICommand import ICommand
 from .project_vars import SERVER_NAME
-from .exceptions import MultiPyVuError, PythoncomImportError
 
 
 if platform == 'win32':
@@ -110,7 +110,7 @@ class CommandMultiVuBase():
             msg += 'which could mean MultiVu is not running.'
             raise MultiPyVuError(msg)
 
-        result_string = result if isinstance(result, str) else f'{result:.4f}'
+        result_string = result if isinstance(result, str) else str(result)
         return f'{result_string},{mv_command.units},{code_in_words}'
 
     def set_state(self, command: str, arg_string: str) -> str:

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/CommandSdo.py

@@ -4,11 +4,11 @@ CommandSdo.py is used to read and write SDOs
 @author: djackson
 """
 
-from sys import platform
 import struct
 import re
 import logging
 from abc import abstractmethod
+from sys import platform
 from typing import Union, Tuple, Dict
 
 from .exceptions import (MultiPyVuError,
@@ -16,11 +16,11 @@ from .exceptions import (MultiPyVuError,
                          CanError,
                          can_err_enum,
                          abort_err_enum,
+                         PythoncomImportError
                          )
 from .ICommand import ICommand
-from .sdo_object import SdoObject, val_type
 from .project_vars import SERVER_NAME, CLIENT_NAME
-from .exceptions import PythoncomImportError
+from .sdo_object import SdoObject, val_type
 
 
 if platform == 'win32':
@@ -157,8 +157,8 @@ class CommandSdoBase(ICommand):
 
     @abstractmethod
     def get_state_server(self,
-                         statusCode: str,
-                         stateValue: str,
+                         value_variant,
+                         state_variant,
                          params: str = ''):
         raise NotImplementedError
 
@@ -187,7 +187,10 @@ class CommandSdoImp(CommandSdoBase):
         super().__init__()
         self._mvu = multivu_win32com
 
-    def _binary_to_value(self, sdo, len, val) -> Union[str, int, float]:
+    def _binary_to_value(self,
+                         sdo: SdoObject,
+                         length: win32.VARIANT,
+                         val: win32.VARIANT) -> Union[str, int, float]:
         """
         Convert a binary value from reading an SDO into its correct
         type.
@@ -195,9 +198,9 @@ class CommandSdoImp(CommandSdoBase):
         Parameters:
         -----------
         sdo: SdoObject
-        len: win32com.client.VARIANT
+        length: win32com.client.VARIANT
             This is the parameter used in ReadSDO which
-            holds the length of the value being read.
+            holds the length of the value that was read.
         val: win32com.client.VARIANT
             This is the parameter used in ReadSDO which
             holds the value being read.
@@ -208,31 +211,34 @@ class CommandSdoImp(CommandSdoBase):
         python format of string, int, or float.
         """
         if sdo.val_type is val_type.string_t:
-            var_memory = val.value[0:len.value - 1]
+            var_memory = val.value[0:length.value - 1]
             return_val = bytes(var_memory).decode('utf-8')
-        elif sdo.val_type is val_type.short_t or \
-                sdo.val_type is val_type.int_t or \
-                sdo.val_type is val_type.long_t:
-            b = list(bytes(val.value)[0:len.value])
+        elif sdo.val_type in (val_type.short_t,
+                              val_type.int_t,
+                              val_type.long_t):
+            b = list(bytes(val.value)[0:length.value])
             return_val = int.from_bytes(b,
                                         byteorder='little',
                                         signed=True)
-        elif sdo.val_type is val_type.ushort_t or \
-                sdo.val_type is val_type.uint_t or \
-                sdo.val_type is val_type.ulong_t:
-            b = list(bytes(val.value)[0:len.value])
+        elif sdo.val_type in (val_type.ushort_t,
+                              val_type.uint_t,
+                              val_type.ulong_t):
+            b = list(bytes(val.value)[0:length.value])
             return_val = int.from_bytes(b,
                                         byteorder='little',
                                         signed=False)
-        else:
-            b = bytes(val.value)[0:len.value]
+        elif sdo.val_type in (val_type.single_t,
+                              val_type.double_t):
+            b = bytes(val.value)[0:length.value]
             # format = '<f' means little endian ('>f' is big endian)
             [return_val] = struct.unpack('<f', b)
+        else:
+            raise ValueError('unsupported variant type')
         return return_val
 
     def _value_to_binary(self,
                          sdo: SdoObject,
-                         val: Union[str, int, float]) -> Tuple[int, bytes]:
+                         val: Union[str, int, float]) -> bytes:
         """
         Convert a value being sent to WriteSDO into binary.
 
@@ -245,41 +251,24 @@ class CommandSdoImp(CommandSdoBase):
 
         Returns:
         --------
-        A tuple with the first item being the length of the SDO,
-        and the second item the value being set in binary.
+        The value being set in binary.
         """
-        len = 1
+        sdo_length = sdo.object_length()
         sdo_val = b''
-        if sdo.val_type is val_type.short_t or \
-                sdo.val_type is val_type.ushort_t:
-            len = 1
-            sdo_val = int.to_bytes(int(val), len,
-                                   byteorder='little',
-                                   signed=False)
-        elif sdo.val_type is val_type.int_t or \
-                sdo.val_type is val_type.uint_t:
-            len = 2
-            sdo_val = int.to_bytes(int(val), len,
-                                   byteorder='little',
-                                   signed=False)
-        elif sdo.val_type is val_type.long_t or \
-                sdo.val_type is val_type.ulong_t:
-            len = 4
-            sdo_val = int.to_bytes(int(val), len,
-                                   byteorder='little',
-                                   signed=False)
-        elif sdo.val_type is val_type.single_t:
-            len = 2
-            sdo_val = struct.pack('<f', float(val))
-        elif sdo.val_type is val_type.double_t:
-            len = 4
+        if sdo.val_type in (val_type.short_t, val_type.ushort_t):
+            sdo_val = int(val).to_bytes(sdo_length, 'little', signed=False)
+        elif sdo.val_type in (val_type.int_t, val_type.uint_t):
+            sdo_val = int(val).to_bytes(sdo_length, 'little', signed=False)
+        elif sdo.val_type in (val_type.long_t, val_type.ulong_t):
+            sdo_val = int(val).to_bytes(sdo_length, 'little', signed=False)
+        elif sdo.val_type in (val_type.single_t, val_type.double_t):
             sdo_val = struct.pack('<f', float(val))
         elif sdo.val_type is val_type.string_t:
             sdo_val = val.encode()
         else:
             msg = 'Unsupported val_type: ' + str(sdo)
             raise ValueError(msg)
-        return len, sdo_val
+        return sdo_val
 
     def read_sdo(self, sdo: SdoObject,) -> Tuple:
         """
@@ -296,7 +285,7 @@ class CommandSdoImp(CommandSdoBase):
         a tuple whose first term is the CAN error and the second
         term is the abort error.
         """
-        sdo_len = win32.VARIANT(
+        length_variant = win32.VARIANT(
                             pythoncom.VT_BYREF | pythoncom.VT_I4,
                             0)
         value_variant = win32.VARIANT(
@@ -311,7 +300,7 @@ class CommandSdoImp(CommandSdoBase):
             can_error = self._mvu.ReadSDO(sdo.node,
                                           sdo.index,
                                           sdo.sub,
-                                          sdo_len,
+                                          length_variant,
                                           value_variant,
                                           error_variant)
             self.return_state = self._errors_to_str(can_error,
@@ -327,7 +316,9 @@ class CommandSdoImp(CommandSdoBase):
             msg += f'while reading ({str(sdo)})'
             raise MultiPyVuError(msg)
         else:
-            return_val = self._binary_to_value(sdo, sdo_len, value_variant)
+            return_val = self._binary_to_value(sdo,
+                                               length_variant,
+                                               value_variant)
 
         return return_val, self.return_state
 
@@ -348,13 +339,11 @@ class CommandSdoImp(CommandSdoBase):
         --------
         string with the error from MultiVu
         """
-        len, sdo_val = self._value_to_binary(sdo, val)
-        sdo_len = win32.VARIANT(
-                            pythoncom.VT_BYREF | pythoncom.VT_I4,
-                            len)
+        binary_val = self._value_to_binary(sdo, val)
+        data_length = sdo.object_length()
         value_variant = win32.VARIANT(
                             pythoncom.VT_BYREF | pythoncom.VT_VARIANT,
-                            sdo_val)
+                            binary_val)
         error_variant = win32.VARIANT(
                             pythoncom.VT_BYREF | pythoncom.VT_I4,
                             0)
@@ -363,7 +352,7 @@ class CommandSdoImp(CommandSdoBase):
             can_error = self._mvu.WriteSDO(sdo.node,
                                            sdo.index,
                                            sdo.sub,
-                                           sdo_len,
+                                           data_length,
                                            value_variant,
                                            error_variant)
             self.return_state = self._errors_to_str(can_error,
@@ -379,14 +368,20 @@ class CommandSdoImp(CommandSdoBase):
             self.logger_client.debug(msg)
         return self.return_state
 
-    def get_state_server(self, value_variant, state_variant, params) -> Tuple:
+    def get_state_server(self,
+                         value_variant,
+                         state_variant,
+                         params: str) -> Tuple:
         """
         Returns a tuple of the SDO query result and the can_error number.
 
+        Note that the first two input parameters are unused, but included
+        because the other CommandXXX classes use them.
+
         Parameters:
         -----------
-        value_variant: win32com.client (not used)
-        state_variant: win32com.client (not used)
+        value_variant: (not used)
+        state_variant: (not used)
         params: str
             The string representation of an sdo_object
 
@@ -434,10 +429,13 @@ class CommandSdoSim(CommandSdoBase):
         """
         Returns a tuple of the SDO query result and the can_error number.
 
+        Note that the first two input parameters are unused, but included
+        because the other CommandXXX classes use them.
+
         Parameters:
         -----------
-        value_variant: win32com.client (not used)
-        state_variant: win32com.client (not used)
+        value_variant: (not used)
+        state_variant: (not used)
         params: str
             The string representation of an SdoObject
 

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/CommandTemperature.py

@@ -7,12 +7,13 @@ Created on Tue May 18 13:14:28 2021
 @author: djackson
 """
 
-from enum import IntEnum
 import time
-from typing import Union, Tuple, Dict, List
 from abc import abstractmethod
+from enum import IntEnum
+from typing import Union, Tuple, Dict, List
 
 from .check_windows_esc import _check_windows_esc
+from .exceptions import MultiPyVuError
 from .ICommand import (ICommand,
                        ICommandImp,
                        ISimulateChange,
@@ -21,7 +22,6 @@ from .ICommand import (ICommand,
                        )
 from .IEventManager import IObserver
 from .project_vars import CLOCK_TIME
-from .exceptions import MultiPyVuError
 
 
 class ApproachEnum(IntEnum):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/CommandWaitFor.py

@@ -6,27 +6,27 @@ Created on Tue May 18 13:14:28 2021
 @author: djackson
 """
 
-from sys import platform
-from enum import IntEnum
 import time
-from typing import Union, Tuple, Dict, List
 from abc import abstractmethod
+from enum import IntEnum
+from sys import platform
+from typing import Union, Tuple, Dict, List
 
 from .check_windows_esc import _check_windows_esc
-from .IEventManager import IObserver
-from .ICommand import (ICommand,
-                       ICommandImp,
-                       ISimulateChange
-                       )
-from .CommandTemperature import SimulateTemperatureChange
-from .CommandField import SimulateFieldChange
 from .CommandChamber import SimulateChamberChange
-from .project_vars import CLOCK_TIME
+from .CommandField import SimulateFieldChange
+from .CommandTemperature import SimulateTemperatureChange
 from .exceptions import (MultiPyVuError,
                          PythoncomImportError,
                          CanError,
                          can_err_enum,
                          )
+from .IEventManager import IObserver
+from .ICommand import (ICommand,
+                       ICommandImp,
+                       ISimulateChange
+                       )
+from .project_vars import CLOCK_TIME
 
 if platform == 'win32':
     try:

multipyvu-3.2.0/src/MultiPyVu/GetRunningProcesses.py

@@ -0,0 +1,28 @@
+'''
+This script gets a list of running processes
+'''
+
+import win32process
+import win32api
+from os import path
+
+
+search_keyword = "MultiVu"
+
+# Get a list of all running processes
+pids = win32process.EnumProcesses()
+
+for pid in pids:
+    try:
+        # Open processes to query its executable path
+        h_process = win32api.OpenProcess(0x0410, False, pid)
+        exe_path = win32process.GetModuleFileNameEx(h_process, 0)
+        win32api.CloseHandle(h_process)
+
+        # Check if the path contains the keyword
+        if search_keyword.lower() in exe_path.lower():
+            exe_name = path.basename(exe_path)
+            print(f"PID: {pid}, Executable Path: {exe_path}, exe name: {exe_name}")
+    except Exception:
+        # Ignore processes that we don't have access to
+        pass

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/ICommand.py

@@ -13,15 +13,15 @@ Created on Tue May 18 12:59:24 2021
 @author: djackson
 """
 
-from sys import platform
-from typing import Union, Dict, Tuple, Type
 from abc import ABC, abstractmethod
+from sys import platform
 from threading import Thread, Lock, enumerate
 from time import time, sleep
+from typing import Union, Dict, Tuple, Type
 
+from .exceptions import PythoncomImportError
 from .IEventManager import Publisher, IObserver
 from .project_vars import CLOCK_TIME
-from .exceptions import PythoncomImportError
 
 if platform == 'win32':
     try:

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/ParseInputs.py

@@ -5,9 +5,9 @@ command-line inputs
 
 """
 
-import sys
-import re
 import ntpath
+import re
+import sys
 from typing import List
 
 from .instrument import InstrumentList

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/SocketMessage.py

@@ -8,21 +8,21 @@ Created on Mon Jun 7 23:47:19 2021
 @author: D. Jackson
 """
 
-import sys
-from abc import ABC
-import socket
-import json
 import io
+import json
 import logging
-import struct
 import re
+import socket
+import struct
+import sys
+from abc import ABC
 from typing import Union, Dict, Tuple
 
-from .project_vars import PORT
+from .__version import __version__ as mpv_version
 from .exceptions import (ClientCloseError,
                          SocketError,
                          )
-from .__version import __version__ as mpv_version
+from .project_vars import PORT
 
 
 class Message(ABC):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/__init__.py

@@ -22,25 +22,25 @@ Import MultiPyVu as mpv
 @author: Damon D Jackson
 """
 
-from sys import exc_info
-from os import path
 import traceback
-from pandas import DataFrame
 from enum import IntEnum as _IntEnum
 from enum import auto as _auto
+from os import path
+from pandas import DataFrame
+from sys import exc_info
 from typing import Union
 
 from .__version import __version__
-from .MultiVuServer import Server
+from .exceptions import MultiPyVuError, SocketError
 from .MultiVuClient import Client
+from .MultiVuDataFile.MultiVuDataFile import LabelResult
 from .MultiVuDataFile.MultiVuDataFile import MultiVuDataFile as _MultiVuDataFile
+from .MultiVuDataFile.MultiVuDataFile import MultiVuFileException
 from .MultiVuDataFile.MultiVuDataFile import TScaleType as _TScaleType
 from .MultiVuDataFile.MultiVuDataFile import TStartupAxisType as _TStartupAxisType
 from .MultiVuDataFile.MultiVuDataFile import TTimeUnits as _TTimeUnits
 from .MultiVuDataFile.MultiVuDataFile import TTimeMode as _TTimeMode
-from .MultiVuDataFile.MultiVuDataFile import LabelResult
-from .MultiVuDataFile.MultiVuDataFile import  MultiVuFileException
-from .exceptions import MultiPyVuError, SocketError
+from .MultiVuServer import Server
 
 
 __version__ = __version__

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/__main__.py

@@ -17,11 +17,11 @@ For example:
 from sys import argv
 
 from MultiPyVu.gui.Controller import Controller
+from MultiPyVu.ParseInputs import parse_input
 from MultiPyVu.scripts.helper_scripts import (get_ip,
                                               run_status,
                                               is_running,
                                               force_quit)
-from MultiPyVu.ParseInputs import parse_input
 
 
 def run_gui():

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/__version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "3.1.1"
+__version__ = "3.2.0"

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/exceptions.py

@@ -3,8 +3,8 @@ Custom exceptions for MultiPyVu
 """
 
 
-from sys import exit, platform
 from enum import IntEnum
+from sys import exit, platform
 from typing import Tuple
 
 
@@ -364,5 +364,5 @@ class CanError(Exception):
         if can_err == can_err_enum.R_ABORT:
             err_msg, _ = abort_error_msg(sdo_err)
         if can_err != can_err_enum.R_OK:
-            err_msg = 'Error: ' + err_msg
+            err_msg = 'CAN Error: ' + err_msg
         super().__init__(err_msg)

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/generate_sdo_objects.py

@@ -10,9 +10,9 @@ in the same location as the cop file and will have the same
 name with the .py ending.
 """
 
-from sys import argv, exit
 import os.path
 import re
+from sys import argv, exit
 
 from MultiPyVu.CommandSdo import SdoObject, val_type
 

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/instrument.py

@@ -8,22 +8,23 @@ Created on Tue May 18 13:14:28 2021
 @author: djackson
 """
 
-from sys import platform
-import subprocess
-import time
-import re
 import logging
+import time
 from enum import Enum, auto
+from os import path
+from sys import platform
 from typing import Tuple
 
-from .project_vars import SERVER_NAME, PYWIN32_VERSION, MIN_PYWIN32_VERSION
 from .exceptions import MultiPyVuError, PythoncomImportError
 from .__version import __version__ as mpv_version
+from .project_vars import SERVER_NAME, PYWIN32_VERSION, MIN_PYWIN32_VERSION
 
 if platform == 'win32':
     try:
         import pythoncom
         import win32com.client as win32
+        import win32api
+        import win32process
     except ImportError:
         raise PythoncomImportError
 
@@ -218,28 +219,27 @@ class Instrument():
         # declare these variables so that they are available to return
         common_name = ''
         exe_name = ''
+        open_mv_dict = {}
 
-        # Use WMIC to get the list of running programs with 'multivu'
-        # in their path
-        cmd = 'WMIC PROCESS WHERE "COMMANDLINE like \'%multivu%\'" GET '
-        cmd += 'Caption,Commandline,Processid'
-        proc = subprocess.run(cmd, capture_output=True, text=True)
-        if proc.returncode != 0:
-            raise Exception(proc.stderr)
-        # make a dictionary whose key is the MultiVu flavor, and the
+        # Find processes with 'MultiVu' in the name and make
+        # a dictionary whose key is the MultiVu flavor, and the
         # value is a tuple with the exe path and process id
-        exe_search = r'([\w]*).exe[ ]*\"([:\\\w]*.exe)"[ \/\-a-zA-Z]*([0-9]*)'
-        open_mv_dict = {}
-        for i in proc.stdout.split('\n\n'):
-            exe_found = re.findall(exe_search, i)
-            if len(exe_found) > 0:
-                name, location, process_id = exe_found[0]
-                exe_name = name + '.exe'
-                common_name = self._exe_to_common_name(exe_name)
-                open_mv_dict[common_name] = (location,
-                                             exe_name,
-                                             process_id,
-                                             )
+        pids = win32process.EnumProcesses()
+        for pid in pids:
+            try:
+                # Open processes to query its executable path
+                h_process = win32api.OpenProcess(0x0410, False, pid)
+                exe_path = win32process.GetModuleFileNameEx(h_process, 0)
+                win32api.CloseHandle(h_process)
+
+                # Check if the path contains the keyword
+                if 'multivu' in exe_path.lower():
+                    exe_name = path.basename(exe_path)
+                    common_name = self._exe_to_common_name(exe_name)
+                    open_mv_dict[common_name] = (exe_path, exe_name)
+            except Exception:
+                # Ignore processes that we don't have access to
+                pass
 
         # Declare errors if no MultiVu instance is found
         if len(open_mv_dict) == 0:

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/logging_config.py

@@ -1,7 +1,11 @@
-from os import path
+'''
+loggin_config.py is used to hold methods to help with the logging module
+'''
+
 import logging.config
-from logging import Logger
 import yaml
+from logging import Logger
+from os import path
 
 from .project_vars import LOG_NAME
 

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/project_vars.py

@@ -7,9 +7,9 @@ Created on Mon Sep 27 10:53:06 2021
 @author: D. Jackson
 """
 
-from sys import platform
-import os
 import distutils.sysconfig
+import os
+from sys import platform
 
 from .exceptions import PythoncomImportError
 

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/scripts/helper_scripts.py

@@ -2,10 +2,10 @@
 A few helpful scripts used in the MultiPyVu module
 """
 
+import re
+import subprocess
 from os import path
 from sys import platform
-import subprocess
-import re
 
 from MultiPyVu.MultiVuClient import Client
 

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/sdo_object.py

@@ -37,6 +37,17 @@ class SdoObject():
     The string can be converted into an sdo_object by calling
     .str_to_obj(string), which is a static method and returns
     an sdo_object.
+
+    Parameters:
+    -----------
+    nodID: int
+        The node number
+    sdo_index: int
+        This should be represented in hex.  For example, 0x1008.
+    sub_index: int
+        This should be represented in hex.  For example, 0x0.
+    val_t: val_type
+        Specify the type.
     """
     def __init__(self,
                  nodeID: int,
@@ -44,7 +55,7 @@ class SdoObject():
                  sub_index: int,
                  val_t: val_type):
         if (nodeID > 63) or (nodeID < 0):
-            msg = f'Invalid nodeNum: {nodeID}'
+            msg = f'Invalid nodeID: {nodeID}'
             raise ValueError(msg)
         if (sdo_index > 0xFFFF) or (sdo_index < 0):
             msg = f'Invalid SDO index: {sdo_index}'
@@ -99,3 +110,28 @@ class SdoObject():
         s = int(sub_index, 16)
         v_t = val_type[t]
         return SdoObject(n, i, s, v_t)
+
+    def object_length(self) -> int:
+        """
+        Get the byte size
+        """
+        if self.val_type is val_type.short_t:
+            return 1
+        elif self.val_type is val_type.int_t:
+            return 2
+        elif self.val_type is val_type.single_t:
+            return 2
+        elif self.val_type is val_type.string_t:
+            return 1
+        elif self.val_type is val_type.ushort_t:
+            return 1
+        elif self.val_type is val_type.uint_t:
+            return 2
+        elif self.val_type is val_type.double_t:
+            return 4
+        elif self.val_type is val_type.long_t:
+            return 4
+        elif self.val_type is val_type.ulong_t:
+            return 4
+        else:
+            raise ValueError('Unimplemented SDO type')

{multipyvu-3.1.1 → multipyvu-3.2.0/src/MultiPyVu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MultiPyVu
-Version: 3.1.1
+Version: 3.2.0
 Summary: Control MultiVu using Python
 Author-email: Damon D Jackson <djackson@qdusa.com>
 Maintainer-email: "Quantum Design, Inc." <apps@qdusa.com>
@@ -38,7 +38,6 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing
 Requires-Dist: pandas
 Requires-Dist: pywin32>=300; platform_system == "Windows"
 Requires-Dist: pillow
@@ -436,6 +435,14 @@ client = mpv.Client(port=6000)
 - A log file named QdMultiVu.log shows the traffic between the server and client which can also be useful during troubleshooting.
 
 ## Changelog<a class="anchor" id="changelog"></a>
+**3.2.0**
+- November 2024
+- Improvements in determining the running version of MultiVu.
+
+**3.1.2**
+- October 2024
+- Fixed a bug which truncated numbers
+
 **3.1.1**
 - October 2024
 - Updated the installer to include missing files.

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/MultiPyVu/CommandSdo.py
 src/MultiPyVu/CommandTemperature.py
 src/MultiPyVu/CommandWaitFor.py
 src/MultiPyVu/Command_factory.py
+src/MultiPyVu/GetRunningProcesses.py
 src/MultiPyVu/ICommand.py
 src/MultiPyVu/IEventManager.py
 src/MultiPyVu/IServer.py
@@ -42,6 +43,7 @@ src/MultiPyVu/MultiVuDataFile/__version.py
 src/MultiPyVu/MultiVuDataFile/is_pathname_valid.py
 src/MultiPyVu/font/Play-Bold.ttf
 src/MultiPyVu/font/Play-Regular.ttf
+src/MultiPyVu/font/__init__.py
 src/MultiPyVu/gui/Controller.py
 src/MultiPyVu/gui/IController.py
 src/MultiPyVu/gui/IView.py
@@ -50,5 +52,7 @@ src/MultiPyVu/gui/ViewTk.py
 src/MultiPyVu/gui/__init__.py
 src/MultiPyVu/images/Q.png
 src/MultiPyVu/images/QD_logo.jpg
+src/MultiPyVu/images/__init__.py
+src/MultiPyVu/scripts/__init__.py
 src/MultiPyVu/scripts/helper_scripts.py
 src/MultiPyVu/scripts/whats_my_ip_address.cmd

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu.egg-info/requires.txt

@@ -1,4 +1,3 @@
-typing
 pandas
 pillow
 pyyaml

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/IServer.py

@@ -7,8 +7,8 @@ It requires ABCplus (Abstract Base Class plus), which is found here:
 @author: djackson
 """
 
-from typing import Union, Tuple
 from abc import ABC, abstractmethod
+from typing import Union, Tuple
 
 from .project_vars import PORT
 

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/MultiVuClient.py

@@ -13,36 +13,36 @@ with MultiVu.
 @author: D. Jackson
 """
 
-from sys import exc_info
-from enum import IntEnum
 import traceback
+from enum import IntEnum
+from sys import exc_info
 from typing import Union, Tuple
 
-from .MultiVuClient_base import ClientBase as _ClientBase
-from .instrument import InstrumentList
+from .BRT import Brt as _brt
 from . import Command_factory as _Command_factory
-from .CommandTemperature import STATE_DICT as _temperature_state_dict
-from .CommandTemperature import ApproachEnum as _temperature_approach_mode
-from .CommandTemperature import units as _temperature_units
+from .CommandChamber import modeEnum as _chamber_mode
+from .CommandChamber import units as _chamber_units
 from .CommandField import ApproachEnum as _field_approach_mode
 from .CommandField import drivenEnum as _field_driven_mode
 from .CommandField import units as _field_units
-from .CommandChamber import modeEnum as _chamber_mode
-from .CommandChamber import units as _chamber_units
+from .CommandTemperature import STATE_DICT as _temperature_state_dict
+from .CommandTemperature import ApproachEnum as _temperature_approach_mode
+from .CommandTemperature import units as _temperature_units
 from .CommandWaitFor import MaskEnum as _wait_for_enum
-from .sdo_object import SdoObject
-from .sdo_object import val_type as _sdo_val_type
-from .BRT import Brt as _brt
-from .project_vars import (HOST_CLIENT,
-                           PORT,
-                           TIMEOUT_LENGTH
-                           )
 from .exceptions import (MultiPyVuError,
                          ServerCloseError,
                          CanError,
                          can_err_enum,
                          abort_err_enum,
                          )
+from .instrument import InstrumentList
+from .MultiVuClient_base import ClientBase as _ClientBase
+from .project_vars import (HOST_CLIENT,
+                           PORT,
+                           TIMEOUT_LENGTH
+                           )
+from .sdo_object import SdoObject
+from .sdo_object import val_type as _sdo_val_type
 
 
 class Client(_ClientBase):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/MultiVuClient_base.py

@@ -12,15 +12,20 @@ MultiVuClient class has specific commands to be used with this class.
 @author: D. Jackson
 """
 
+import logging
 import sys
+import traceback
 from socket import timeout as sock_timeout
 from time import sleep
-import logging
-import traceback
 from typing import Dict, Union
 
 
-from .SocketMessageClient import ClientMessage as _ClientMessage
+from .__version import __version__ as mpv_version
+from .exceptions import (MultiPyVuError,
+                         ClientCloseError,
+                         ServerCloseError,
+                         SocketError
+                         )
 from .logging_config import setup_logging, remove_logs
 from .project_vars import (TIMEOUT_LENGTH,
                            CLIENT_NAME,
@@ -28,12 +33,7 @@ from .project_vars import (TIMEOUT_LENGTH,
                            PORT,
                            CLOCK_TIME,
                            )
-from .exceptions import (MultiPyVuError,
-                         ClientCloseError,
-                         ServerCloseError,
-                         SocketError
-                         )
-from .__version import __version__ as mpv_version
+from .SocketMessageClient import ClientMessage as _ClientMessage
 
 
 MAX_TRIES = 3

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/MultiVuServer.py

@@ -8,37 +8,37 @@ be used with MultiVuClient.py to control a Quantum Design cryostat.
 @author: D. Jackson
 """
 
+import logging
+import re
 import sys
 import selectors
-import re
-from time import sleep
-import logging
 import traceback
+from time import sleep
 from typing import List, Tuple
 
 
-from .scripts.helper_scripts import force_quit
-from .IServer import IServer as _IServer
-from .IEventManager import IObserver as _IObserver
-from .SocketMessageServer import ServerMessage as _ServerMessage
-from .SocketMessageServer import ServerStatus as _ServerStatus
-from .ParseInputs import inputs_from_command_line
-from .instrument import Instrument as _Instrument
-from .CommandTemperature import SimulateTemperatureChange as _SimulateTemperatureChange
-from .CommandField import SimulateFieldChange as _SimulateFieldChange
 from .CommandChamber import SimulateChamberChange as _SimulateChamberChange
+from .CommandField import SimulateFieldChange as _SimulateFieldChange
+from .CommandTemperature import SimulateTemperatureChange as _SimulateTemperatureChange
 from .exceptions import (MultiPyVuError,
                          ClientCloseError,
                          ServerCloseError,
                          SocketError,
                          )
+from .IEventManager import IObserver as _IObserver
+from .IServer import IServer as _IServer
+from .instrument import Instrument as _Instrument
 from .logging_config import setup_logging, remove_logs
+from .ParseInputs import inputs_from_command_line
 from .project_vars import (SERVER_NAME,
                            HOST_SERVER,
                            PORT,
                            TIMEOUT_LENGTH,
                            CLOCK_TIME,
                            )
+from .scripts.helper_scripts import force_quit
+from .SocketMessageServer import ServerMessage as _ServerMessage
+from .SocketMessageServer import ServerStatus as _ServerStatus
 
 
 class Server(_IServer):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/SocketMessageClient.py

@@ -8,21 +8,21 @@ Created on Mon Jun 7 23:47:19 2021
 @author: D. Jackson
 """
 
-import re
 import logging
+import re
 import socket
 from time import sleep
 from typing import Union, Tuple, Dict
 
 from .check_windows_esc import _check_windows_esc
-from .SocketMessage import Message
-from .instrument import Instrument
-from .project_vars import CLIENT_NAME, CLOCK_TIME
 from .exceptions import (MultiPyVuError,
                          ClientCloseError,
                          ServerCloseError,
                          SocketError
                          )
+from .instrument import Instrument
+from .project_vars import CLIENT_NAME, CLOCK_TIME
+from .SocketMessage import Message
 
 
 class ClientMessage(Message):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/SocketMessageServer.py

@@ -8,23 +8,19 @@ Created on Mon Jun 7 23:47:19 2021
 @author: D. Jackson
 """
 
-from sys import platform
+import logging
+import re
+import selectors
+import socket
 import threading
-import traceback
 import time
-import socket
-import selectors
-import re
+import traceback
 from enum import IntEnum, auto, IntFlag
-import logging
+from sys import platform
 from typing import Union, Dict, Tuple, List
 
 from .check_windows_esc import _check_windows_esc
 from .Command_factory import create_command_mv
-from .SocketMessage import Message
-from .instrument import Instrument
-from .IEventManager import Publisher as _Publisher
-from .IEventManager import IObserver as _IObserver
 from .exceptions import (MultiPyVuError,
                          ClientCloseError,
                          ServerCloseError,
@@ -32,7 +28,11 @@ from .exceptions import (MultiPyVuError,
                          SocketError,
                          PythoncomImportError,
                          )
+from .IEventManager import Publisher as _Publisher
+from .IEventManager import IObserver as _IObserver
+from .instrument import Instrument
 from .project_vars import SERVER_NAME, CLOCK_TIME
+from .SocketMessage import Message
 
 
 if platform == 'win32':

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/gui/Controller.py

@@ -6,19 +6,19 @@ pattern for MultiPyVu.py
 """
 
 
+import re
+import subprocess
 import os
 from sys import platform
-import subprocess
-import re
-from typing import List
 from types import MethodType
+from typing import List
 
-from ..MultiVuServer import Server
+from .IController import IController
+from .ViewFactory import ViewType, ViewFactory
+from ..IEventManager import IObserver
 from ..instrument import InstrumentList
+from ..MultiVuServer import Server
 from ..ParseInputs import inputs_from_command_line
-from ..IEventManager import IObserver
-from .ViewFactory import ViewType, ViewFactory
-from .IController import IController
 
 
 class ServerInfo(IObserver):

{multipyvu-3.1.1 → multipyvu-3.2.0}/src/MultiPyVu/gui/ViewTk.py

@@ -5,13 +5,13 @@ View.py holds the code for a gui for MultiPyVu.Server
 """
 
 
-import sys
 import io
-from enum import IntEnum, auto
-from threading import Lock
 import logging
 import logging.handlers
+import sys
 import tkinter as tk
+from enum import IntEnum, auto
+from threading import Lock
 from tkinter import font
 try:
     from PIL import ImageTk, Image