- updates usages of util.py:stringtoseconds to handle exceptions that are now thrown on malformed time input strings

- fixes typos in an yet unused function in artisanlib/filters.py found by new test cases
- adds messages on import/export Artisan JSON and CSV
- fixes an issue in the updated pid.py
- fixes an issue in util.py:scaleFloat2String
- adds Toper PLC machine setup
- adds some more unit tests

Author: MAKOMO

doc/help_dialogs/Script/xlsx_to_artisan_help.py

@@ -178,7 +178,7 @@ def buildpyCode(filename_in:str) -> str:
     note_table_attributes = "'width':'100%','border':'1','padding':'1','border-collapse':'collapse'"
 
     outstr = ''
-    
+
     outstr += '# This is an autogenerated file -- Do not edit'
     outstr += '\n' + '# Edit the source file in artisan/doc/help_dialogs/Input_files'
     outstr += '\n' + '# then execute artisan/doc/help_dialogs/Script/xlsx_to_artisan_help.py'
@@ -206,7 +206,7 @@ def buildpyCode(filename_in:str) -> str:
         print(ws.title, '  ', ws.max_row, 'rows  ', ws.max_column, 'columns')
 
         # hack to work around when openpyxl ws.max_row returns more rows than actual
-        num_rows = ws.max_row
+        num_rows:int = ws.max_row
         for row in ws.iter_rows(min_row=1, max_row=num_rows):
             if all(c.value is None for c in row):
                 if row[0].row == num_rows + 2:  # two empty rows signifies the end of the help sheet
@@ -264,7 +264,7 @@ def buildpyCode(filename_in:str) -> str:
     outstr += nlind + "helpstr = ''.join(strlist)"
 
     # clean any html entities that get escaped by PrettyTable in its html output
-    outstr += nlind + "return re.sub(r'&', r'&',helpstr)" + "\n"
+    outstr += nlind + "return re.sub(r'&', r'&',helpstr)" + '\n'
 
     return outstr
 

src/artisanlib/async_comm.py

@@ -6,7 +6,7 @@
 # This program or module is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as published
 # by the Free Software Foundation, either version 2 of the License, or
-# version 3 of the License, or (at your option) any later versison. It is
+# version 3 of the License, or (at your option) any later version. It is
 # provided for educational purposes and is distributed in the hope that
 # it will be useful, but WITHOUT ANY WARRANTY; without even the implied
 # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
@@ -59,7 +59,8 @@ def start_background_loop(loop:asyncio.AbstractEventLoop) -> None:
         self.__thread.start()
 
     def __del__(self) -> None:
-        self.__loop.call_soon_threadsafe(self.__loop.stop) # pyrefly: ignore[bad-argument-type]
+        if not self.__loop.is_closed():
+            self.__loop.call_soon_threadsafe(self.__loop.stop) # pyrefly: ignore[bad-argument-type] # __loop.stop() might raise exception if __loop is closed
 #        self.__thread.join()
 # WARNING: we don't join and expect the clients running on this thread to stop them
 # (using self._running) to finally get rid of this thread to prevent hangs
@@ -149,7 +150,7 @@ def __init__(self, host:str = '127.0.0.1', port:int = 8080, serial:Optional['Ser
                 disconnected_handler:Optional[Callable[[], None]] = None) -> None:
         # internals
         self._asyncLoopThread: Optional[AsyncLoopThread]       = None # the asyncio AsyncLoopThread object
-        self._write_queue: 'Optional[asyncio.Queue[bytes]]'    = None # noqa: UP037 # quotes for Python3.8 # the write_queue
+        self._write_queue:  Optional[asyncio.Queue[bytes]]     = None # noqa: UP037 # quotes for Python3.8 # the write_queue
         self._running:bool                                     = False              # while true we keep running the thread
 
         # connection

src/artisanlib/axis.py

@@ -644,26 +644,34 @@ def autoAxis(self, _:bool = False) -> None:
         self.xlimitEdit_min.repaint()
         self.xlimitEdit.repaint()
 
-        endedittime_str = str(self.xlimitEdit.text())
-        if endedittime_str is not None and endedittime_str != '':
-            endeditime = stringtoseconds(endedittime_str)
-            if self.aw.qmc.endofx != endeditime:
-                self.aw.qmc.endofx = endeditime
-                self.aw.qmc.locktimex_end = endeditime
+        try:
+            endedittime_str = str(self.xlimitEdit.text())
+            if endedittime_str is not None and endedittime_str != '':
+                endeditime = stringtoseconds(endedittime_str)
+                if self.aw.qmc.endofx != endeditime:
+                    self.aw.qmc.endofx = endeditime
+                    self.aw.qmc.locktimex_end = endeditime
+                    changed = True
+        except Exception: # pylint: disable=broad-except
+            pass # stringtoseconds raises exception on malformed input
+
+        try:
+            startedittime_str = str(self.xlimitEdit_min.text())
+            if startedittime_str is not None and startedittime_str != '':
+                starteditime = stringtoseconds(startedittime_str)
+                if starteditime >= 0 and self.aw.qmc.timeindex[0] != -1:
+                    self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]] + starteditime
+                elif starteditime >= 0 and self.aw.qmc.timeindex[0] == -1:
+                    self.aw.qmc.startofx = starteditime
+                elif starteditime < 0 and self.aw.qmc.timeindex[0] != -1:
+                    self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]-abs(starteditime)
+                else:
+                    self.aw.qmc.startofx = starteditime
+                self.aw.qmc.locktimex_start = starteditime
                 changed = True
-        startedittime_str = str(self.xlimitEdit_min.text())
-        if startedittime_str is not None and startedittime_str != '':
-            starteditime = stringtoseconds(startedittime_str)
-            if starteditime >= 0 and self.aw.qmc.timeindex[0] != -1:
-                self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]] + starteditime
-            elif starteditime >= 0 and self.aw.qmc.timeindex[0] == -1:
-                self.aw.qmc.startofx = starteditime
-            elif starteditime < 0 and self.aw.qmc.timeindex[0] != -1:
-                self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]-abs(starteditime)
-            else:
-                self.aw.qmc.startofx = starteditime
-            self.aw.qmc.locktimex_start = starteditime
-            changed = True
+        except Exception: # pylint: disable=broad-except
+            pass # stringtoseconds raises exception on malformed input
+
         if changed:
             self.aw.qmc.redraw(recomputeAllDeltas=False)
 
@@ -833,25 +841,33 @@ def updatewindow(self) -> None:
 
         endedittime_str = str(self.xlimitEdit.text())
         if endedittime_str is not None and endedittime_str != '':
-            endeditime = stringtoseconds(endedittime_str)
-            self.aw.qmc.endofx = endeditime
-            self.aw.qmc.locktimex_end = endeditime
+            try:
+                endeditime = stringtoseconds(endedittime_str)
+                self.aw.qmc.endofx = endeditime
+                self.aw.qmc.locktimex_end = endeditime
+            except Exception: # pylint: disable=broad-except
+                self.aw.qmc.endofx = self.aw.qmc.endofx_default
+                self.aw.qmc.locktimex_end = self.aw.qmc.endofx_default
         else:
             self.aw.qmc.endofx = self.aw.qmc.endofx_default
             self.aw.qmc.locktimex_end = self.aw.qmc.endofx_default
 
         startedittime_str = str(self.xlimitEdit_min.text())
         if startedittime_str is not None and startedittime_str != '':
-            starteditime = stringtoseconds(startedittime_str)
-            if starteditime >= 0 and self.aw.qmc.timeindex[0] != -1:
-                self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]] + starteditime
-            elif starteditime >= 0 and self.aw.qmc.timeindex[0] == -1:
-                self.aw.qmc.startofx = starteditime
-            elif starteditime < 0 and self.aw.qmc.timeindex[0] != -1:
-                self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]-abs(starteditime)
-            else:
-                self.aw.qmc.startofx = starteditime
-            self.aw.qmc.locktimex_start = starteditime
+            try:
+                starteditime = stringtoseconds(startedittime_str)
+                if starteditime >= 0 and self.aw.qmc.timeindex[0] != -1:
+                    self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]] + starteditime
+                elif starteditime >= 0 and self.aw.qmc.timeindex[0] == -1:
+                    self.aw.qmc.startofx = starteditime
+                elif starteditime < 0 and self.aw.qmc.timeindex[0] != -1:
+                    self.aw.qmc.startofx = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]-abs(starteditime)
+                else:
+                    self.aw.qmc.startofx = starteditime
+                self.aw.qmc.locktimex_start = starteditime
+            except Exception: # pylint: disable=broad-except
+                self.aw.qmc.startofx = self.aw.qmc.startofx_default
+                self.aw.qmc.locktimex_start = self.aw.qmc.startofx_default
         else:
             self.aw.qmc.startofx = self.aw.qmc.startofx_default
             self.aw.qmc.locktimex_start = self.aw.qmc.startofx_default
@@ -865,13 +881,19 @@ def updatewindow(self) -> None:
         except Exception: # pylint: disable=broad-except
             pass
 
-        resettime = stringtoseconds(str(self.resetEdit.text()))
-        if resettime > 0:
-            self.aw.qmc.resetmaxtime = resettime
+        try:
+            resettime = stringtoseconds(str(self.resetEdit.text()))
+            if resettime > 0:
+                self.aw.qmc.resetmaxtime = resettime
+        except Exception: # pylint: disable=broad-except
+            pass
 
-        chargetime = stringtoseconds(str(self.chargeminEdit.text()))
-        if chargetime <= 0:
-            self.aw.qmc.chargemintime = chargetime
+        try:
+            chargetime = stringtoseconds(str(self.chargeminEdit.text()))
+            if chargetime <= 0:
+                self.aw.qmc.chargemintime = chargetime
+        except Exception: # pylint: disable=broad-except
+            pass
 
         self.aw.qmc.fixmaxtime = not self.fixmaxtimeFlag.isChecked()
         self.aw.qmc.locktimex = self.locktimexFlag.isChecked()

src/artisanlib/calculator.py

@@ -234,31 +234,34 @@ def calculateRC(self) -> None:
             if not self.startEdit.text() or not self.endEdit.text():
                 #empty field
                 return
-            starttime = stringtoseconds(str(self.startEdit.text()))
-            endtime = stringtoseconds(str(self.endEdit.text()))
-            if starttime == -1 or endtime == -1:
-                self.result1.setText(QApplication.translate('Label', 'Time syntax error. Time not valid'))
+            try:
+                starttime = stringtoseconds(str(self.startEdit.text()))
+                endtime = stringtoseconds(str(self.endEdit.text()))
+                if  endtime > self.aw.qmc.timex[-1] or endtime < starttime:
+                    self.aw.sendmessage(QApplication.translate('Label', 'Error: End time smaller than Start time'))
+                    self.result1.setText('')
+                    self.result2.setText('')
+                    return
+                if self.aw.qmc.timeindex[0] != -1:
+                    start = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]
+                else:
+                    start = 0
+                startindex = self.aw.qmc.time2index(starttime + start)
+                endindex = self.aw.qmc.time2index(endtime + start)
+                #delta
+                deltatime = self.aw.qmc.timex[endindex] -  self.aw.qmc.timex[startindex]
+                deltatemperature = self.aw.qmc.temp2[endindex] - self.aw.qmc.temp2[startindex]
+                deltaseconds = 0 if deltatime == 0 else deltatemperature / deltatime
+                deltaminutes = deltaseconds*60.
+                string1 = QApplication.translate('Label', 'Best approximation was made from {0} to {1}').format(stringfromseconds(self.aw.qmc.timex[startindex]- start),stringfromseconds(self.aw.qmc.timex[endindex]- start))
+                string2 = QApplication.translate('Label', '<b>{0}</b> {1}/sec, <b>{2}</b> {3}/min').format(f'{deltaseconds:.2f}',self.aw.qmc.mode,f'{deltaminutes:.2f}',self.aw.qmc.mode)
+                self.result1.setText(string1)
+                self.result2.setText(string2)
+            except Exception: # pylint: disable=broad-except
+                self.aw.sendmessage(QApplication.translate('Label', 'Time syntax error. Time not valid'))
+                self.result1.setText('')
                 self.result2.setText('')
                 return
-            if  endtime > self.aw.qmc.timex[-1] or endtime < starttime:
-                self.result1.setText(QApplication.translate('Label', 'Error: End time smaller than Start time'))
-                self.result2.setText('')
-                return
-            if self.aw.qmc.timeindex[0] != -1:
-                start = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]
-            else:
-                start = 0
-            startindex = self.aw.qmc.time2index(starttime + start)
-            endindex = self.aw.qmc.time2index(endtime + start)
-            #delta
-            deltatime = self.aw.qmc.timex[endindex] -  self.aw.qmc.timex[startindex]
-            deltatemperature = self.aw.qmc.temp2[endindex] - self.aw.qmc.temp2[startindex]
-            deltaseconds = 0 if deltatime == 0 else deltatemperature / deltatime
-            deltaminutes = deltaseconds*60.
-            string1 = QApplication.translate('Label', 'Best approximation was made from {0} to {1}').format(stringfromseconds(self.aw.qmc.timex[startindex]- start),stringfromseconds(self.aw.qmc.timex[endindex]- start))
-            string2 = QApplication.translate('Label', '<b>{0}</b> {1}/sec, <b>{2}</b> {3}/min').format(f'{deltaseconds:.2f}',self.aw.qmc.mode,f'{deltaminutes:.2f}',self.aw.qmc.mode)
-            self.result1.setText(string1)
-            self.result2.setText(string2)
         else:
             self.result1.setText(QApplication.translate('Label', 'No profile found'))
             self.result2.setText('')

src/artisanlib/canvas.py

@@ -7018,7 +7018,7 @@ def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:Optiona
                         #find right most occurrence before index of given event type
                         if nint in self.specialeventstype and nint < 4:
                             spevtylen = len(self.specialeventstype)-1
-                            iii = None
+                            iii:Optional[int] = None
                             for iii in range(spevtylen,-1,-1):
                                 if self.specialeventstype[iii] == nint and index >= self.specialevents[iii]:
                                     break  #index found

src/artisanlib/curves.py

@@ -2131,38 +2131,41 @@ def eventlist(self) -> List[Tuple[str,int]]:
         return events
 
     def doPolyfit(self) -> bool:
-        ll = min(len(self.aw.qmc.timex),len(self.curves[self.c1ComboBox.currentIndex()]),len(self.curves[self.c2ComboBox.currentIndex()]))
-        starttime = stringtoseconds(str(self.startEdit.text()))
-        endtime = stringtoseconds(str(self.endEdit.text()))
-        if starttime == -1 or endtime == -1:
-            self.resultWidget.setText('')
-            self.resultWidget.repaint()
-            return False
-        if  endtime > self.aw.qmc.timex[-1] or endtime < starttime:
-            self.resultWidget.setText('')
-            self.resultWidget.repaint()
-            return False
-        if self.aw.qmc.timeindex[0] != -1:
-            start = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]
-        else:
-            start = 0
-        startindex = self.aw.qmc.time2index(starttime + start)
-        endindex = min(ll,self.aw.qmc.time2index(endtime + start))
-        c1 = self.curves[self.c1ComboBox.currentIndex()]
-        c2 = self.curves[self.c2ComboBox.currentIndex()]
-        z = self.aw.qmc.polyfit(c1,c2,
-               self.polyfitdeg.value(),startindex,endindex,self.deltacurves[self.c2ComboBox.currentIndex()],onDeltaAxis=self.polyfitRoR)
-        res = True
-        if z is not None:
-            for e in z:
-                if numpy.isnan(e):
-                    res = False
-                    break
-        if res and z is not None:
-            s = self.aw.fit2str(z)
-            self.resultWidget.setText(s)
-            self.resultWidget.repaint()
-            return True
+        try:
+            ll = min(len(self.aw.qmc.timex),len(self.curves[self.c1ComboBox.currentIndex()]),len(self.curves[self.c2ComboBox.currentIndex()]))
+            starttime = stringtoseconds(str(self.startEdit.text()))
+            endtime = stringtoseconds(str(self.endEdit.text()))
+            if starttime == -1 or endtime == -1:
+                self.resultWidget.setText('')
+                self.resultWidget.repaint()
+                return False
+            if  endtime > self.aw.qmc.timex[-1] or endtime < starttime:
+                self.resultWidget.setText('')
+                self.resultWidget.repaint()
+                return False
+            if self.aw.qmc.timeindex[0] != -1:
+                start = self.aw.qmc.timex[self.aw.qmc.timeindex[0]]
+            else:
+                start = 0
+            startindex = self.aw.qmc.time2index(starttime + start)
+            endindex = min(ll,self.aw.qmc.time2index(endtime + start))
+            c1 = self.curves[self.c1ComboBox.currentIndex()]
+            c2 = self.curves[self.c2ComboBox.currentIndex()]
+            z = self.aw.qmc.polyfit(c1,c2,
+                   self.polyfitdeg.value(),startindex,endindex,self.deltacurves[self.c2ComboBox.currentIndex()],onDeltaAxis=self.polyfitRoR)
+            res = True
+            if z is not None:
+                for e in z:
+                    if numpy.isnan(e):
+                        res = False
+                        break
+            if res and z is not None:
+                s = self.aw.fit2str(z)
+                self.resultWidget.setText(s)
+                self.resultWidget.repaint()
+                return True
+        except Exception:  # pylint: disable=broad-except
+            pass
         self.resultWidget.setText('')
         self.resultWidget.repaint()
         return False