PyPI - quarchpy - Versions diffs - 2.1.24.dev4__py2.py3-none-any.whl → 2.1.25__py2.py3-none-any.whl - Mend

quarchpy 2.1.24.dev4py2.py3-none-any.whl → 2.1.25py2.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 (1069) 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 CHANGED Viewed

Binary file

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

Binary file

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

Binary file

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

Binary file

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

Binary file

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

Binary file

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

Binary file

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

Binary file

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

Binary file

quarchpy/qis/qisFuncs.py CHANGED Viewed

@@ -85,73 +85,34 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         List of additional parameters to be supplied to QIS on the command line
     """
-    # java 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, "connection_specific", "jdk-j21-jres")
-    # change directory to /QPS/QIS
-    qis_path = os.path.dirname(os.path.abspath(__file__))
-    qis_path,junk = os.path.split (qis_path)
-    # OS
-    current_os = platform.system()
-    # ensure the jres folder has the required permissions
-    if current_os != "Windows":
-        subprocess.call(['chmod', '-R', '+rwx', java_path])
-    # single or multiple QPS builds for each OS
-    is_single_qps_build = True
-    if is_single_qps_build:
-        qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-    else:
-        if current_os in "Windows":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-        elif current_os in "Linux":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "lin-amd64", "qis", "qis.jar")
-        elif current_os in "Darwin":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "mac-amd64", "qis", "qis.jar")
-        else:  # default to windows
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-    os.chdir(os.path.dirname(qis_path))
+    # Gathering Vars needed to build the command
+    QisPath =os.path.dirname(os.path.abspath(__file__))
+    QisPath,junk = os.path.split (QisPath)
+    QisPath = os.path.join(QisPath, "connection_specific","QPS", "qis", "qis.jar")
     # Building the command
     # Process command prefix. Needed for headless mode, to support OSs with no system tray.
-    if headless is True or (args is not None and "-headless" in args):
-        cmd_prefix = "java -Djava.awt.headless=true"
+    if (headless == True or (args is not None and "-headless" in args)):
+        cmdPrefix = "java -Djava.awt.headless=true"
     else:
-        cmd_prefix = "java"
+        cmdPrefix = "java"
     # Process command suffix (additional standard options for QIS).
-    if terminal is True:
-        cmd_suffix = " -terminal"
+    if (terminal == True):
+        cmdSuffix = " -terminal"
     else:
-        cmd_suffix = ""
+        cmdSuffix = ""
     if args is not None:
         for option in args:
             # Avoid doubling the terminal option
-            if option == "-terminal" and terminal is True:
+            if (option == "-terminal" and terminal == True):
                 continue
             # Headless option is processed seperately as a java command
-            if option != "-headless":
-                cmd_suffix = cmd_suffix + " " + option
-    # record current working directory
-    current_dir = os.getcwd()
-    command = cmd_prefix + " -jar qis.jar" + cmd_suffix
-    # different start for different OS
-    if current_os == "Windows":
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\" + command
-    elif current_os == "Linux":
-        command = java_path + "/lin-amd64-jdk-21-jre/bin/" + command
-    elif current_os == "Darwin":
-        command = java_path + "/mac-amd64-jdk-21-jre/bin/" + command
-    else:  # default to windows
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\" + command
+            if (option != "-headless"):
+                cmdSuffix = cmdSuffix + " " + option
+    # Find file path and change directory to Qis Location
+    current_direc = os.getcwd()
+    os.chdir(os.path.dirname(QisPath))
+    command = cmdPrefix+" -jar qis.jar"+cmdSuffix
     # Use the command and check QIS has launched
     if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to view logging.
@@ -175,8 +136,8 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         else:
             logDebug("QIS running but not responding")
-    # change directory back to start directory
-    os.chdir(current_dir)
+    #change directory back to start directory
+    os.chdir(current_direc)
 def reader(stream, q, source, lock,stop_flag):
@@ -332,5 +293,4 @@ def GetQisModuleSelection (QisConnection):
         myDeviceID = None
     return myDeviceID

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

Binary file

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

Binary file

quarchpy/qps/qpsFuncs.py CHANGED Viewed

@@ -73,56 +73,19 @@ 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"
-    # Record current working directory
+    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()
-    # 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, "connection_specific", "jdk-j21-jres")
-    # Start to build the path towards qps.jar
-    qps_path = os.path.dirname(os.path.abspath(__file__))
-    qps_path, junk = os.path.split(qps_path)
-    # Check the current OS
-    current_os = platform.system()
-    # Ensure the jres folder has the required permissions
-    if current_os != "Windows":
-        subprocess.call(['chmod', '-R', '+rwx', java_path])
-    # Single or multiple QPS builds for each OS
-    is_single_qps_build = True
-    if is_single_qps_build: # One QPS to rule them all.
-        qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
-    else: # Different QPS.jar for each OS
-        if current_os in "Windows":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
-        elif current_os in "Linux":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-amd64", "qps.jar")
-        elif current_os in "Darwin":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-amd64", "qps.jar")
-        else:  # default to windows
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
-    # Change the working directory to the directory containing qps.jar
-    os.chdir(os.path.dirname(qps_path))
-    # OS dependency
-    if current_os in "Windows":
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\java -jar qps.jar " + str(args)
-    elif current_os in "Linux":
-        command = java_path + "/lin-amd64-jdk-21-jre/bin/java -jar qps.jar " + str(args)
-    elif current_os in "Darwin":
-        command = java_path + "/mac-amd64-jdk-21-jre/bin/java -jar qps.jar " + str(args)
-    else:  # default to windows
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\java -jar qps.jar " + str(args)
+    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:
@@ -135,14 +98,21 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
         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):
     '''
@@ -161,7 +131,6 @@ def reader(stream, q, source, lock,stop_flag):
         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

quarchpy 2.1.24.dev4__py2.py3-none-any.whl → 2.1.25__py2.py3-none-any.whl

quarchpy 2.1.24.dev4py2.py3-none-any.whl → 2.1.25py2.py3-none-any.whl