quarchpy 2.2.7.dev2__py2.py3-none-any.whl → 2.2.8.dev1__py2.py3-none-any.whl

quarchpy/.idea/workspace.xml

@@ -5,9 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="636aab8d-ddf5-4a16-9afb-6ef6a8d53577" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/Docs/CHANGES.rst" beforeDir="false" afterPath="$PROJECT_DIR$/Docs/CHANGES.rst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/_version.py" beforeDir="false" afterPath="$PROJECT_DIR$/_version.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/connection_specific/QPS/win-amd64/qps_lib/JFXUtilities-1.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/connection_specific/QPS/win-amd64/qps_lib/JFXUtilities-1.0.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/connection_specific/connection_QIS.py" beforeDir="false" afterPath="$PROJECT_DIR$/connection_specific/connection_QIS.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/qis/qisFuncs.py" beforeDir="false" afterPath="$PROJECT_DIR$/qis/qisFuncs.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/qps/qpsFuncs.py" beforeDir="false" afterPath="$PROJECT_DIR$/qps/qpsFuncs.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -23,14 +23,15 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Python.Main.executor&quot;: &quot;Debug&quot;,
-    &quot;Python.QisAcStreamExample.executor&quot;: &quot;Debug&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;P:/Software/Python/QuarchPy/Trunk/quarchpy/run.py&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Python.Main.executor": "Debug",
+    "Python.QisAcStreamExample.executor": "Debug",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "last_opened_file_path": "P:/Software/Python/QuarchPy/Trunk/quarchpy/run.py",
+    "settings.editor.selected.configurable": "reference.idesettings.quicklists"
   }
-}</component>
+}]]></component>
   <component name="RunManager">
     <configuration name="Main" type="PythonConfigurationType" factoryName="Python">
       <module name="quarchpy" />
@@ -47,7 +48,7 @@
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/run.py" />
-      <option name="PARAMETERS" value="qps -logging=ON -logtarget=&quot;C:\temp\logDir&quot; -qissamelogging=ON" />
+      <option name="PARAMETERS" value="qis" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
@@ -158,4 +159,15 @@
     <MESSAGE value="Fixed arguments not being passed correctly to QPS." />
     <option name="LAST_COMMIT_MESSAGE" value="Fixed arguments not being passed correctly to QPS." />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://C:/Python311/Lib/site-packages/quarchpy/qis/qisFuncs.py</url>
+          <line>183</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.2.7.dev2"
+__version__ = "2.2.8.dev1"

quarchpy/connection_specific/QPS/win-amd64/resources/profiles/3_PHASE_PAM_AC_DEFAULT.rcf

@@ -19,8 +19,8 @@ Currently it supports:
 <RecordingConfiguration>
     <Header> <!-- Header information for the recording configuration -->
         <FileVersion>2.0</FileVersion> <!-- Version of the file, checked on load. -->
-        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01</DeviceTarget> <!-- Device identifier for the compatible device(s) -->
-        <FileDescription></FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
+        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01, QTL2843-02</DeviceTarget> <!-- Device identifier for the compatible device(s) -->
+        <FileDescription>This file contains the default synthetic channel setup for an AC PAM.</FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
     </Header>
     <SyntheticChannels> <!-- Root tag for synthetic channels configuration -->
         <Clear>false</Clear> <!-- Indicates whether to clear existing synthetic channels -->

quarchpy/connection_specific/QPS/win-amd64/resources/profiles/3_PHASE_PAM_AC_FULL.rcf

@@ -2,62 +2,11 @@
 <RecordingConfiguration>
     <Header>
         <FileVersion>2.0</FileVersion>
-        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01</DeviceTarget>
-        <FileDescription></FileDescription>
+        <DeviceTarget>QTL2582-01, QTL2751-03, QTL2789-01, QTL2843-02</DeviceTarget>
+        <FileDescription>This file contains the additional channels of interest for an AC PAM, such as total harmonic distortion and crest factor.</FileDescription>
     </Header>
     <SyntheticChannels>
         <Clear>false</Clear>
-        <SyntheticChannel>
-            <Configuration>
-                <Enable>true</Enable>
-                <Visible>true</Visible>
-            </Configuration>
-            <SyntheticChannelFunction>
-                <FunctionDetails>
-                    <DisplayGroup>v</DisplayGroup>
-                    <DisplayName>+3.3V_VOLT_RMS</DisplayName>
-                    <FunctionName>rms</FunctionName>
-                </FunctionDetails>
-                <FunctionArguments>
-                    <Argument>1ms</Argument>
-                    <Argument>chan(+3.3V,v)</Argument>
-                </FunctionArguments>
-            </SyntheticChannelFunction>
-        </SyntheticChannel>
-        <SyntheticChannel>
-            <Configuration>
-                <Enable>true</Enable>
-                <Visible>true</Visible>
-            </Configuration>
-            <SyntheticChannelFunction>
-                <FunctionDetails>
-                    <DisplayGroup>a</DisplayGroup>
-                    <DisplayName>+3.3V_CURR_RMS</DisplayName>
-                    <FunctionName>rms</FunctionName>
-                </FunctionDetails>
-                <FunctionArguments>
-                    <Argument>1ms</Argument>
-                    <Argument>chan(+3.3V,a)</Argument>
-                </FunctionArguments>
-            </SyntheticChannelFunction>
-        </SyntheticChannel>
-        <SyntheticChannel>
-            <Configuration>
-                <Enable>true</Enable>
-                <Visible>true</Visible>
-            </Configuration>
-            <SyntheticChannelFunction>
-                <FunctionDetails>
-                    <DisplayGroup>w</DisplayGroup>
-                    <DisplayName>+3.3V_POWER_RMS</DisplayName>
-                    <FunctionName>rms</FunctionName>
-                </FunctionDetails>
-                <FunctionArguments>
-                    <Argument>1ms</Argument>
-                    <Argument>chan(+3.3V,v)</Argument>
-                </FunctionArguments>
-            </SyntheticChannelFunction>
-        </SyntheticChannel>
         <SyntheticChannel>
             <Configuration>
                 <Enable>true</Enable>
@@ -121,7 +70,7 @@
                 <FunctionDetails>
                     <DisplayGroup>V</DisplayGroup>
                     <DisplayName>L1_HAR</DisplayName>
-                    <FunctionName>subtract</FunctionName>
+                    <FunctionName>harSubtract</FunctionName>
                 </FunctionDetails>
                 <FunctionArguments>
                     <Argument>100ms</Argument>
@@ -139,7 +88,7 @@
                 <FunctionDetails>
                     <DisplayGroup>V</DisplayGroup>
                     <DisplayName>L2_HAR</DisplayName>
-                    <FunctionName>subtract</FunctionName>
+                    <FunctionName>harSubtract</FunctionName>
                 </FunctionDetails>
                 <FunctionArguments>
                     <Argument>100ms</Argument>
@@ -157,7 +106,7 @@
                 <FunctionDetails>
                     <DisplayGroup>V</DisplayGroup>
                     <DisplayName>L3_HAR</DisplayName>
-                    <FunctionName>subtract</FunctionName>
+                    <FunctionName>harSubtract</FunctionName>
                 </FunctionDetails>
                 <FunctionArguments>
                     <Argument>100ms</Argument>

quarchpy/connection_specific/QPS/win-amd64/resources/profiles/PAM_EXAMPLE_CONFIG.rcf

@@ -20,7 +20,7 @@ Currently it supports:
     <Header> <!-- Header information for the recording configuration -->
         <FileVersion>2.0</FileVersion> <!-- Version of the file, checked on load. -->
         <DeviceTarget>QTL2312-01</DeviceTarget> <!-- Device identifier for the compatible device(s) -->
-        <FileDescription></FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
+        <FileDescription>This is an example file for PAMs, showing how to configure channels and add an RMS</FileDescription> <!-- Description of the file to make it clear what the file is intended for -->
     </Header>
     <SyntheticChannels> <!-- Root tag for synthetic channels configuration -->
         <Clear>false</Clear> <!-- Indicates whether to clear existing synthetic channels -->

quarchpy/connection_specific/connection_QIS.py

@@ -1,4 +1,3 @@
-# -*- coding: future_fstrings -*-
 import csv
 import socket
 import re
@@ -11,9 +10,9 @@ import threading
 import math
 import logging
 import struct
-import xml.etree.ElementTree as ET
 from io import StringIO
 from quarchpy.user_interface import *
+import xml.etree.ElementTree as ET
 from connection_specific.StreamChannels import StreamGroups
 
 
@@ -262,10 +261,7 @@ class QisInterface:
         #     streamAverage = self.convertStreamAverage(streamAverage)
         #     stripesPerAverage = float(streamAverage) / (float(baseSamplePeriodS) * 4e-6)
         if inMemoryData is None:
-            if sys.version_info[0] >= 3:
-                f = open(fileName, 'a', newline='')  # Python 3
-            else:
-                f = open(fileName, 'ab')  # Python 2: Use 'b' mode to avoid newline issues
+            f = open(fileName, 'a', newline='') #changed from ab to a as all data should be in string format now regardless of py2 or py3
         isRun = True
         while isRun:
             try:
@@ -1686,6 +1682,7 @@ class QisInterface:
 
         except Exception as e:
             #something went wrong during send qis cmd
+            logging.error("Error! Unable to retrieve response from QIS. Command: " + sentText)
             logging.error(e)
             raise e
         finally:

quarchpy/connection_specific/mDNS.py

@@ -1,9 +1,7 @@
 import platform  # For getting the operating system name
 import subprocess  # For executing a shell command
 import logging
-import sys
-if sys.version_info[0] >= 3:
-    from zeroconf import Zeroconf
+from zeroconf import Zeroconf
 
 
 def ping(host):

quarchpy/debug/SystemTest.py

@@ -1,5 +1,6 @@
 from quarchpy import *
 from quarchpy.device import *
+from quarchpy.connection_specific.jdk_j21_jres.fix_permissions import main as fix_permissions, find_java_permissions
 try:
     from importlib.metadata import distribution
 except:
@@ -48,6 +49,11 @@ def test_system_info():
         print(str(bytes(subprocess.check_output(['cat', '/etc/os-release'], stderr=subprocess.STDOUT)).decode()))
     print("Platform Release:  " + platform.release())
 
+    print("\nPYTHON\n------")
+    try:
+        print("Python Version: " + sys.version)
+    except:
+        print("Unable to detect Python version")
     try:
         print("Quarchpy Version: " + get_quarchpy_version())
     except:
@@ -57,14 +63,8 @@ def test_system_info():
     except Exception as e:
         print(e)
         print("Unable to detect Quarchpy location")
-    try:
-        print("Python Version: " + sys.version)
-    except:
-        print("Unable to detect Python version")
-    try:
-        print("QIS version number: " + get_QIS_version())
-    except:
-        print("Unable to detect QIS version")
+
+    print("\nJAVA\n----")
     try:
         javaVersion = bytes(subprocess.check_output(['java', '-version'], stderr=subprocess.STDOUT)).decode()
         print("Java Version: " + str(javaVersion))
@@ -78,12 +78,17 @@ def test_system_info():
         print("Unable to detect java location"
               "If Java is not installed then QIS and QPS will NOT run")
     try:
-        find_java_permissions()
+        execute_permissions, message=find_java_permissions()
+        print("Execute Permissions: ",execute_permissions, "\n",message)
     except:
         print("Unable to get j21 java permissions")
+    try:
+        print("\nQIS version number: " + get_QIS_version())
+    except Exception as e:
+        print("\nUnable to detect QIS version. Exception:" +str(e))
 
-    # Scan for all quarch devices on the system
 
+# Scan for all quarch devices on the system
 def QuarchSimpleIdentify(device1):
     """
     Prints basic identification test data on the specified module, compatible with all Quarch devices
@@ -92,7 +97,7 @@ def QuarchSimpleIdentify(device1):
     ----------
     device1: quarchDevice
         Open connection to a quarch device
-        
+
     """
     # Print the module name
     print("MODULE IDENTIFY TEST")
@@ -105,6 +110,7 @@ def QuarchSimpleIdentify(device1):
     print("Module Identity Information: ")
     print(device1.sendCommand("*idn?"))
 
+
 def get_QIS_version():
     """
     Returns the version of QIS.  This is the version of QIS currenty running on the local system if one exists.
@@ -114,15 +120,20 @@ def get_QIS_version():
     -------
     version: str
         String representation of the QIS version number
-        
+
     """
 
     qis_version = ""
     my_close_qis = False
-    if isQisRunning() == False:
+    try:
+        qisRunning=isQisRunning()
+    except Exception as e:
+        print("Exception occurred while checking if qis was already running. Error:\n"+str(e))
+
+    if qisRunning == False:
         my_close_qis = True
         startLocalQis(headless=True)
-        
+
     myQis = qisInterface()
     qis_version = myQis.sendAndReceiveCmd(cmd="$version")
     if "No Target Device Specified" in qis_version:
@@ -131,6 +142,7 @@ def get_QIS_version():
         myQis.sendAndReceiveCmd(cmd = "$shutdown")
     return qis_version
 
+
 def get_java_location():
     """
     Returns the location of java.
@@ -148,12 +160,14 @@ def get_java_location():
         location = "Unable to detect OS to check java version."
     return location
 
+
 def get_quarchpy_version():
     try:
        return __version__
     except:
         return "Unknown"
 
+
 def fix_usb():
     content_to_write = "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\"" \
                        "SUBSYSTEM==\"usb_device\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\""
@@ -199,6 +213,7 @@ def main (args=None):
         test_communication()
 
 
+
 if __name__ == "__main__":
     main([])
     #find_java_permissions()

quarchpy/debug/module_debug.py

@@ -1,4 +1,3 @@
-# -*- coding: future_fstrings -*-
 '''
 ########### REQUIREMENTS ###########
 

quarchpy/device/quarchPPM.py

@@ -1,6 +1,5 @@
-# -*- coding: future_fstrings -*-
 from .device import quarchDevice
-import logging, sys
+import logging
 import xml.etree.ElementTree as ET
 from quarchpy.user_interface.user_interface import printText
 

quarchpy/device/quarchQPS.py

@@ -198,8 +198,7 @@ class quarchStream:
         return (command_response)
 
 
-    def addAnnotation(self, title, annotationTime=0, extraText="", yPos="", titleColor="", annotationColor="",
-                      annotationType="", timeFormat="unix"):
+    def addAnnotation(self, title, annotationTime=0, extraText="", yPos="", titleColor="", annotationColor="", annotationType="", annotationGroup="", timeFormat="unix"):
         """
                     Adds a custom annotation to stream with given parameters.
 

quarchpy/device/scanDevices.py

@@ -504,9 +504,9 @@ def scanDevices(target_conn="all", lanTimeout=1, scanInArray=True, favouriteOnly
     # Setup mdns with zeroconf
     # Ensure listener/zeroconf instance stay persistent (ensures only one thread is used for each scan cycle)
     mdns_listener = MyListener().get_instance()
-    # zeroconf = mdns_listener.get_zeroconf()
+    zeroconf = mdns_listener.get_zeroconf()
     # Setup new mdns discovery service for every scan cycle
-    # browser = scan_mDNS(mdns_listener, zeroconf)
+    browser = scan_mDNS(mdns_listener, zeroconf)
     # Set target_conn
     mdns_listener.target_conn = target_conn.lower()
     # Setup mdns discovery that stays persistent in the background - (could be removed)
@@ -590,7 +590,7 @@ def scanDevices(target_conn="all", lanTimeout=1, scanInArray=True, favouriteOnly
     if module_type_filter:
         foundDevices = filter_module_type(module_type_filter, foundDevices)
     # Cancels the mdns discovery service (required to close active thread)
-    # browser.cancel()
+    browser.cancel()
     return foundDevices
 
 

quarchpy/docs/CHANGES.rst

@@ -13,9 +13,10 @@ Quarchpy
 Change Log
 ----------
 
-2.2.4
+
+2.2.7
 -----
-- Fixed issue with missing native java lib.
+- Bug fix for QIS 1.47 missing lib for linux only 
 
 2.2.6
 -----