quarchpy 2.2.9.dev3__py2.py3-none-any.whl → 2.2.9.dev4__py2.py3-none-any.whl

quarchpy/debug/SystemTest.py

@@ -1,6 +1,6 @@
+# -*- coding: future_fstrings -*-
 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:
@@ -49,11 +49,6 @@ 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:
@@ -63,8 +58,14 @@ def test_system_info():
     except Exception as e:
         print(e)
         print("Unable to detect Quarchpy location")
-
-    print("\nJAVA\n----")
+    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")
     try:
         javaVersion = bytes(subprocess.check_output(['java', '-version'], stderr=subprocess.STDOUT)).decode()
         print("Java Version: " + str(javaVersion))
@@ -78,17 +79,12 @@ def test_system_info():
         print("Unable to detect java location"
               "If Java is not installed then QIS and QPS will NOT run")
     try:
-        execute_permissions, message=find_java_permissions()
-        print("Execute Permissions: ",execute_permissions, "\n",message)
+        find_java_permissions()
     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
@@ -97,7 +93,7 @@ def QuarchSimpleIdentify(device1):
     ----------
     device1: quarchDevice
         Open connection to a quarch device
-
+        
     """
     # Print the module name
     print("MODULE IDENTIFY TEST")
@@ -108,15 +104,7 @@ def QuarchSimpleIdentify(device1):
     print("")
     # Print the module identify and version information
     print("Module Identity Information: ")
-    idn_info = device1.sendCommand("*idn?")
-    print(idn_info)
-    if "fixture" in idn_info.lower():
-        print("\nFixture Identity Information: ")
-
-        fixture_info = device1.sendCommand("fix idn?")
-        print(fixture_info)
-
-
+    print(device1.sendCommand("*idn?"))
 
 def get_QIS_version():
     """
@@ -127,20 +115,15 @@ def get_QIS_version():
     -------
     version: str
         String representation of the QIS version number
-
+        
     """
 
     qis_version = ""
     my_close_qis = 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:
+    if isQisRunning() == False:
         my_close_qis = True
         startLocalQis(headless=True)
-
+        
     myQis = qisInterface()
     qis_version = myQis.sendAndReceiveCmd(cmd="$version")
     if "No Target Device Specified" in qis_version:
@@ -149,7 +132,6 @@ def get_QIS_version():
         myQis.sendAndReceiveCmd(cmd = "$shutdown")
     return qis_version
 
-
 def get_java_location():
     """
     Returns the location of java.
@@ -167,16 +149,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\"\n" \
+    content_to_write = "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\"" \
                        "SUBSYSTEM==\"usb_device\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\""
 
     if "centos" in str(platform.platform()).lower():
@@ -220,7 +200,6 @@ def main (args=None):
         test_communication()
 
 
-
 if __name__ == "__main__":
     main([])
     #find_java_permissions()

quarchpy/debug/module_debug.py

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

quarchpy/device/device.py

@@ -1,7 +1,6 @@
 import time, sys, os ,logging
 
 from quarchpy.connection import QISConnection, PYConnection, QPSConnection
-from quarchpy import user_interface
 import re
 
 # Check Python version

quarchpy/device/quarchPPM.py

@@ -1,5 +1,6 @@
+# -*- coding: future_fstrings -*-
 from .device import quarchDevice
-import logging
+import logging, sys
 import xml.etree.ElementTree as ET
 from quarchpy.user_interface.user_interface import printText
 
@@ -15,9 +16,9 @@ class quarchPPM(quarchDevice):
         numb_colons = self.ConString.count(":")
         if numb_colons == 1:
             self.ConString = self.ConString.replace(':', '::')
-        if not skipDefaultSyntheticChannels and self.ConType[:3].upper() == "QIS" and "FAIL:" not in self.fixture_definition:
-            self.create_default_synthetic_channels()
- 
+        # if not skipDefaultSyntheticChannels and self.ConType[:3].upper() == "QIS" and "FAIL:" not in self.fixture_definition:
+        #     self.create_default_synthetic_channels()
+
     def startStream(self, fileName='streamData.txt', fileMaxMB=200000, streamName ='Stream With No Name', streamDuration = None, streamAverage = None, releaseOnData = False, separator=",", inMemoryData = None):
         return self.connectionObj.qis.startStream(self.ConString, fileName, fileMaxMB, streamName, streamAverage, releaseOnData, separator, streamDuration, inMemoryData)
 

quarchpy/device/quarchQPS.py

@@ -1,8 +1,6 @@
 from quarchpy.device import quarchDevice
 from quarchpy.utilities.Version import Version
 from quarchpy.user_interface.user_interface import requestDialog
-#from quarchpy.utilities.utils import check_stream_stopped_status, check_export_status
-
 import os, time, datetime, sys, logging
 
 if sys.version_info[0] < 3:
@@ -31,24 +29,24 @@ class quarchQPS(quarchDevice):
         self.IP_address = quarchDevice.connectionObj.qps.host
         self.port_number = quarchDevice.connectionObj.qps.port
 
-    def startStream(self, directory, unserInput=True, streamDuration=""):
+    def startStream(self, directory, unserInput=True):
         """
         directory - str - desired stream dir
         unserInput=True - if a failure occurs userInput=True allows user to rectify problem with user input. set to False if user interaction is not available (automating).
         """
         #time.sleep(1)  # TODO remove this sleep once script->QPS timeing issue resolved. This works fine in the meantime
-        return quarchStream(self.quarchDevice, directory, unserInput, streamDuration)
+        return quarchStream(self.quarchDevice, directory, unserInput)
 
 
 class quarchStream:
-    def __init__(self, quarchQPS, directory, unserInput=True, streamDuration=""):
+    def __init__(self, quarchQPS, directory, unserInput=True):
         self.connectionObj = quarchQPS.connectionObj
         self.IP_address = quarchQPS.connectionObj.qps.host
         self.port_number = quarchQPS.connectionObj.qps.port
         self.ConString = quarchQPS.ConString
         self.ConType = quarchQPS.ConType
-        # time.sleep(1) # TODO Nabil - Is this required?
-        response = self.startQPSStream(directory, streamDuration)
+        time.sleep(1)
+        response = self.startQPSStream(directory)
         if not "fail:" in response.lower():
             return
         else:
@@ -57,19 +55,18 @@ class quarchStream:
             else:
                 self.failCheck(response)
 
-    def startQPSStream(self, newDirectory, streamDuration=""):
-        '''STARTS the QPS stream '''
-        # Set the stream duration if required.
-        response = self.connectionObj.qps.sendCmdVerbose("$start stream \"" + str(newDirectory) + "\" " + str(streamDuration))
+    def startQPSStream(self, newDirectory):
+        '''STARTS the stream '''
+        response = self.connectionObj.qps.sendCmdVerbose("$start stream \"" + str(newDirectory) + "\"")
         if "Error" in response:
-            response = self.connectionObj.qps.sendCmdVerbose("$start stream " + str(newDirectory) + " " + streamDuration)
+            response = self.connectionObj.qps.sendCmdVerbose("$start stream " + str(newDirectory))
         return response
 
     def failCheck(self, response):
         ''' handles failed starting of stream that requires input from user to fix.'''
         while "fail:" in response.lower():
             if "Fail: Directory already exists" in response:
-                newDir = requestDialog(message=response + "  Please enter a new file name:")
+                newDir = requestDialog(message=response+"  Please enter a new file name:")
                 response = self.startQPSStream(newDir)
             else:  # If its a failure we don't know how to handle.
                 raise Exception(response)
@@ -115,7 +112,7 @@ class quarchStream:
 
         return retVal
 
-    def stats_to_CSV(self, file_name="", poll_till_complete=False, check_interval=0.5):
+    def stats_to_CSV(self, file_name=""):
         """
         Saves the statistics grid to a csv file
 
@@ -133,51 +130,43 @@ class quarchStream:
         command_response = self.connectionObj.qps.sendCmdVerbose("$stats to csv \"" + file_name + "\"", timeout=60)
         if command_response.startswith("Fail"):
             raise Exception(command_response)
-
-        #UNCOMMENT
-        # if poll_till_complete:
-        #     is_exporting = check_export_status(self.get_stats_export_status())
-        #     while is_exporting:
-        #         is_exporting = check_export_status(self.get_stats_export_status())
-        #         time.sleep(check_interval)
         return command_response
 
     def get_custom_stats_range(self, start_time, end_time):
         """
-          Returns the QPS statistics information over a specific time ignoring any set annotations.
-
-                    Parameters
-                    ----------
-                    start_time = : str
-                        The time in seconds you would like the stats to start this can be in integer or string format.
-                        or using the following format to specify daysDhours:minutes:seconds.milliseconds
-                        xxxDxx:xx:xx.xxxx
-                    end_time = : str
-                        The time in seconds you would like the stats to stop this can be in integer or string format
-                        or using the following format to specify daysDhours:minutes:seconds.milliseconds
-                        xxxDxx:xx:xx.xxxx
-                    Returns
-                    -------
-                    df = : dataframe
-                        The response text from QPS. If successful "ok. Saving stats to : file_name" otherwise returns the exception thrown
+                      Returns the QPS statistics information over a specific time ignoring any set annotations.
+
+                                Parameters
+                                ----------
+                                start_time = : str
+                                    The time in seconds you would like the stats to start this can be in integer or string format.
+                                    or using the following format to specify daysDhours:minutes:seconds.milliseconds
+                                    xxxDxx:xx:xx.xxxx
+                                end_time = : str
+                                    The time in seconds you would like the stats to stop this can be in integer or string format
+                                    or using the following format to specify daysDhours:minutes:seconds.milliseconds
+                                    xxxDxx:xx:xx.xxxx
+                                Returns
+                                -------
+                                df = : dataframe
+                                    The response text from QPS. If successful "ok. Saving stats to : file_name" otherwise returns the exception thrown
         """
         try:
             import warnings
             import pandas as pd
             warnings.simplefilter(action='ignore', category=FutureWarning)
-        except ImportError:
+        except:
             logging.warning("pandas not imported correctly")
-
         command_response = self.connectionObj.qps.sendCmdVerbose(
             "$get custom stats range " + str(start_time) + " " + str(end_time), timeout=60)
-
         if command_response.startswith("Fail"):
             raise Exception(command_response)
         test_data = StringIO(command_response)
-
         try:
             pd.set_option('display.max_columns', None)
             pd.set_option('display.width', 1024)
+            # df = pd.read_csv(test_data, sep=",", header=[0,1])
+            # pandas.read_csv() replaced error_bad_lines with on_bad_lines from v1.3.0
             if Version.is_v1_ge_v2(pd.__version__, "1.3.0"):
                 df = pd.read_csv(test_data, sep=",", header=[0, 1], on_bad_lines="skip")
             else:
@@ -198,9 +187,9 @@ class quarchStream:
 
     def getStreamState(self):
         """
-                      Asks QPS for the stream status.
+                      Askes QPS for the stream status.
                       QPS stream state != Module stream state.
-                      This is different from "rec stream?" cmd to the module as it will return "streaming" when the module is no longer streaming but QPS is still receiveing stream data from the module.
+                      This is different from "rec stream?" cmd to the module as it will return "streaming" when the module is nolonger streaming but QPS is still receiveing stream data from the module.
                       ei the module has stopped streaming but is emptying the stream buffer.
         """
         command_response = self.connectionObj.qps.sendCmdVerbose("$stream state")
@@ -208,8 +197,9 @@ class quarchStream:
             raise Exception(command_response)
         return (command_response)
 
+
     def addAnnotation(self, title, annotationTime=0, extraText="", yPos="", titleColor="", annotationColor="",
-                      annotationType="", annotationGroup="", timeFormat="unix"):
+                      annotationType="", timeFormat="unix"):
         """
                     Adds a custom annotation to stream with given parameters.
 
@@ -240,15 +230,14 @@ class quarchStream:
         annotationType = annotationType.lower()
         annotationTime = str(annotationTime)
 
-        if annotationTime[0].isalpha() or annotationTime[-1].isalpha():
-            timeFormat = "elapsed"
-            if annotationTime.startswith(
-                    "e"):  #Old format allowed e to be used to pass elapsed time in seconds "e2" -> 2s + elapsed
-                annotationTime = annotationTime[1:] + "s"
+        if (annotationTime[0].isalpha() or annotationTime[-1].isalpha()):
+            timeFormat="elapsed"
+            if annotationTime.startswith("e"): #Old format allowed e to be used to pass elapsed time in seconds "e2" -> 2s + elapsed
+                annotationTime=annotationTime[1:]+"s"
 
-        elif annotationTime == "0":
-            annotationTime = current_milli_time()
-            timeFormat = "unix"
+        elif annotationTime=="0":
+            annotationTime=current_milli_time()
+            timeFormat="unix"
 
         if annotationType == "" or annotationType == "annotation":
             annotationType = "annotate"
@@ -260,23 +249,24 @@ class quarchStream:
         #     return retString
 
         title = title.replace("\n", "\\n")
-        cmd = "$stream annotation add " + " time=" + str(annotationTime) + " text=\"" + title + "\""
-        if extraText != "":
+        cmd="$stream annotation add "+" time="+str(annotationTime)+ " text=\""+title+"\""
+        if extraText!="":
             extraText = extraText.replace("\n", "\\n")
-            cmd += " extraText=\"" + str(extraText) + "\""
-        if yPos != "":
-            cmd += " yPos=" + str(yPos)
-        if type != "":
-            cmd += " type=" + str(annotationType)
-        if annotationColor != "":
-            cmd += " colour=" + str(annotationColor)
-        if titleColor != "":
-            cmd += " textColour=" + str(titleColor)
-        if timeFormat != "":
-            cmd += " timeFormat=" + str(timeFormat)
+            cmd+=" extraText=\"" +str(extraText)+"\""
+        if yPos!= "":
+            cmd+=" yPos="+str(yPos)
+        if type!="":
+            cmd+=" type="+ str(annotationType)
+        if annotationColor!="":
+            cmd+=" colour="+str(annotationColor)
+        if titleColor!="":
+            cmd+=" textColour="+str(titleColor)
+        if timeFormat!="":
+            cmd+=" timeFormat="+str(timeFormat)
 
         return self.connectionObj.qps.sendCmdVerbose(cmd)
 
+
     def addComment(self, title, commentTime=0, extraText="", yPos="", titleColor="", commentColor="", annotationType="",
                    annotationGroup="", timeFormat="unix"):
         # Comments are just annotations that do not affect the statistics grid.
@@ -287,8 +277,7 @@ class quarchStream:
                                   titleColor=titleColor, annotationColor=commentColor, annotationType=annotationType,
                                   annotationGroup=annotationGroup, timeFormat=timeFormat)
 
-    def saveCSV(self, filePath, linesPerFile=None, cr=None, delimiter=None, timeout=60, pollTillComplete=False,
-                checkInterval=0.5):
+    def saveCSV(self, filePath, linesPerFile=None, cr=None, delimiter=None, timeout=60):
         """
             Saves the stream to csv file at specified location
 
@@ -322,12 +311,6 @@ class quarchStream:
         if delimiter != None:
             args += " -s" + delimiter
 
-        # if pollTillComplete:
-        #     is_exporting = check_export_status(self.get_stream_export_status())
-        #     while is_exporting:
-        #         is_exporting = check_export_status(self.get_stream_export_status())
-        #         time.sleep(checkInterval)
-
         # , filePath, linesPerFile, cr, delimiter
         return self.connectionObj.qps.sendCmdVerbose("$save csv \"" + filePath + "\" " + args, timeout=timeout)
 
@@ -353,22 +336,17 @@ class quarchStream:
     def channels(self):
         return self.connectionObj.qps.sendCmdVerbose("$channels").splitlines()
 
-    def stopStream(self, pollTillComplete=False, checkInterval=0.5):
-        # Stop the stream
-        response = self.connectionObj.qps.sendCmdVerbose("$stop stream")
-        # Poll till stream has completed if required
-        if pollTillComplete:
-            # Get the current stream status
-            streamState = self.getStreamState().lower()
-            # Verify the stream stopped correctly
-            # response = check_stream_stopped_status(streamState)
-            # while "running" in streamState:
-            #     logging.debug("Stream buffer still emptying: " + streamState)
-            #     streamState = self.getStreamState().lower()
-            #     response = check_stream_stopped_status(streamState)
-            #     time.sleep(checkInterval)
+    def stopStream(self):
+        return self.connectionObj.qps.sendCmdVerbose("$stop stream")
 
-        return response
+    def stopStreamAndAllowBufferToEmpty(self, checkInterval=0.5):
+        self.stopStream()
+        streamState = self.getStreamState().lower()
+        while "running" in streamState:
+            logging.debug("Stream buffer still emptying: " + streamState)
+            time.sleep(checkInterval)
+            streamState = self.getStreamState().lower()
+        logging.debug("QPS no longer Streaming: " + streamState)
 
     def hideAllDefaultChannels(self):
 
@@ -409,13 +387,7 @@ class quarchStream:
         else:
             dataPointTime = int(dataPointTime)
         logging.warning("$stream data add " + channelName + " " + groupName + " " + str(dataPointTime) + " " + str(
-            dataValue) + " " + timeFormat)
+                dataValue) + " " + timeFormat)
         self.connectionObj.qps.sendCmdVerbose(
             "$stream data add " + channelName + " " + groupName + " " + str(dataPointTime) + " " + str(
                 dataValue) + " " + timeFormat)
-
-    def get_stream_export_status(self):
-        return self.connectionObj.qps.sendCmdVerbose("$stream export status")
-
-    def get_stats_export_status(self):
-        return self.connectionObj.qps.sendCmdVerbose("$stream stats export status")

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/fio/FIO_interface.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 import os
 import time
 import json