quarchpy 2.2.1__py2.py3-none-any.whl → 2.2.1.dev1__py2.py3-none-any.whl

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.2.1"
+__version__ = "2.2.1.dev1"

quarchpy/connection_specific/QPS/win-amd64/QuarchPowerStudio.properties.xml

@@ -9,6 +9,7 @@
         <autoStartStream>false</autoStartStream>
         <autoStartValidAverages>32k 16k 8k 4k 2k 1k 512 32k 16k 8k 4k 2k 1k 512 </autoStartValidAverages>
         <autoStartValidTriggers>MANUAL MANUAL </autoStartValidTriggers>
+        <colorTheme>DefaultDark</colorTheme>
         <csvSaveOptions>
             <delimiter>COMMA</delimiter>
             <csvFile>C:\Users\Chris\test.csv</csvFile>
@@ -22,7 +23,6 @@
         <fullScreenMain>false</fullScreenMain>
         <imageFormat>jpg</imageFormat>
         <minimumFreeSpace>545259520</minimumFreeSpace>
-        <loggingLevel>OFF</loggingLevel>
         <statisticsGrid>
             <channels>
                 <entry>

quarchpy/connection_specific/QPS/win-amd64/qis/help.txt

@@ -291,8 +291,6 @@ Non $ Commands internal to qis:
 		Creates a new channel.
 	stream created channel delete ...
 		Deletes a previously created channel.
-	stream create channel enable ...
-		Enables/Disables a previously created channel.
 	stream created channels clear
 		Deletes all previously created channels.
 	stream created channels?
@@ -498,8 +496,6 @@ Appendix B: Synthetic Channel Functions
 		Creates a new channel.
 	stream created channel delete ...
 		Deletes a previously created channel.
-	stream create channel enable ...
-		Enables/Disables a previously created channel.
 	stream created channels clear
 		Deletes all previously created channels.
 	stream created channels?
@@ -529,11 +525,6 @@ A more detailed description, with examples, of each command follows:
 		A previously defined channel is deleted using the delete command by specifying both the channel name and group. For example:
 		
 		stream created channel delete chan(L1_RMS,V)
-	
-	stream created channel enable chan(chName, chGroup) [ON|OFF]
-		A previously defined channel is enabled or disabled using the enable command by specifying both the channel name and group. For example:
-		
-		stream created channel enable chan(L1_RMS,V) off
 		
 	stream created channels clear
 		Deletes all previously created channels, and serves as a convenience command to the above in which all channels are

quarchpy/connection_specific/QPS/win-amd64/scriptCommands.txt

@@ -1,7 +1,7 @@
 QPS Command Summary
 Copyright (c) Quarch Ltd
-QPS v1.43
-Generated: 26 Sept 2024
+QPS v1.42.J21
+Generated: 19 Jul 2024
 
 
 *** Commands ***

quarchpy/connection_specific/QPS/win-amd64/whats-new.txt

@@ -1,31 +1,41 @@
 *** What's New In Quarch Power Studio ***
 
-23rd September 2024
+19th July 2024
 
-QPS version 1.43
-QIS version 1.45
+QPS version 1.42
+QIS version 1.44
 
 
 
 *** New Features ***
 
-Support added for 'Hybrid Breakers', porting the control features from Testmonkey
+QPS is now build against Java21.  The runtime is packaged in the installer so seperate Java install is not required in most cases
 
-Synthetic channels can now be disabled in the same way as device channels.  Profile loading now supports enable options for all channel types.
+This 'What's new' dialog added, to call out the latest features!
 
-Channels now highlight when you hover over the selection in the right-side tabs, making them easier to see.  You can also search for channels and show/hide them as a group.
+Annotations improvements: Hover-over displays their text. Hover over the Annotations tab text to highlight the annotation.  Vertical movement is enabled by default, to arrange them more easily
 
-The annotation system has been greatly improved with easier editing, hover over display and a search function
+Speed improvements when navigating through large datasets
 
-CSV export can now be done by system clock time (in addition to sample time)
+Modules with updated firmware available are now indicated to the user
 
-Sample rate controls have been enabled for AC devices
+Missing USB drivers are now highlighted to the user
+
+Statistics tab now has auto-ranging for units, to be more readable
+
+The color of cursors can be changed, to make them more visible
+
+Summary data can now be collapsed to make it more readable
 
 
 *** Major Fixes ***
 
-Fixed issue where multi-rate stream text in python automation could have missing values
+Fixed issue where old trace data did not delete correctly
+
+Fixed issue where LAN devices could lose connection after a couple of hours of streaming
+
+Fixed issue where progress bar and notifications were both modal, locking access
 
-Fixed issue where recording duration calculated incorrectly if an external trigger was used
+Touchpad horizontal two finger scrolling now works correctly
 
-Fixed issue where exception reporting could also crash, failing to capture the log
+Multiple other exceptions trapped and handled

quarchpy/connection_specific/connection_QIS.py

@@ -1100,25 +1100,24 @@ class QisInterface:
         try:
             if sock == None:
                 sock = self.sock
-            count = 0
-            while(True):
-                if count > 5:
-                    break
-                count += 1
-                # Get the raw data
-                headerData = self.sendAndReceiveText(sock, sentText='stream text header', device=device)
-
-                # Check for no header (no stream started)
-                if('Header Not Available' in headerData):
-                    logging.error(device + ' Stream header not available.' + self.host + ':' + str(self.port))
-                    continue
-
-                # Check for XML format
-                if('?xml version=' not in headerData):
-                    logging.error(device + ' Header not in XML form.' + self.host + ':' + str(self.port))
-                    continue
+            
+            # Get the raw data
+            headerData = self.sendAndReceiveText(sock, sentText='stream text header', device=device)
 
-                break
+            # The XML can contain the cursor on the end!  Trap and remove it here TODO: Needs fixed in the command layer above
+            if ('\r\n>' in headerData):
+                headerData = headerData[:-1]
+            
+            # Check for no header (no stream started)
+            if('Header Not Available' in headerData):
+                logging.error(device + ' Stream header not available.' + self.host + ':' + str(self.port))
+                return None;
+                
+            # Check for XML format
+            if('?xml version=' not in headerData):
+                logging.error(device + ' Header not in XML form.' + self.host + ':' + str(self.port))
+                return None;
+                
             # Parse XML into structured format
             xml_root = ET.fromstring(headerData)            
             
@@ -1639,39 +1638,15 @@ class QisInterface:
                 logging.warning(res[0])
             # If reading until a cursor comes back then keep reading until a cursor appears or max tries exceeded
             if readUntilCursor:
-                import xml.etree.ElementTree as ET
-
                 maxReads = 1000
                 count = 1
-                is_xml = False
-
-                while True:
-
-                    # Determine if the response is XML based on its start
-                    if count == 1:  # Only check this on the first read
-                        if res.startswith("<?xml"):  # Likely XML if it starts with '<'
-                            is_xml = True
-
-                    if is_xml:
-                        # Try to parse the XML to check if it's complete
-                        try:
-                            ET.fromstring(res[:-1])  # If it parses, the response is complete
-                            return res[:-1]  # Exit the loop, valid XML received
-                        except ET.ParseError:
-                            pass  # Keep reading until XML is complete
-                    else:
-                        # Handle normal strings
-                        if res[-1:] == self.cursor:  # If the last character is '>', stop reading
-                            break
-
-                    # Receive more data
-                    res += self.receiveText(sock)
-
-                    # Increment count and check for max reads
+                # check for cursor at end of read and if not there read again
+                while res[-1:] != self.cursor:
+                    res+= self.receiveText(sock) #TODO Confirm this works with multi response CMD Like a $get stats on a large stream with many annos. test with py2 and py3
+                    #res.extend(self.rxBytes(sock))
                     count += 1
                     if count >= maxReads:
-                        raise Exception('Count = Error: max reads exceeded before response was complete')
-
+                        raise Exception(' Count = Error: max reads exceeded before cursor returned')
             return res
 
         except Exception as e:

quarchpy/qis/qisFuncs.py

@@ -98,14 +98,6 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
 
     # OS
     current_os = platform.system()
-    current_arch = platform.machine()
-    current_arch = current_arch.lower()  # ensure comparing same case
-
-    # Currently officially unsupported
-    if (current_os in "Linux" and current_arch == "aarch64") or (current_os in "Darwin" and current_arch == "arm64"):
-        logging.warning("The system [" + current_os + ", " + current_arch + "] is not officially supported.")
-        logging.warning("Please contact Quarch support for running QuarchPy on this system.")
-        return
 
     # ensure the jres folder has the required permissions
     permissions,message= find_java_permissions()
@@ -135,14 +127,10 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     else:
         if current_os in "Windows":
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-        elif current_os in "Linux" and current_arch == "x86_64":
+        elif current_os in "Linux":
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "lin-amd64", "qis", "qis.jar")
-        elif current_os in "Linux" and current_arch == "aarch64":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "lin-arm64", "qis", "qis.jar")
-        elif current_os in "Darwin" and current_arch == "x86_64":
+        elif current_os in "Darwin":
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "mac-amd64", "qis", "qis.jar")
-        elif current_os in "Darwin" and current_arch == "arm64":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "mac-arm64", "qis", "qis.jar")
         else:  # default to windows
             qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
 
@@ -157,7 +145,7 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     # Process command prefix. Needed for headless mode, to support OSs with no system tray.
     cmd_prefix =ipv4v6_vm_args
     if headless is True or (args is not None and "-headless" in args):
-        cmd_prefix += " -Djava.awt.headless=true"
+        cmd_prefix = " -Djava.awt.headless=true"
 
 
     # Process command suffix (additional standard options for QIS).
@@ -183,25 +171,16 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     # different start for different OS
     if current_os == "Windows":
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\" + command
-    elif current_os == "Linux" and current_arch == "x86_64":
+    elif current_os == "Linux":
         command = java_path + "/lin_amd64_jdk_21_jre/bin/" + command
-    elif current_os == "Linux" and current_arch == "aarch64":
-        command = java_path + "/lin_arm64_jdk_21_jre/bin/" + command
-    elif current_os == "Darwin" and current_arch == "x86_64":
+    elif current_os == "Darwin":
         command = java_path + "/mac_amd64_jdk_21_jre/bin/" + command
-    elif current_os == "Darwin" and current_arch == "arm64":
-        command = java_path + "/mac_arm64_jdk_21_jre/bin/" + command
     else:  # default to windows
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\" + command
 
     # Use the command and check QIS has launched
     if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to view logging.
         process = subprocess.Popen(command,shell=True)
-        startTime = time.time() #Checks for Popen launch only
-        while not isQisRunning():
-            if time.time() - startTime > timeout:
-                raise TimeoutError("QIS failed to launch within timelimit of " + str(timeout) + " sec.")
-            pass
     else:
         if sys.version_info[0] < 3:
             process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

quarchpy/qps/qpsFuncs.py

@@ -93,14 +93,6 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
 
     # Check the current OS
     current_os = platform.system()
-    current_arch = platform.machine()
-    current_arch = current_arch.lower()  # ensure comparing same case
-
-    # Currently officially unsupported
-    if (current_os in "Linux" and current_arch == "aarch64") or (current_os in "Darwin" and current_arch == "arm64"):
-        logging.warning("The system [" + current_os + ", " + current_arch + "] is not officially supported.")
-        logging.warning("Please contact Quarch support for running QuarchPy on this system.")
-        return
 
     # ensure the jres folder has the required permissions
     permissions, message = find_java_permissions()
@@ -125,14 +117,10 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     else: # Different QPS.jar for each OS
         if current_os in "Windows":
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
-        elif current_os in "Linux" and current_arch == "x86_64":
+        elif current_os in "Linux":
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-amd64", "qps.jar")
-        elif current_os in "Linux" and current_arch == "aarch64":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-arm64", "qps.jar")
-        elif current_os in "Darwin" and current_arch == "x86_64":
+        elif current_os in "Darwin":
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-amd64", "qps.jar")
-        elif current_os in "Darwin" and current_arch == "arm64":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-arm64", "qps.jar")
         else:  # default to windows
             qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
 
@@ -143,24 +131,15 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     # OS dependency
     if current_os in "Windows":
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\java -jar qps.jar " + str(args)
-    elif current_os in "Linux" and current_arch == "x86_64":
+    elif current_os in "Linux":
         command = java_path + "/lin_amd64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
-    elif current_os in "Linux" and current_arch == "aarch64":
-        command = java_path + "/lin_arm64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
-    elif current_os in "Darwin" and current_arch == "x86_64":
+    elif current_os in "Darwin":
         command = java_path + "/mac_amd64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
-    elif current_os in "Darwin" and current_arch == "arm64":
-        command = java_path + "/mac_arm64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
     else:  # default to windows
         command = java_path + "\\win_amd64_jdk_21_jre\\bin\\java -jar qps.jar " + str(args)
 
     if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to keep a window open to view logging.
-        if current_os in "Windows":
-            process = subprocess.Popen(command,shell=True)
-        else:
-            # Add a hold command to keep the terminal open (useful for bash)
-            command_with_pause = command + "; exec bash"
-            process = subprocess.run(command_with_pause, shell=True)
+        process = subprocess.Popen(command,shell=True)
     else:
         if sys.version_info[0] < 3:
             process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

{quarchpy-2.2.1.dist-info → quarchpy-2.2.1.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.2.1
+Version: 2.2.1.dev1
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com