- adds back edit (cut/copy/paste) keyboard shortcuts in load/save dialogs (Issue #2114)

- makes extra device setups more robust
- don't reset live CM ET/BT readings on DROP and start the computation only after 90s into the roast
- adds menu theme icons
- lib updates

Author: MAKOMO

src/artisan-win.spec

@@ -148,6 +148,7 @@ a = Analysis(['artisan.py'],
              datas=datas, # + copy_metadata('tzdata')
              hookspath=[],
              runtime_hooks=[r'pyinstaller_hooks\rthooks\pyi_rth_mplconfig.py'], # overwrites default MPL runtime hook which keeps loading font cache from (new) temp directory
+             additional_hooks_dir=[],
              excludes=[],
              hiddenimports=hiddenimports_list,
              win_no_prefer_redirects=False,

src/artisanlib/aillio_r1.py

@@ -642,14 +642,25 @@ def __readreply(self, length:int) -> Any:
 #            res['extraname2'] = ['RoR']
 #            res['extramathexpression1'] = ['']
 #            res['extramathexpression2'] = ['']
-#            res['extraLCDvisibility1'] = [temp3_visibility]
-#            res['extraLCDvisibility2'] = [temp4_visibility]
-#            res['extraCurveVisibility1'] = [temp3_visibility]
-#            res['extraCurveVisibility2'] = [temp4_visibility]
-#            res['extraDelta1'] = [False]
-#            res['extraDelta2'] = [True]
-#            res['extraFill1'] = [False]
-#            res['extraFill2'] = [False]
+###
+#            res['extraLCDvisibility1'] = [False] * aw.self.nLCDS
+#            res['extraLCDvisibility2'] = [False] * aw.self.nLCDS
+#            res['extraCurveVisibility1'] = [False] * aw.self.nLCDS
+#            res['extraCurveVisibility2'] = [False] * aw.self.nLCDS
+#            res['extraDelta1'] = [False] * aw.self.nLCDS
+#            res['extraDelta2'] = [False] * aw.self.nLCDS
+#            res['extraFill1'] = [0] * aw.self.nLCDS
+#            res['extraFill2'] = [0] * aw.self.nLCDS
+#            if aw.self.nLCDS>0:
+#               res['extraLCDvisibility1'][0] = temp3_visibility
+#               res['extraLCDvisibility2'][0] = temp4_visibility
+#               res['extraCurveVisibility1'][0] = temp3_visibility
+#               res['extraCurveVisibility2'][0] = temp4_visibility
+#               res['extraDelta1'][0] = False
+#               res['extraDelta2'][0] = True
+#               res['extraFill1'][0] = 0
+#               res['extraFill2'][0] = 0
+##
 #            res['extradevicecolor1'] = ['black']
 #            res['extradevicecolor2'] = ['black']
 #            res['extramarkersizes1'] = [6.0]

src/artisanlib/comm.py

@@ -1023,7 +1023,10 @@ def CM_ETBT(self) -> tuple[float,float,float]:
             # update counts and sum_of_squared_differences
             BTlimit = self.aw.qmc.phases[1]
             BT = (self.aw.qmc.temp2[-1] if len(self.aw.qmc.temp2)>0 else -1)
-            if BTlimit < BT and self.aw.qmc.timeindex[6] == 0: # BT above DRY END as specified in Phased dialog and before DROP is registered
+            if (BTlimit < BT and self.aw.qmc.timeindex[0] > -1 and
+                    (tx - self.aw.qmc.timex[self.aw.qmc.timeindex[0]] > 90) and
+                    self.aw.qmc.timeindex[6] == 0):
+                # BT above DRY END as specified in Phased dialog, at least 1:30m after CHARGE and before DROP is registered
                 ET = (self.aw.qmc.temp1[-1] if len(self.aw.qmc.temp1)>0 else -1)
                 nowB = self.aw.qmc.backgroundtime2index(tx) # points to the last entry if tx > all elements in btimex
                 ETB = (self.aw.qmc.temp1B[nowB] if len(self.aw.qmc.temp1B)>nowB>-1 else -1)
@@ -1036,7 +1039,8 @@ def CM_ETBT(self) -> tuple[float,float,float]:
                     self.CM_BT_readings_count += 1
                     BT_squared_diff = (BT - BTB)**2
                     self.CM_BT_sum_of_squared_differences += BT_squared_diff
-            else:
+            elif self.aw.qmc.timeindex[0] == 0:
+                # if CHARGE is not set reset readings, keep readings otherwise (eg. after DROP)
                 self.CM_ET_readings_count = 0
                 self.CM_ET_sum_of_squared_differences = 0
                 self.CM_BT_readings_count = 0

src/artisanlib/devices.py

@@ -3110,6 +3110,7 @@ def resetextradevices(self, _:bool) -> None:
             _t, _e, exc_tb = sys.exc_info()
             self.aw.qmc.adderror((QApplication.translate('Error Message', 'Exception:') + ' resetextradevices(): {0}').format(str(e)),getattr(exc_tb, 'tb_lineno', '?'))
 
+    # x the index of the extra device to be deleted
     def delextradevice(self, x:int) -> None:
         try:
             self.aw.qmc.extradevices.pop(x)
@@ -3147,10 +3148,11 @@ def delextradevice(self, x:int) -> None:
             if self.aw.extraCurveVisibility2[x]:
                 self.aw.qmc.extratemp2lines.pop(before2)
 
+            # lists of constant length (self.aw.nLCDS)
             self.aw.extraLCDvisibility1.pop(x)
-            self.aw.extraLCDvisibility1.append(True) # keep length constant (self.aw.nLCDS)
+            self.aw.extraLCDvisibility1.append(False) # keep length constant (self.aw.nLCDS)
             self.aw.extraLCDvisibility2.pop(x)
-            self.aw.extraLCDvisibility2.append(True) # keep length constant (self.aw.nLCDS)
+            self.aw.extraLCDvisibility2.append(False) # keep length constant (self.aw.nLCDS)
             self.aw.extraCurveVisibility1.pop(x)
             self.aw.extraCurveVisibility1.append(True) # keep length constant (self.aw.nLCDS)
             self.aw.extraCurveVisibility2.pop(x)