PyPI - quarchpy - Versions diffs - 2.1.24.dev5__py2.py3-none-any.whl → 2.1.26__py2.py3-none-any.whl - Mend

quarchpy 2.1.24.dev5py2.py3-none-any.whl → 2.1.26py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (124) hide show

quarchpy/docs/_build/html/source/licenses.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>LICENSES &#8212; quarchpy  documentation</title>
-    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=61cd365c" />
-    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=12dfc556" />
+    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b3523f8e" />
+    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=039e1c02" />
     <script src="../_static/documentation_options.js?v=5929fcd5"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
@@ -17,9 +17,8 @@
   <link rel="stylesheet" href="../_static/custom.css" type="text/css" />
+  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
   </head><body>
@@ -164,11 +163,11 @@ License Identifiers that are here available: <a class="reference external" href=
       <div class="clearer"></div>
     </div>
     <div class="footer">
-      &#169;2020, Quarch Technology Ltd.
+      &copy;2020, Quarch Technology Ltd.
       |
-      Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.2.6</a>
-      &amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
+      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.13</a>
       |
       <a href="../_sources/source/licenses.rst.txt"

quarchpy/docs/_build/html/source/quarchpy.connection_specific.html CHANGED Viewed

@@ -370,6 +370,16 @@ Current implementation assumes only 1 of each data file are made.</p>
 <span class="sig-name descname"><span class="pre">getDeviceList</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">scan</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">ipAddress</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.connection_specific.connection_QPS.QpsInterface.getDeviceList" title="Link to this definition">¶</a></dt>
 <dd></dd></dl>
+<dl class="py method">
+<dt class="sig sig-object py" id="quarchpy.connection_specific.connection_QPS.QpsInterface.get_list_details">
+<span class="sig-name descname"><span class="pre">get_list_details</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">sock</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.connection_specific.connection_QPS.QpsInterface.get_list_details" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+<dl class="py method">
+<dt class="sig sig-object py" id="quarchpy.connection_specific.connection_QPS.QpsInterface.open_recording">
+<span class="sig-name descname"><span class="pre">open_recording</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">file_path</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">cmdTimeout</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">5</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">pollInterval</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">3</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">startOpenTimout</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">5</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.connection_specific.connection_QPS.QpsInterface.open_recording" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
 <dl class="py method">
 <dt class="sig sig-object py" id="quarchpy.connection_specific.connection_QPS.QpsInterface.recv">
 <span class="sig-name descname"><span class="pre">recv</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.connection_specific.connection_QPS.QpsInterface.recv" title="Link to this definition">¶</a></dt>

quarchpy/docs/_build/html/source/quarchpy.device.html CHANGED Viewed

@@ -578,7 +578,7 @@ Defaults to “USB”, “TCP”, “SERIAL”, “REST”, “TELNET” in that
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.device.scanDevices.scan_mDNS">
-<span class="sig-prename descclassname"><span class="pre">quarchpy.device.scanDevices.</span></span><span class="sig-name descname"><span class="pre">scan_mDNS</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">mdnsListener</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.device.scanDevices.scan_mDNS" title="Link to this definition">¶</a></dt>
+<span class="sig-prename descclassname"><span class="pre">quarchpy.device.scanDevices.</span></span><span class="sig-name descname"><span class="pre">scan_mDNS</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">mdnsListener</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">zeroconf</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.device.scanDevices.scan_mDNS" title="Link to this definition">¶</a></dt>
 <dd></dd></dl>
 <dl class="py function">

quarchpy/docs/_build/html/source/quarchpy.html CHANGED Viewed

@@ -393,6 +393,8 @@
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.connect"><code class="docutils literal notranslate"><span class="pre">QpsInterface.connect()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.disconnect"><code class="docutils literal notranslate"><span class="pre">QpsInterface.disconnect()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.getDeviceList"><code class="docutils literal notranslate"><span class="pre">QpsInterface.getDeviceList()</span></code></a></li>
+<li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.get_list_details"><code class="docutils literal notranslate"><span class="pre">QpsInterface.get_list_details()</span></code></a></li>
+<li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.open_recording"><code class="docutils literal notranslate"><span class="pre">QpsInterface.open_recording()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.recv"><code class="docutils literal notranslate"><span class="pre">QpsInterface.recv()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.scanIP"><code class="docutils literal notranslate"><span class="pre">QpsInterface.scanIP()</span></code></a></li>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.connection_specific.html#quarchpy.connection_specific.connection_QPS.QpsInterface.send"><code class="docutils literal notranslate"><span class="pre">QpsInterface.send()</span></code></a></li>

quarchpy/docs/_build/html/source/quarchpy.iometer.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>quarchpy.iometer package &#8212; quarchpy  documentation</title>
-    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=61cd365c" />
-    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=12dfc556" />
+    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b3523f8e" />
+    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=039e1c02" />
     <script src="../_static/documentation_options.js?v=5929fcd5"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
@@ -18,9 +18,8 @@
   <link rel="stylesheet" href="../_static/custom.css" type="text/css" />
+  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
   </head><body>
@@ -254,11 +253,11 @@ Reads the data into a dictionary</p>
       <div class="clearer"></div>
     </div>
     <div class="footer">
-      &#169;2020, Quarch Technology Ltd.
+      &copy;2020, Quarch Technology Ltd.
       |
-      Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.2.6</a>
-      &amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
+      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.13</a>
       |
       <a href="../_sources/source/quarchpy.iometer.rst.txt"

quarchpy/docs/_build/html/source/quarchpy.qps.html CHANGED Viewed

@@ -51,7 +51,7 @@
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.qps.qpsFuncs.isQpsRunning">
 <span class="sig-prename descclassname"><span class="pre">quarchpy.qps.qpsFuncs.</span></span><span class="sig-name descname"><span class="pre">isQpsRunning</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">host</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'127.0.0.1'</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">port</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">9822</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">timeout</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">0</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.qpsFuncs.isQpsRunning" title="Link to this definition">¶</a></dt>
-<dd><p>This func will return true if QPS is running with a working QIS connection. This is becuase</p>
+<dd><p>This func will return true if QPS is running with a working QIS connection.</p>
 </dd></dl>
 <dl class="py function">
@@ -110,7 +110,7 @@ Assumes</p>
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.qps.isQpsRunning">
 <span class="sig-prename descclassname"><span class="pre">quarchpy.qps.</span></span><span class="sig-name descname"><span class="pre">isQpsRunning</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">host</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'127.0.0.1'</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">port</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">9822</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">timeout</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">0</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.isQpsRunning" title="Link to this definition">¶</a></dt>
-<dd><p>This func will return true if QPS is running with a working QIS connection. This is becuase</p>
+<dd><p>This func will return true if QPS is running with a working QIS connection.</p>
 </dd></dl>
 <dl class="py attribute">

quarchpy/docs/_build/html/source/quarchpy.utilities.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>quarchpy.utilities package &#8212; quarchpy  documentation</title>
-    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=61cd365c" />
-    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=12dfc556" />
+    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b3523f8e" />
+    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=039e1c02" />
     <script src="../_static/documentation_options.js?v=5929fcd5"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
@@ -18,9 +18,8 @@
   <link rel="stylesheet" href="../_static/custom.css" type="text/css" />
+  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
   </head><body>
@@ -194,11 +193,11 @@ on the reporting of the results.</p>
       <div class="clearer"></div>
     </div>
     <div class="footer">
-      &#169;2020, Quarch Technology Ltd.
+      &copy;2020, Quarch Technology Ltd.
       |
-      Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.2.6</a>
-      &amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
+      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.13</a>
       |
       <a href="../_sources/source/quarchpy.utilities.rst.txt"

quarchpy/docs/_build/html/source/readme.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Quarchpy - Readme &#8212; quarchpy  documentation</title>
-    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=61cd365c" />
-    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=12dfc556" />
+    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b3523f8e" />
+    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=039e1c02" />
     <script src="../_static/documentation_options.js?v=5929fcd5"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
@@ -18,9 +18,8 @@
   <link rel="stylesheet" href="../_static/custom.css" type="text/css" />
+  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
   </head><body>
@@ -130,11 +129,11 @@
       <div class="clearer"></div>
     </div>
     <div class="footer">
-      &#169;2020, Quarch Technology Ltd.
+      &copy;2020, Quarch Technology Ltd.
       |
-      Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.2.6</a>
-      &amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
+      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.13</a>
       |
       <a href="../_sources/source/readme.rst.txt"

quarchpy/fio/__pycache__/FIO_interface.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/fio/__pycache__/__init__.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/iometer/__pycache__/__init__.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/iometer/__pycache__/gen_iometer_template.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/iometer/__pycache__/iometerFuncs.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/qis/__pycache__/StreamHeaderInfo.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/qis/__pycache__/__init__.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/qis/__pycache__/qisFuncs.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/qps/__pycache__/__init__.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/qps/__pycache__/qpsFuncs.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/qps/qpsFuncs.py CHANGED Viewed

@@ -14,7 +14,7 @@ import logging
 def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
     '''
-    This func will return true if QPS is running with a working QIS connection. This is becuase
+    This func will return true if QPS is running with a working QIS connection.
     '''
     myQps=None
     logging.debug("Checking if QPS is running")
@@ -73,10 +73,11 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     if keepQisRunning:
         if not isQisRunning():
             startLocalQis()
-    # if startQPSMinimised == True: #TODO add to release for QPS 1.38
-    #     args.append("CCS=MIN")
     temp =""
     args = temp.join(args)
+    if startQPSMinimised == True: #TODO add to release for QPS 1.38
+        if "-ccs=" not in args.lower():
+            args +=" -ccs=MIN"
     QpsPath = os.path.dirname(os.path.abspath(__file__))
     QpsPath, junk = os.path.split(QpsPath)
@@ -93,16 +94,25 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
         else:
             process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True)
-    startTime = time.time()
-    while not isQpsRunning():
-        time.sleep(0.2)
-        _get_std_msg_and_err_from_QPS_process(process)
+        startTime = time.time()
+        while not isQpsRunning():
+            time.sleep(0.2)
+            _get_std_msg_and_err_from_QPS_process(process)
+            if time.time() - startTime > timeout:
+                os.chdir(current_dir)
+                raise TimeoutError("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
+        logging.debug("QPS detected after " + str(time.time() - startTime) + "s")
+        while not isQisRunning():
+            if time.time() - startTime > timeout:
+                raise TimeoutError(
+                    "QPS did launch but QIS did not respond during the timeout time of " + str(timeout) + " sec.")
+            time.sleep(0.2)
+        logging.debug("QIS detected after " + str(time.time() - startTime) + "s")
-        if time.time() - startTime > timeout:
-            os.chdir(current_dir)
-            raise TimeoutError("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
     # return current working directory
     os.chdir(current_dir)
+    return
 def reader(stream, q, source, lock,stop_flag):
     '''

quarchpy/qps/qpsFuncs.py.bak ADDED Viewed

@@ -0,0 +1,281 @@
+from threading import Thread, Lock, Event, active_count
+from queue import Queue, Empty
+import time
+import os, sys
+import datetime
+import platform
+from quarchpy.qis import isQisRunning, startLocalQis
+from quarchpy.connection_specific.connection_QIS import QisInterface
+from quarchpy.connection_specific.connection_QPS import QpsInterface
+from quarchpy.user_interface import *
+import subprocess
+import logging
+def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
+    '''
+    This func will return true if QPS is running with a working QIS connection.
+    '''
+    myQps=None
+    logging.debug("Checking if QPS is running")
+    start = time.time()
+    while True:
+        try:
+            myQps = QpsInterface(host, port)
+            break
+        except Exception as e:
+            logging.debug("Error when making QPS interface. QPS may not be running.")
+            logging.debug(e)
+            if (time.time() - start) > timeout:
+                break
+    if myQps is None:
+        logging.debug("QPS is not running")
+        return False
+    logging.debug("Checking if QPS reports a QIS connection") # "$qis status" returns connected if it has ever had a QIS connection.
+    answer=0
+    counter=0
+    while True:
+        answer = myQps.sendCmdVerbose(cmd="$qis status")
+        if answer.lower()=="connected":
+            logging.debug("QPS Running With QIS Connected")
+            break
+        else:
+            logging.debug("QPS Running QIS NOT found. Waiting and retrying.")
+            time.sleep(0.5)
+            counter += 1
+            if counter > 5:
+                logging.debug("QPS Running QIS NOT found after "+str(counter)+" attempts.")
+                return False
+    logging.debug("Checking if QPS/QIS comms are running")
+    start = time.time()
+    while True:
+        try:
+            answer = myQps.sendCmdVerbose(cmd="$list")
+            break
+        except:
+            pass
+        if (time.time() - start) > timeout:
+            break
+    # check for a 1 showing the first module to be displayed, or a no module/device error message.
+    if answer[0] == "1" or "no device" in str(answer).lower() or "no module" in str(answer).lower():
+        logging.debug("QPS and QIS are running and responding with valid $list info")
+        return True
+    else:
+        logging.debug("QPS did not return expected output from $list")
+        logging.debug("$list: " + str(answer))
+        return False
+def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=True):
+    if keepQisRunning:
+        if not isQisRunning():
+            startLocalQis()
+    if startQPSMinimised == True: #TODO add to release for QPS 1.38
+        args.append("CCS=MIN")
+    temp =""
+    args = temp.join(args)
+    QpsPath = os.path.dirname(os.path.abspath(__file__))
+    QpsPath, junk = os.path.split(QpsPath)
+    QpsPath = os.path.join(QpsPath, "connection_specific", "QPS", "qps.jar")
+    current_dir = os.getcwd()
+    os.chdir(os.path.dirname(QpsPath))
+    command = "java -jar \"" + QpsPath + "\"" + " " + 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.
+        os.system(command)
+    else:
+        if sys.version_info[0] < 3:
+            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        else:
+            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True)
+        startTime = time.time()
+        while not isQpsRunning():
+            time.sleep(0.2)
+            _get_std_msg_and_err_from_QPS_process(process)
+            if time.time() - startTime > timeout:
+                os.chdir(current_dir)
+                raise TimeoutError("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
+        logging.debug("QPS detected after " + str(time.time() - startTime) + "s")
+        while not isQisRunning():
+            if time.time() - startTime > timeout:
+                raise TimeoutError(
+                    "QPS did launch but QIS did not respond during the timeout time of " + str(timeout) + " sec.")
+            time.sleep(0.2)
+        logging.debug("QIS detected after " + str(time.time() - startTime) + "s")
+    # return current working directory
+    os.chdir(current_dir)
+    return
+def reader(stream, q, source, lock,stop_flag):
+    '''
+    Used to read output and place it in a queue for multithreaded reading
+    :param stream:
+    :param q:
+    :param source:
+    :param lock: The lock for the queue
+    :param stop_flag: Flag to exit the loop and close the thread
+    :return: None
+    '''
+    while not stop_flag.is_set():
+        line = stream.readline()
+        if not line:
+            break
+        with lock:
+            q.put((source, line.strip()))
+def _get_std_msg_and_err_from_QPS_process(process):
+    '''
+    Uses multithreading to check for stderr and stdmsg passed by the process that launches QPS
+    This allows the user to understand why QPS might not have appeared.
+    :param process: The Process Used to launch QPS
+    :return: None
+    '''
+    # Read back stdmsg and stderr in seperate threads so they are non blocking
+    q = Queue()
+    lock = Lock()
+    stop_flag = Event()
+    t1 = Thread(target=reader, args=[process.stdout, q, 'stdout', lock, stop_flag])
+    t2 = Thread(target=reader, args=[process.stderr, q, 'stderr', lock, stop_flag])
+    t1.start()
+    t2.start()
+    counter = 0
+    # check for stderr or stdmsg from the queue
+    while counter <= 3: # If 3 empty reads from the queue then move on to see if QPS is running.
+        try:
+            source, line = q.get(timeout=1)  # Wait for 1 second for new lines
+            counter = 0
+            if source == "stderr":
+                logging.error(f"{source}: {line}")
+            else:
+                printText(f"{source}: {line}")
+        except Empty:
+            counter += 1
+    stop_flag.set() #Close the threads and return to the main loop where QPS is check to see if its started yet
+def closeQps(host='127.0.0.1', port=9822):
+    myQps = QpsInterface(host, port)
+    myQps.sendCmdVerbose("$shutdown")
+    del myQps
+    time.sleep(1) #needed as calling "isQpsRunning()" will throw an error if it ties to connect while shutdown is in progress.
+def GetQpsModuleSelection(QpsConnection, favouriteOnly=True, additionalOptions=['rescan', 'all con types', 'ip scan'], scan=True):
+    favourite = favouriteOnly
+    ip_address = None
+    while True:
+        printText("QPS scanning for devices")
+        tableHeaders = ["Module"]
+        # Request a list of all USB and LAN accessible power modules
+        if ip_address == None:
+            devList = QpsConnection.getDeviceList(scan=scan)
+        else:
+            devList = QpsConnection.getDeviceList(scan=scan, ipAddress=ip_address)
+        if "no device" in devList[0].lower() or "no module" in devList[0].lower():
+            favourite = False  # If no device found conPref wont match and will bugout
+        # Removes rest devices
+        devList = [x for x in devList if "rest" not in x]
+        message = "Select a quarch module"
+        if (favourite):
+            index = 0
+            sortedDevList = []
+            conPref = ["USB", "TCP", "SERIAL", "REST", "TELNET"]
+            while len(sortedDevList) != len(devList):
+                for device in devList:
+                    if conPref[index] in device.upper():
+                        sortedDevList.append(device)
+                index += 1
+            devList = sortedDevList
+            # new dictionary only containing one favourite connection to each device.
+            favConDevList = []
+            index = 0
+            for device in sortedDevList:
+                if (favConDevList == [] or not device.split("::")[1] in str(favConDevList)):
+                    favConDevList.append(device)
+            devList = favConDevList
+        if User_interface.instance != None and User_interface.instance.selectedInterface == "testcenter":
+            tempString = ""
+            for module in devList:
+                tempString+=module+"="+module+","
+            devList = tempString[0:-1]
+        myDeviceID = listSelection(title=message, message=message, selectionList=devList,
+                                   additionalOptions=additionalOptions, nice=True, tableHeaders=tableHeaders, indexReq=True)
+        if myDeviceID in 'rescan':
+            ip_address = None
+            favourite = True
+            continue
+        elif myDeviceID in 'all con types':
+            printText('Displaying all conection types...')
+            favourite = False
+            continue
+        elif myDeviceID in 'ip scan':
+            ip_address = requestDialog("Please input IP Address of the module you would like to connect to: ")
+            favourite = False
+            continue
+        else:
+            return myDeviceID
+'''
+Legacy function to handle old scripts which call an adjustTime function to get QPS format time.
+This is now done in the QPS module level, so this function returns a integer linux millisecond value
+as per the old one
+'''
+def legacyAdjustTime(timestamp):
+    return timestamp
+'''
+Simple function to convert a timestamp or Python datetime object into QPS format time
+QPS requires time in mS with no decimal point, so this is converted here
+'''
+def toQpsTimeStamp(timestamp):
+    """
+    DEPRECATED - QPS expects time passed as a string and error handling is done in QPS.
+    Returns the parameter passed as a valid qps timestamp
+    Assumes
+    # 1620817118182 - ACCEPTED value for QPS    - Milliseconds, 13 chars
+    # 1620817126    - time.time() Value         - Seconds
+    :param int/float/datetime: Timestamp, mS
+    :return: int             : QPS valid time, mS
+    """
+    # Python datetime object
+    if (type(timestamp) is datetime):
+        newTime = time.mktime(timestamp.timetuple())
+        return int(newTime * 1000)
+    # If numeric, assume standard unix time in milliseconds
+    elif (type(timestamp) is float or type(timestamp) is int):
+        return int(timestamp)
+    else:
+        # Try if its a numeric value string first (assumed to be milliseconds)
+        try:
+            timestamp = float(timestamp)
+            return int(timestamp)
+        # Fall back to assuming a standard format time string
+        except:
+            newTime = time.mktime(datetime.datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S:%f").timetuple())
+            return int(newTime * 1000)

quarchpy/user_interface/__pycache__/__init__.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/user_interface/__pycache__/user_interface.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/user_interface/user_interface.py CHANGED Viewed

@@ -292,13 +292,15 @@ printProgressBar (iteration,total,prefix='',suffix='',decimals=1,length=100,fill
 '''
 def progressBar(iteration, total, prefix='', suffix='', decimals=1, fill='█', fullWidth=100):
+    iteration = float(iteration)
+    total = float(total)
     if iteration >= 0 and total > 0:
         if User_interface.instance != None and User_interface.instance.selectedInterface == "testcenter":
             TestCenter.testPoint ("Quarch_Host.ShowTaskProgress","Title=Task Progress", "Iteration="+str(int(iteration)), "Total="+str(int(total)), stack_level=2);
         else:
-            percent = ("{0:." + str(decimals) + "f}").format(100 * (iteration / float(total)))
+            percent = ("{0:." + str(decimals) + "f}").format(100 * (iteration / total))
             length = fullWidth - (len(prefix)+len(suffix)+len(percent) +4) #the length of the bar must scale acording to anything else on the line
             filledLength = int(length * iteration // total)

quarchpy/utilities/__pycache__/TestCenter.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/utilities/__pycache__/TimeValue.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/utilities/__pycache__/Version.cpython-311.pyc ADDED Viewed

Binary file

quarchpy/utilities/__pycache__/__init__.cpython-311.pyc ADDED Viewed

Binary file

quarchpy 2.1.24.dev5__py2.py3-none-any.whl → 2.1.26__py2.py3-none-any.whl

quarchpy 2.1.24.dev5py2.py3-none-any.whl → 2.1.26py2.py3-none-any.whl