- fixes regression in plus authorization

- limits strings passed to eval()
- adds PID derivative filter size setting
- updated axis settings in Orbiter machine setup
- updates translations

Author: MAKOMO

src/artisanlib/canvas.py

@@ -5862,7 +5862,7 @@ def updateLCDtime(self) -> None:
                     # if more than max cool (from statistics) past DROP and not yet COOLend turn the time LCD red:
                     if (self.timeindex[0]!=-1 and self.timeindex[6] != 0 and not self.timeindex[7] and
                                 len(self.timex) > self.timeindex[6] and (tx - self.timex[self.timeindex[6]]) > 4*60):
-                        self.aw.setTimerColor('slowcoolingtimer')
+                        self.aw.setTimerColorSignal.emit('slowcoolingtimer')
 
                     if self.chargeTimerFlag and self.timeindex[0] == -1 and self.chargeTimerPeriod != 0:
                         if self.chargeTimerPeriod > ts:
@@ -6915,6 +6915,7 @@ def shiftValueEvalsignBackground(timex:list[float], timeb:list[float], readings:
     def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:int|None = None,
                 RTsname:str|None = None, RTsval:float|None = None, t_offset:float = 0.) -> float:
         if len(mathexpression):
+            eval_limit:int = 300 # size limit of the input string to handed over to eval()
             mathdictionary:dict[str,None|float|Callable[[Any], float|None]|Callable[[Any, Any], float|None]] = {} # zuban:ignore[assignment,unused-ignore]
             mathdictionary.update(self.mathdictionary_base) # extend by the standard math symbolic formulas
 
@@ -7132,7 +7133,7 @@ def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:int|Non
                             body = mathexpression[i+3:end_idx]
                             val = -1
                             try:
-                                absolute_index = eval(body,{'__builtins__':None},mathdictionary) # pylint: disable=eval-used
+                                absolute_index = eval(body[:eval_limit],{'__builtins__':None},mathdictionary) # pylint: disable=eval-used
                                 if absolute_index > -1:
                                     if nint == 1: #ET
                                         val = sample_temp1[absolute_index]
@@ -7246,7 +7247,7 @@ def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:int|Non
                                         body = mathexpression[i+k+3:end_idx]
                                         val = -1
                                         try:
-                                            absolute_index = eval(body,{'__builtins__':None},mathdictionary)  # pylint: disable=eval-used
+                                            absolute_index = eval(body[:eval_limit],{'__builtins__':None},mathdictionary)  # pylint: disable=eval-used
                                             if absolute_index > -1:
                                                 valn:float|None = -1
                                                 if nint == 1: #DeltaET
@@ -7384,7 +7385,7 @@ def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:int|Non
                                 body = 'b' + body
                             val = -1
                             try:
-                                absolute_index = eval(body,{'__builtins__':None},mathdictionary)  # pylint: disable=eval-used
+                                absolute_index = eval(body[:eval_limit],{'__builtins__':None},mathdictionary)  # pylint: disable=eval-used
                                 if absolute_index > -1:
                                     val = timex[absolute_index]
                             except Exception: # pylint: disable=broad-except
@@ -7484,7 +7485,7 @@ def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:int|Non
                                     body = mathexpression[i+3:end_idx]
                                     val = -1
                                     try:
-                                        absolute_index = eval(body,{'__builtins__':None},mathdictionary)  # pylint: disable=eval-used
+                                        absolute_index = eval(body[:eval_limit],{'__builtins__':None},mathdictionary)  # pylint: disable=eval-used
                                         if absolute_index > -1:
                                             if nint == 1: #ET
                                                 val = self.temp1B[absolute_index]
@@ -7634,7 +7635,7 @@ def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:int|Non
                         # if any variable is bound to the error value -1 we return -1 for the full formula
                         reslt = -1
                     else:
-                        reslt = float(eval(me, {'__builtins__':None}, mathdictionary)) # pylint: disable=eval-used
+                        reslt = float(eval(me[:eval_limit], {'__builtins__':None}, mathdictionary)) # pylint: disable=eval-used
                 except TypeError:
                     reslt = -1
                 except ValueError:
@@ -8142,7 +8143,7 @@ def reset(self,redraw:bool = True, soundOn:bool = True, keepProperties:bool = Fa
             self.aw.keyboardmoveindex = 0 # points to the last activated button in keyboardButtonList; we start with the CHARGE button
             self.aw.resetKeyboardButtonMarks()
 
-            self.aw.setTimerColor('timer')
+            self.aw.setTimerColorSignal.emit('timer')
 
             try:
                 self.aw.ntb.update() # reset the MPL navigation history
@@ -14327,7 +14328,7 @@ def OnRecorder(self) -> None:
                 _log.exception(e)
 
             # reset LCD timer color that might have been reset by the RS PID in monitoring mode:
-            self.aw.setTimerColor('timer')
+            self.aw.setTimerColorSignal.emit('timer')
             if self.delta_ax is not None:
                 y_label = self.delta_ax.set_ylabel('')
                 y_label.set_in_layout(False) # remove y-axis labels from tight_layout calculation
@@ -14409,7 +14410,7 @@ def OnRecorder(self) -> None:
             # set CHARGEtimer
             if self.chargeTimerFlag:
                 if self.chargeTimerPeriod > 0:
-                    self.aw.setTimerColor('slowcoolingtimer')
+                    self.aw.setTimerColorSignal.emit('slowcoolingtimer')
                 QTimer.singleShot(self.chargeTimerPeriod*1000, self.fireChargeTimer)
 
             _log.info('MODE: START RECORDING')
@@ -14609,7 +14610,7 @@ def markCharge(self, noaction:bool = False) -> None:
                             if self.aw.pidcontrol.pidOnCHARGE and not self.aw.pidcontrol.pidActive: # Arduino/TC4, Hottop, MODBUS
                                 self.aw.pidcontrol.pidOn()
                         if self.chargeTimerPeriod > 0:
-                            self.aw.setTimerColor('timer')
+                            self.aw.setTimerColorSignal.emit('timer')
                         try:
                             # adjust startofx to the new timeindex[0] as it depends on timeindex[0]
                             if self.locktimex:
@@ -15322,7 +15323,7 @@ def markDrop(self, noaction:bool = False) -> None:
                     # we check if this is the first DROP mark on this roast
                     firstDROP = self.timeindex[6] == 0 # on UNDO DROP we do not send the record to plus
                     if self.aw.buttonDROP.isFlat() and self.timeindex[6] > 0:
-                        self.aw.setTimerColor('timer') # reset cooling timer color back to the default
+                        self.aw.setTimerColorSignal.emit('timer')  # reset cooling timer color back to the default
                         self.autoDropIdx = -1 # disable autoDROP to allow manual re-DROP
                         # undo wrongly set FCs
                         # deactivate autoDROP
@@ -15346,7 +15347,7 @@ def markDrop(self, noaction:bool = False) -> None:
                             if 6 in self.l_annotations_dict:
                                 del self.l_annotations_dict[6]
                     elif not self.aw.buttonDROP.isFlat():
-                        self.aw.setTimerColor('rstimer') # cooling timer color
+                        self.aw.setTimerColorSignal.emit('rstimer') # cooling timer color
                         self.incBatchCounter()
                         # generate UUID
                         if self.roastUUID is None: # there might be already one assigned by undo and redo the markDROP!