quarchpy 2.1.14.dev3__py2.py3-none-any.whl → 2.1.14.dev5__py2.py3-none-any.whl

quarchpy/.idea/.name

@@ -0,0 +1 @@
+qpsFuncs.py

quarchpy/.idea/workspace.xml

@@ -22,18 +22,18 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "last_opened_file_path": "C:/Users/sboon/AppData/Roaming/JetBrains/PyCharmCE2023.1/scratches",
-    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/sboon/AppData/Roaming/JetBrains/PyCharmCE2023.1/scratches&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;
   },
-  "keyToStringList": {
-    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
-      "Python"
+  &quot;keyToStringList&quot;: {
+    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
+      &quot;Python&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="PyConsoleOptionsProvider">
     <option name="myPythonConsoleState">
       <console-settings module-name="quarchpy" is-module-sdk="true">
@@ -50,7 +50,7 @@
       <recent name="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.scratch">
+  <component name="RunManager" selected="Python.qpsFuncs">
     <configuration name="SystemTest" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="quarchpy" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -93,6 +93,48 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="qisFuncs" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="quarchpy" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/qis" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/qis/qisFuncs.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <configuration name="qpsFuncs" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="quarchpy" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/qps" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/qps/qpsFuncs.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="scratch" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="quarchpy" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -116,6 +158,8 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.qpsFuncs" />
+        <item itemvalue="Python.qisFuncs" />
         <item itemvalue="Python.scratch" />
         <item itemvalue="Python._version" />
         <item itemvalue="Python.SystemTest" />
@@ -147,7 +191,7 @@
           <option name="timeStamp" value="8" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://C:/Python311/Lib/site-packages/quarchpy/device/quarchPPM.py</url>
+          <url>file://$PROJECT_DIR$/../../../../../../Python311/Lib/site-packages/quarchpy/device/quarchPPM.py</url>
           <line>31</line>
           <option name="timeStamp" value="10" />
         </line-breakpoint>
@@ -166,6 +210,21 @@
           <line>1592</line>
           <option name="timeStamp" value="16" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/qis/qisFuncs.py</url>
+          <line>85</line>
+          <option name="timeStamp" value="18" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/qis/qisFuncs.py</url>
+          <line>106</line>
+          <option name="timeStamp" value="21" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/qps/qpsFuncs.py</url>
+          <line>82</line>
+          <option name="timeStamp" value="22" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.1.14.dev3"
+__version__ = "2.1.14.dev5"

quarchpy/_version.py.bak

@@ -0,0 +1 @@
+__version__ = "2.1.14.dev4"

quarchpy/connection_specific/connection_QIS.py

@@ -269,7 +269,7 @@ class QisInterface:
         isRun = True
         while isRun:
             try:
-                with open(fileName, 'ab') as f:
+                with open(fileName, 'a', newline='') as f: #changed from ab to a as all data should be in string format now regardless of py2 or py3
                     # Until the event threadRunEvent is set externally to this thread,
                     # loop and read from the stream
                     i = self.deviceMulti(module)
@@ -310,6 +310,7 @@ class QisInterface:
 
                                         # if the last entry is still within the required stream length, write the whole lot
                                         if int(lastTime) < int(streamDuration/(10**baseSampleUnitExponent)): # < rather than <= because we start at 0
+                                            newStripes = newStripes.replace(' ', separator)
                                             f.write(newStripes[:removeChar])
                                             if inMemoryData is not None:
                                                 inMemoryData.write(newStripes[:removeChar])
@@ -319,13 +320,15 @@ class QisInterface:
                                             for thisLine in newStripes.splitlines()[:-2]:
                                                 lastTime = thisLine.split(separator)[0]
                                                 if int(lastTime) < int(streamDuration/(10**baseSampleUnitExponent)):
-                                                    f.write(thisLine + b'\r' + b'\n')  # Put the CR back on the end
+                                                    f.write(thisLine + '\r\n')  # Put the CR back on the end
                                                     if inMemoryData is not None:
-                                                        inMemoryData.write(thisLine + b'\r' + b'\n')
+                                                        inMemoryData.write(thisLine + '\r\n')
                                                 else:
                                                     streamComplete = True
                                                     break
                                     else:
+                                        newStripes = newStripes.replace(' ', separator)
+                                        print("TEMP DEBUG2: " + newStripes[:removeChar])
                                         f.write(newStripes[:removeChar])
                                         if inMemoryData is not None:
                                             inMemoryData.write(newStripes[:removeChar])
@@ -590,7 +593,7 @@ class QisInterface:
                 continue
             with open(os.path.join(self.qps_record_dir_path, "data000",
                                    "data000_00" + index - 1 + "_000000000"),
-                      "ab") as file1:
+                      "a") as file1:#changed from ab to a as all data should be in string format now regardless of py2 or py3
 
                 x = struct.pack(">d", int(item))
                 # logging.debug(item, x)
@@ -613,7 +616,7 @@ class QisInterface:
 
                     with open(os.path.join(self.qps_record_dir_path, "data000",
                                            "data000_"+x+"_000000000"),
-                              "ab") as file1:
+                              "a") as file1:#changed from ab to a as all data should be in string format now regardless of py2 or py3
                         x = struct.pack(">d", int(stripe[counter]))
                         # logging.debug(item, x)
                         file1.write(x)
@@ -621,7 +624,7 @@ class QisInterface:
                     # Write all in group 1 to digital
                     with open(os.path.join(self.qps_record_dir_path, "data101",
                                            "data101_"+x+"_000000000"),
-                              "ab") as file1:
+                              "a") as file1:#changed from ab to a as all data should be in string format now regardless of py2 or py3
                         x = struct.pack(">d", int(stripe[counter]))
                         # logging.debug(item, x)
                         file1.write(x)
@@ -1605,7 +1608,16 @@ class QisInterface:
             # Error Check / validate response
             if len(res) == 0:
                 #logging.error("Empty response from QIS.")
-                raise (Exception("Empty response from QIS. Sent: " +sentText))
+                self.sendText(sock, "stream?", device)
+                res = self.receiveText(sock)
+                if len(res) != 0:
+                    self.sendText(sock, sentText, device)
+                    res = self.receiveText(sock)
+                    if len(res) == 0:
+                        raise (Exception("Empty response from QIS. Sent: " + sentText))
+                else:
+                    raise (Exception("Empty response from QIS. Sent: " + sentText))
+
             if res[0] == self.cursor:
                 logging.warning('Only Returned Cursor!!!!!')
             if 'Create Socket Fail' == res[0]: # If create socked fail (between QIS and tcp/ip module)
@@ -1646,8 +1658,9 @@ class QisInterface:
     # Send text to QIS, don't read it's response
     # The objects connection needs to be opened (connect()) before this is used
         if device != '':
-            specialTimeout =  '%500000'
-            message = device + specialTimeout +  ' ' + message
+            #specialTimeout =  '%500000'
+            #message = device +  ' ' + specialTimeout +  ' ' + message
+            message = device + ' ' + message
             #printText('Sending: "' + message + '" ' + self.host + ':' + str(self.port))
 
         if self.pythonVersion == 2:

quarchpy/connection_specific/connection_QIS.py.bak

@@ -229,7 +229,8 @@ class QisInterface:
                 formatHeader = self.streamHeaderFormat(device=module, sock=self.streamSock)
                 formatHeader = formatHeader.replace(", ", separator)
                 f.write(formatHeader + '\n')
-                inMemoryData.write(formatHeader + '\n')
+                if inMemoryData is not None:
+                    inMemoryData.write(formatHeader + '\n')
 
         numStripesPerRead = 4096
         maxFileExceeded = False
@@ -268,7 +269,7 @@ class QisInterface:
         isRun = True
         while isRun:
             try:
-                with open(fileName, 'ab') as f:
+                with open(fileName, 'a') as f: #changed from ab to a as all data should be in string format now regardless of py2 or py3
                     # Until the event threadRunEvent is set externally to this thread,
                     # loop and read from the stream
                     i = self.deviceMulti(module)
@@ -310,7 +311,8 @@ class QisInterface:
                                         # if the last entry is still within the required stream length, write the whole lot
                                         if int(lastTime) < int(streamDuration/(10**baseSampleUnitExponent)): # < rather than <= because we start at 0
                                             f.write(newStripes[:removeChar])
-                                            inMemoryData.write(newStripes[:removeChar])
+                                            if inMemoryData is not None:
+                                                inMemoryData.write(newStripes[:removeChar])
 
                                         # else write each line individually until we have reached the desired endpoint
                                         else:
@@ -318,13 +320,16 @@ class QisInterface:
                                                 lastTime = thisLine.split(separator)[0]
                                                 if int(lastTime) < int(streamDuration/(10**baseSampleUnitExponent)):
                                                     f.write(thisLine + b'\r' + b'\n')  # Put the CR back on the end
-                                                    inMemoryData.write(thisLine + b'\r' + b'\n')
+                                                    if inMemoryData is not None:
+                                                        inMemoryData.write(thisLine + b'\r' + b'\n')
                                                 else:
                                                     streamComplete = True
                                                     break
                                     else:
+                                        print("TEMP DEBUG: "+newStripes[:removeChar])
                                         f.write(newStripes[:removeChar])
-                                        inMemoryData.write(newStripes[:removeChar])
+                                        if inMemoryData is not None:
+                                            inMemoryData.write(newStripes[:removeChar])
 
                             else:
                                 maxFileExceeded = True
@@ -332,8 +337,9 @@ class QisInterface:
                                 maxFileStatus = self.streamBufferStatus(device=module, sock=self.streamSock)
                                 f.write('Warning: Max file size exceeded before end of stream.\n')
                                 f.write('Unrecorded stripes in buffer when file full: ' + maxFileStatus + '.')
-                                inMemoryData.write('Warning: Max file size exceeded before end of stream.\n')
-                                inMemoryData.write('Unrecorded stripes in buffer when file full: ' + maxFileStatus + '.')
+                                if inMemoryData is not None:
+                                    inMemoryData.write('Warning: Max file size exceeded before end of stream.\n')
+                                    inMemoryData.write('Unrecorded stripes in buffer when file full: ' + maxFileStatus + '.')
                                 self.deviceDict[module][0:3] = [True, 'Stopped', 'User defined max filesize reached']
                                 break
                         else:
@@ -383,7 +389,8 @@ class QisInterface:
                                     else:
                                         newStripes = newStripes.replace(' ',separator)
                                         f.write(newStripes[:removeChar])
-                                        inMemoryData.write(newStripes[:removeChar])
+                                        if inMemoryData is not None:
+                                            inMemoryData.write(newStripes[:removeChar])
                             else:
                                 if not maxFileExceeded:
                                     maxFileStatus = self.streamBufferStatus(device=module,  sock=self.streamSock)
@@ -398,8 +405,9 @@ class QisInterface:
                         if maxFileExceeded:
                             f.write(b'Warning: Max file size exceeded before end of stream.\n')
                             f.write(b'Unrecorded stripes in buffer when file full: ' + maxFileStatus + '.')
-                            inMemoryData.write(b'Warning: Max file size exceeded before end of stream.\n')
-                            inMemoryData.write(b'Unrecorded stripes in buffer when file full: ' + maxFileStatus + '.')
+                            if inMemoryData is not None:
+                                inMemoryData.write(b'Warning: Max file size exceeded before end of stream.\n')
+                                inMemoryData.write(b'Unrecorded stripes in buffer when file full: ' + maxFileStatus + '.')
                             logging.warning('Max file size exceeded. Some data has not been saved to file: ' + maxFileStatus + '.')
 
                     #printText('Stripes in buffer now: ' + self.streamBufferStatus(device=module, sock=self.streamSock))
@@ -583,7 +591,7 @@ class QisInterface:
                 continue
             with open(os.path.join(self.qps_record_dir_path, "data000",
                                    "data000_00" + index - 1 + "_000000000"),
-                      "ab") as file1:
+                      "a") as file1:#changed from ab to a as all data should be in string format now regardless of py2 or py3
 
                 x = struct.pack(">d", int(item))
                 # logging.debug(item, x)
@@ -606,7 +614,7 @@ class QisInterface:
 
                     with open(os.path.join(self.qps_record_dir_path, "data000",
                                            "data000_"+x+"_000000000"),
-                              "ab") as file1:
+                              "a") as file1:#changed from ab to a as all data should be in string format now regardless of py2 or py3
                         x = struct.pack(">d", int(stripe[counter]))
                         # logging.debug(item, x)
                         file1.write(x)
@@ -614,7 +622,7 @@ class QisInterface:
                     # Write all in group 1 to digital
                     with open(os.path.join(self.qps_record_dir_path, "data101",
                                            "data101_"+x+"_000000000"),
-                              "ab") as file1:
+                              "a") as file1:#changed from ab to a as all data should be in string format now regardless of py2 or py3
                         x = struct.pack(">d", int(stripe[counter]))
                         # logging.debug(item, x)
                         file1.write(x)
@@ -1598,7 +1606,16 @@ class QisInterface:
             # Error Check / validate response
             if len(res) == 0:
                 #logging.error("Empty response from QIS.")
-                raise (Exception("Empty response from QIS. Sent: " +sentText))
+                self.sendText(sock, "stream?", device)
+                res = self.receiveText(sock)
+                if len(res) != 0:
+                    self.sendText(sock, sentText, device)
+                    res = self.receiveText(sock)
+                    if len(res) == 0:
+                        raise (Exception("Empty response from QIS. Sent: " + sentText))
+                else:
+                    raise (Exception("Empty response from QIS. Sent: " + sentText))
+
             if res[0] == self.cursor:
                 logging.warning('Only Returned Cursor!!!!!')
             if 'Create Socket Fail' == res[0]: # If create socked fail (between QIS and tcp/ip module)
@@ -1616,7 +1633,7 @@ class QisInterface:
                     count += 1
                     if count >= maxReads:
                         raise Exception(' Count = Error: max reads exceeded before cursor returned')
-            return res #Format for py2/3 and return.
+            return res
 
         except Exception as e:
             #something went wrong during send qis cmd
@@ -1639,8 +1656,9 @@ class QisInterface:
     # Send text to QIS, don't read it's response
     # The objects connection needs to be opened (connect()) before this is used
         if device != '':
-            specialTimeout =  '%500000'
-            message = device + specialTimeout +  ' ' + message
+            #specialTimeout =  '%500000'
+            #message = device +  ' ' + specialTimeout +  ' ' + message
+            message = device + ' ' + message
             #printText('Sending: "' + message + '" ' + self.host + ':' + str(self.port))
 
         if self.pythonVersion == 2:

quarchpy/connection_specific/connection_ReST.py

@@ -1,3 +1,5 @@
+import socket
+
 try:
     import httplib as httplib
 except ImportError:
@@ -13,20 +15,28 @@ class ReSTConn:
     def close(self):
         return True
 
-    def sendCommand(self, Command, expectedResponse = True):
+    def sendCommand(self, Command, expectedResponse = True, max_retries=1):
         Command = "/" + Command.replace(" ", "%20")
-        self.Connection.request("GET", Command)
-        if expectedResponse == True:
-            R2 = self.Connection.getresponse()
-            if R2.status == 200:
-                Result = R2.read()
-                Result = Result.decode()
-                Result = Result.strip('> \t\n\r')
-                self.Connection.close()
-                return Result
-            else:
-                print ("FAIL - Please power cycle the module!")
-                self.Connection.close()
-                return "FAIL: ", R1.status, R1.reason
-        else:
-            return None
+        for attempt in range(1, max_retries + 1):
+            try:
+                self.Connection.request("GET", Command)
+                if expectedResponse == True:
+                    R2 = self.Connection.getresponse()
+                    if R2.status == 200:
+                        Result = R2.read()
+                        Result = Result.decode()
+                        Result = Result.strip('> \t\n\r')
+                        self.Connection.close()
+                        return Result
+                    else:
+                        print ("FAIL - Please power cycle the module!")
+                        self.Connection.close()
+                        return "FAIL: ", R1.status, R1.reason
+                else:
+                    return None
+            except socket.timeout as e:
+                if attempt < max_retries:
+                    print("Socket timed out, retrying command...")
+                else:
+                    print("Maximum number of retries reached. Exiting.")
+                    raise e

quarchpy/device/scanDevices.py

@@ -23,8 +23,6 @@ from quarchpy.connection_specific import connection_ReST
 from quarchpy.connection_specific.connection_mDNS import MyListener
 
 from zeroconf import ServiceBrowser, Zeroconf
-
-# TODO: bodge bodge bodge
 from quarchpy.utilities import TestCenter
 
 
@@ -508,8 +506,8 @@ def scanDevices(target_conn="all", lanTimeout=1, scanInArray=True, favouriteOnly
                         foundDevices = mergeDict(foundDevices, scanDevices)
                         myArrayControler.closeConnection()
                     except Exception as e:
-                        logging.error(e, exc_info=True)
-                        logging.warning("Cannot get serial number. Quarch device may be in use by another program.")
+                        logging.debug(e, exc_info=True)
+                        logging.debug("Cannot get serial number. Quarch device may be in use by another program.")
                         foundDevices[k] = "DEVICE IN USE"
 
     if (favouriteOnly):