quarchpy 2.1.27.dev1__py2.py3-none-any.whl → 2.2.0__py2.py3-none-any.whl

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.1.27.dev1"
+__version__ = "2.2.0"

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

@@ -0,0 +1,17 @@
+Command Line Arguments
+
+-ccs=HIDE               Disable initial display of Common Connection Screen
+-connect=CONNECT        Connects to a device; eg -connect=USB::QTL1999-04-013
+-devdebug=ON            Enable development debug - strange and fascinating, to some, things may happen
+-logging=ON             Enable logging
+-logconsole=ON          Logging to console
+-loglevel=INFO, ...     Specifies the logging level
+-logtarget=DIR          Specifies the logging file directory
+-logviewer=DIR          Specifies the log viewer file directory
+-open=FILE              Opens an archived file; eg -open=C:\>path-to-file\recording.qps
+-perfcontrols=ON        Enable performance controls
+-qissamelogging=ON      Inherit logging settings when this instance of QPS launches QIS
+-shownotifications=OFF  Disable displaying user message notifications
+
+--help                  Command line help
+--version               Version number

quarchpy/connection_specific/QPS/win-amd64/launchQPSJ21.bat

@@ -0,0 +1,4 @@
+cd ..
+cd ..
+cd ..
+python run.py qps

quarchpy/connection_specific/QPS/win-amd64/launchQPSJ21.sh

@@ -0,0 +1,4 @@
+cd ..
+cd ..
+cd ..
+python3 run.py qps

quarchpy/connection_specific/QPS/{qis → win-amd64/qis}/README.txt

@@ -1,6 +1,6 @@
-qis 1.33
+qis 1.43
 
-Copyright Quarch Technology Limited 2022.
+Copyright Quarch Technology Limited 2024.
 
 Warning and Disclaimer
 ======================
@@ -25,8 +25,8 @@ Dependencies
 
 qis uses:
 
-usb4java v1.2 for USB communication with Quarch PPMs, usb4java 1.2 is licenced under LGPL V3.0
-Netty for Ethernet services, Netty v4.0.37 distributed under Apache License 2.0
+usb4java v1.3 for USB communication with Quarch PPMs, usb4java 1.3 is licensed under LGPL V3.0
+Netty for Ethernet services, Netty v4.1.43 distributed under Apache License 2.0
 
 See directory License for additional information.
 
@@ -35,5 +35,5 @@ Installation
 
 Unpack qis to a local directory.
 
-start qis by running "qis.bat" on windows or "./qis.sh" on linux (check execute permissions if it doesn't run), or simply by running "java -jar qis.jar"
+Start qis by running "qis.bat" on Windows or "./qis.sh" on Linux (check execute permissions if it doesn't run), or simply by running "java -jar qis.jar"
 

quarchpy/connection_specific/QPS/{qis → win-amd64/qis}/help.txt

@@ -1,4 +1,4 @@
-(C)Quarch Technology Ltd 2023, QIS v1.39
+(C)Quarch Technology Ltd 2024, QIS v1.44
 
 qis:
 

quarchpy/connection_specific/QPS/win-amd64/qis/qis-NoGUI.bat

@@ -0,0 +1,3 @@
+@echo off
+start /b java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false -Djava.awt.headless=true -jar qis.jar
+

quarchpy/connection_specific/QPS/{qis → win-amd64/qis}/qis-NoGUI.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-java -Djava.awt.headless=true -jar ./qis.jar
+java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false -Djava.awt.headless=true -jar ./qis.jar
 # run in background after closing cmd window ?
 #nohup java -Djava.awt.headless=true -jar ./qis.jar &
 # run in background after closing cmd window logging output to file ?

quarchpy/connection_specific/QPS/win-amd64/qis/qis.bat

@@ -0,0 +1,3 @@
+@echo off
+rem start /b javaw -jar qis.jar -terminal
+start /b javaw -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false -jar qis.jar

quarchpy/connection_specific/QPS/win-amd64/qis/qis.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+nohup java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false -jar ./qis.jar &

quarchpy/connection_specific/QPS/{scriptCommands.txt → win-amd64/scriptCommands.txt}

@@ -1,7 +1,7 @@
 QPS Command Summary
 Copyright (c) Quarch Ltd
-QPS v1.39.13
-Generated: 13-May-2024
+QPS v1.42.J21
+Generated: 19 Jul 2024
 
 
 *** Commands ***
@@ -149,9 +149,11 @@ Default value: NONE
 Notes:
 Command is passed to QIS which will test the connection availability and suitability for streaming data returning a status of OK
 or the reason for connection failure if connection is successful, ccs and file dialogs should close and the chart window connected to the device should display
+$connect supports both device names and IP addresses
 Examples:
 $connect usb::QTL1999-02-999
 $connect tcp::QTL1999-02-999
+$connect tcp::81.187.174.46
 
 Command: $connected
 Description: Returns the connected device ID

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

@@ -0,0 +1,41 @@
+*** What's New In Quarch Power Studio ***
+
+19th July 2024
+
+QPS version 1.42
+QIS version 1.44
+
+
+
+*** New Features ***
+
+QPS is now build against Java21.  The runtime is packaged in the installer so seperate Java install is not required in most cases
+
+This 'What's new' dialog added, to call out the latest features!
+
+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
+
+Speed improvements when navigating through large datasets
+
+Modules with updated firmware available are now indicated to the user
+
+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 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
+
+Touchpad horizontal two finger scrolling now works correctly
+
+Multiple other exceptions trapped and handled

quarchpy/connection_specific/connection_QIS.py

@@ -253,7 +253,7 @@ class QisInterface:
         else:
             raise ValueError("couldn't decode samplePeriod")
 
-        baseSamplePeriodS = int(re.search('^\d*\.?\d*', baseSamplePeriod).group())*(10**baseSampleUnitExponent)        
+        baseSamplePeriodS = int(re.search(r'^\d*\.?\d*', baseSamplePeriod).group())*(10**baseSampleUnitExponent)
 
         # # TODO: MD Thinks this implements software averaging, is unused and now performed in QIS
         # if streamAverage != None:

quarchpy/connection_specific/connection_QPS.py

@@ -7,7 +7,8 @@ import os
 import random
 import logging
 import time
-
+import re
+from quarchpy.user_interface import user_interface
 
 class QpsInterface:
     def __init__(self, host='127.0.0.1', port=9822):
@@ -207,7 +208,7 @@ class QpsInterface:
         while(1):
             update=self.sendCmdVerbose("$progress check \"open recording\"",timeout=cmdTimeout)
             #print(update)
-            m = re.search('\d+(\.\d+)?%', update)
+            m = re.search(r'\d+(\.\d+)?%', update)
             if m: # A percentage was found
                 loadingStarted=True
                 found = float(m.group(0)[:-1])

quarchpy/connection_specific/jdk_j21_jres/fix_permissions.py

@@ -0,0 +1,70 @@
+import os
+import subprocess
+import platform
+
+
+def main():
+
+    # Check the current OS
+    current_os = platform.system()
+    if current_os != "Windows":
+        print("Fixing Permissions")
+        # Check the current OS
+        current_os = platform.system()
+        # JRE 21 path
+        java_path = os.path.dirname(os.path.abspath(__file__))
+        java_path, junk = os.path.split(java_path)
+        java_path = os.path.join(java_path, "jdk_j21_jres")
+    
+        # OS dependency
+        if current_os in "Windows":
+            java_path = java_path + "\\win_amd64_jdk_21_jre\\"
+        elif current_os in "Linux":
+            java_path = java_path + "/lin_amd64_jdk_21_jre/"
+        elif current_os in "Darwin":
+            java_path = java_path + "/mac_amd64_jdk_21_jre/"
+        else:  # default to windows
+            java_path = java_path + "\\win_amd64_jdk_21_jre\\"
+    
+        # Ensure the jres folder has the required permissions
+        subprocess.call(['chmod', '-R', '+rwx', java_path])
+
+
+def find_java_permissions():
+    # Check the current OS
+    current_os = platform.system()
+    # JRE 21 path
+    java_path = os.path.dirname(os.path.abspath(__file__))
+    java_path, junk = os.path.split(java_path)
+    java_path = os.path.join(java_path, "jdk_j21_jres")
+
+    # OS dependency
+    if current_os in "Windows":
+        java_path = os.path.join(java_path, "win_amd64_jdk_21_jre","bin","java.exe")
+    elif current_os in "Linux":
+        java_path = java_path + "/lin_amd64_jdk_21_jre/bin/java"
+    elif current_os in "Darwin":
+        java_path = java_path + "/mac_amd64_jdk_21_jre/bin/java"
+    else:  # default to windows
+        java_path = java_path + "\\win_amd64_jdk_21_jre\\bin\\java"
+    # Get the file status
+    st = os.stat(java_path)
+    # Extract the file permissions from the file status
+    permissions = st.st_mode
+    # Convert the file permissions to octal representation
+    permissions_octal = oct(permissions)
+    # Print the octal representation of the file permissions
+    message=("Permissions of file at {}: {}".format(java_path, permissions_octal))
+
+    execute_permissions = True
+    if int(permissions_octal[-3]) % 2 ==0:
+        execute_permissions = False
+    if int(permissions_octal[-2]) % 2 ==0:
+        execute_permissions = False
+    if int(permissions_octal[-1]) % 2 ==0:
+        execute_permissions = False
+
+    return execute_permissions, message
+
+if __name__ == "__main__":
+    main()

quarchpy/connection_specific/jdk_j21_jres/lin_amd64_jdk_21_jre/conf/jaxp.properties

@@ -0,0 +1,180 @@
+################################################################################
+#           JAXP Configuration File
+#
+# jaxp.properties (this file) is the default configuration file for JAXP, the API
+# defined in the java.xml module. It is in java.util.Properties format and typically
+# located in the {java.home}/conf directory. It may contain key/value pairs for
+# specifying the implementation classes of JAXP factories and/or properties
+# that have corresponding system properties.
+#
+# A user-specified configuration file can be set up using the system property
+# java.xml.config.file to override any or all of the entries in jaxp.properties.
+# The following statement provides myConfigurationFile as a custom configuration
+# file:
+#     java -Djava.xml.config.file=myConfigurationFile
+################################################################################
+
+# ---- JAXP Default Configuration ----
+#
+# The JAXP default configuration (jaxp.properties) contains entries for the
+# Factory Lookup Mechanism and properties with corresponding system properties.
+# The values are generally set to the default values of the properties.
+#
+#
+# JAXP Lookup Mechanism:
+#
+# The JAXP configuration file ranks 2nd to the System Property in the precedent
+# order of the JAXP Lookup Mechanism. When the System Property is not specified,
+# a JAXP factory reads the configuration file in order to locate an implementation
+# class. If found, the class specified will be used as the factory implementation
+# class.
+#
+# The format of an entry is key=value where the key is the fully qualified name
+# of the factory and value that of the implementation class. The following entry
+# set a DocumentBuilderFactory implementation class:
+#
+# javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
+#
+#
+# Java SE and JDK Implementation Specific Properties:
+#
+# The JAXP configuration file ranks above the default settings in the Property
+# Precedence in that its entries will override the default values of the corresponding
+# properties.
+#
+# All properties that have System Properties defined in Java SE or supported
+# by the JDK Implementation can be placed in the configuration file to override
+# the default property values. The format is:
+#     system-property-name=value
+#
+# For example, the FILES property in CatalogFeatures has an associated system
+# property called javax.xml.catalog.files. An entry for the FILES property in the
+# configuration file would therefore use javax.xml.catalog.files as the key, that
+# is:
+#     javax.xml.catalog.files=strict
+#
+#
+# Extension Functions:
+#
+# This property determines whether XSLT and XPath extension functions are allowed.
+# The value type is boolean and the default value is true (allowing
+# extension functions). The following entry would override the default value and
+# disallow extension functions:
+#
+# jdk.xml.enableExtensionFunctions=false
+#
+#
+# Overriding the default parser:
+#
+# This property allows using a third party implementation to override the default
+# parser provided by the JDK. The value type is boolean and the default value is
+# false, disallowing overriding the default parser. The setting below reflects
+# the default property setting:
+#
+jdk.xml.overrideDefaultParser=false
+#
+#
+# External Access Properties:
+#
+# The External Access Properties are defined in javax.xml.XMLConstants. Their
+# system properties are javax.xml.accessExternalDTD, javax.xml.accessExternalSchema,
+# and javax.xml.accessExternalStylesheet. The values are a list of protocols separated
+# by comma, plus empty string ("") to represent no protocol allowed and the key
+# word "all" for all access. The default is "all", allowing all external resources
+# to be fetched. The followings are example of external access settings:
+#
+# allow local (file) DTDs to be retrieved
+# javax.xml.accessExternalDTD=file
+#
+# allow local (file) and remote (http) external schemas
+# javax.xml.accessExternalSchema=file, http
+#
+# reject any external stylesheets
+# javax.xml.accessExternalStylesheet=""
+#
+# allow all external stylesheets
+# javax.xml.accessExternalStylesheet="all"
+#
+#
+# Catalog Properties:
+#
+# The Catalog API defines four features: FILES, PREFER, DEFER and RESOLVE.
+# Except PREFER, all other properties can be placed in the configuration file
+# using the system properties defined for them.
+#
+# FILES: A semicolon-delimited list of URIs to locate the catalog files. The URIs
+# must be absolute and have a URL protocol handler for the URI scheme. The following
+# is an example of setting up a catalog file:
+#
+# javax.xml.catalog.files = file:///users/auser/catalog/catalog.xml
+#
+# DEFER: Indicates that the alternative catalogs including those specified in
+# delegate entries or nextCatalog are not read until they are needed. The value
+# is a boolean and the default value is true.
+#
+# javax.xml.catalog.defer=true
+#
+# RESOLVE: Determines the action if there is no matching entry found after all of
+# the specified catalogs are exhausted. The values are key words: strict, continue,
+# and ignore. The default is strict. The following setting reflects the default
+# setting.
+#
+# javax.xml.catalog.resolve=strict
+#
+#
+# useCatalog:
+# This property instructs XML processors to use XML Catalogs to resolve entity
+# references. The value is a boolean and the default value is true.
+#
+# javax.xml.useCatalog=true
+#
+#
+# Implementation Specific Properties - Limits
+#
+# Limits have a value type Integer. The values must be positive integers. Zero
+# means no limit.
+#
+# Limits the number of entity expansions. The default value is 64000
+# jdk.xml.entityExpansionLimit=64000
+#
+# Limits the total size of all entities that include general and parameter entities.
+# The size is calculated as an aggregation of all entities. The default value is 5x10^7.
+# jdk.xml.totalEntitySizeLimit=5E7
+#
+# Limits the maximum size of any general entities. The default value is 0.
+# jdk.xml.maxGeneralEntitySizeLimit=0
+#
+# Limits the maximum size of any parameter entities, including the result of
+# nesting multiple parameter entities. The default value is 10^6.
+# jdk.xml.maxParameterEntitySizeLimit=1E6
+#
+# Limits the total number of nodes in all entity references. The default value is 3x10^6.
+# jdk.xml.entityReplacementLimit=3E6
+#
+# Limits the number of attributes an element can have. The default value is 10000.
+# jdk.xml.elementAttributeLimit=10000
+#
+# Limits the number of content model nodes that may be created when building a
+# grammar for a W3C XML Schema that contains maxOccurs attributes with values
+# other than "unbounded". The default value is 5000.
+# jdk.xml.maxOccurLimit=5000
+#
+# Limits the maximum element depth. The default value is 0.
+# jdk.xml.maxElementDepth=0
+#
+# Limits the maximum size of XML names, including element name, attribute name
+# and namespace prefix and URI. The default value is 1000.
+jdk.xml.maxXMLNameLimit=1000
+#
+#
+# XPath Limits
+#
+# Limits the number of groups an XPath expression can contain. The default value is 10.
+jdk.xml.xpathExprGrpLimit=10
+#
+# Limits the number of operators an XPath expression can contain. The default value is 100.
+jdk.xml.xpathExprOpLimit=100
+#
+# Limits the total number of XPath operators in an XSL Stylesheet. The default value is 10000.
+jdk.xml.xpathTotalOpLimit=10000
+

quarchpy/connection_specific/jdk_j21_jres/lin_amd64_jdk_21_jre/conf/logging.properties

@@ -0,0 +1,63 @@
+############################################################
+#  	Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example, java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+#  	Global properties
+############################################################
+
+# "handlers" specifies a comma-separated list of log Handler
+# classes.  These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+handlers= java.util.logging.ConsoleHandler
+
+# To also add the FileHandler, use the following line instead.
+#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers.  For any given facility this global level
+# can be overridden by a facility-specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# default file output is in user's home directory.
+java.util.logging.FileHandler.pattern = %h/java%u.log
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.count = 1
+# Default number of locks FileHandler can obtain synchronously.
+# This specifies maximum number of attempts to obtain lock file by FileHandler
+# implemented by incrementing the unique field %u as per FileHandler API documentation.
+java.util.logging.FileHandler.maxLocks = 100
+java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+
+# Limit the messages that are printed on the console to INFO and above.
+java.util.logging.ConsoleHandler.level = INFO
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+# Example to customize the SimpleFormatter output format
+# to print one-line log message like this:
+#     <level>: <log message> [<date/time>]
+#
+# java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n
+
+############################################################
+# Facility-specific properties.
+# Provides extra control for each logger.
+############################################################
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+# com.xyz.foo.level = SEVERE