- adds support for Dutch Master Roasters

- improved machine support for Schuilenburg PLCs
- adds CHARGE_time to ComputedProfileInformation and eventsliderunits to ProfileInformation
- refactors smoothing and RoR computation from Canvas to util
- fixes issues on loading (partial) background profiles
- improves NonTempDevice structure to support inhomogeneous settings
- prevent and supress numpy polyfit warnings in software PID
- adds roast message payload generator
- lib updates

Author: MAKOMO

src/artisanlib/atypes.py

@@ -26,32 +26,33 @@
     from plus.stock import BlendList, Blend
 
 class ComputedProfileInformation(TypedDict, total=False):
+    CHARGE_time: float # time in seconds since start of recording (roastdate/roastepoch)
     CHARGE_ET: float
     CHARGE_BT: float
     TP_idx: int
-    TP_time: float
+    TP_time: float # time in seconds since CHARGE
     TP_ET: float
     TP_BT: float
     MET: float
-    DRY_time: float
+    DRY_time: float # time in seconds since CHARGE
     DRY_ET: float
     DRY_BT: float
-    FCs_time: float
+    FCs_time: float # time in seconds since CHARGE
     FCs_ET: float
     FCs_BT: float
-    FCe_time: float
+    FCe_time: float # time in seconds since CHARGE
     FCe_ET: float
     FCe_BT: float
-    SCs_time: float
+    SCs_time: float # time in seconds since CHARGE
     SCs_ET: float
     SCs_BT: float
-    SCe_time: float
+    SCe_time: float # time in seconds since CHARGE
     SCe_ET: float
     SCe_BT: float
-    DROP_time: float
+    DROP_time: float # time in seconds since CHARGE
     DROP_ET: float
     DROP_BT: float
-    COOL_time: float
+    COOL_time: float # time in seconds since CHARGE
     COOL_ET: float
     COOL_BT: float
     totaltime: float
@@ -203,6 +204,7 @@ class ProfileData(TypedDict, total=False):
     default_etypes: list[bool]
     default_etypes_set: list[int]
     etypes: list[str]
+    eventsliderunits: list[str]
     cuppingnotes: str
     roastingnotes: str
     timex: list[float]
@@ -364,6 +366,7 @@ class ExtraDeviceSettings(TypedDict):
     extramarkersizes2      : list[float]
     default_etypes_set     : list[int]
     etypes                 : list[str]
+    eventsliderunits       : list[str]
 
 Palette = tuple[
     list[int],    # 0: event button types

src/artisanlib/canvas.py

@@ -824,7 +824,7 @@ def setbgColorSlot(self, _:bool) -> None:
     # background colors
     def setbgColor(self, title:str, var:QPushButton, color:str) -> None:
         labelcolor = QColor(rgba_colorname2argb_colorname(color))
-        colorf = self.aw.colordialog(labelcolor, alphasupport=True, parent=self)
+        colorf = self.aw.colordialog(labelcolor, alphasupport=True)
         if colorf.isValid():
             color = argb_colorname2rgba_colorname(colorf.name(QColor.NameFormat.HexArgb))
             tc = self.aw.labelBorW(color)
@@ -847,7 +847,7 @@ def setbgColor(self, title:str, var:QPushButton, color:str) -> None:
             self.aw.sendmessage(QApplication.translate('Message','Color of {0} set to {1}').format(title,str(color)))
 
     def setlcdColor(self, palette:dict[str,str], disj_palette:dict[str,str], select:str) -> None:
-        res = self.aw.colordialog(QColor(rgba_colorname2argb_colorname(palette[select])), alphasupport=True, parent=self)
+        res = self.aw.colordialog(QColor(rgba_colorname2argb_colorname(palette[select])), alphasupport=True)
         if QColor.isValid(res):
             nc = argb_colorname2rgba_colorname(res.name(QColor.NameFormat.HexArgb))
             if nc == disj_palette[select] or (nc in {'white', '#ffffff', '#fffffffff'} and disj_palette[select] in {'white', '#ffffff', '#fffffffff'}) or (nc in {'black', '#000000', '#000000ff'} and disj_palette[select] in {'black', '#000000', '#000000ff'}):
@@ -934,7 +934,7 @@ def colorButton(self, s:str) -> QPushButton:
     # foreground colors
     def setColor(self, title:str, var:QPushButton, color:str) -> None:
         labelcolor = QColor(rgba_colorname2argb_colorname(self.aw.qmc.palette[color]))
-        colorf = self.aw.colordialog(labelcolor, alphasupport=True, parent=self)
+        colorf = self.aw.colordialog(labelcolor, alphasupport=True)
         if colorf.isValid():
             self.aw.qmc.palette[color] = argb_colorname2rgba_colorname(colorf.name(QColor.NameFormat.HexArgb))
             self.aw.updateCanvasColors()

src/artisanlib/colors.py

@@ -29,14 +29,14 @@
     from artisanlib.main import ApplicationWindow # noqa: F401 # pylint: disable=unused-import
     from artisanlib.atypes import ProfileData # pylint: disable=unused-import
     from matplotlib.lines import Line2D # type:ignore[untyped-import,unused-ignore] # pylint: disable=unused-import
-    from matplotlib.backend_bases import PickEvent # type:ignore[untyped-import,unused-ignore] # pylint: disable=unused-import
+    from matplotlib.backend_bases import PickEvent, Event # type:ignore[untyped-import,unused-ignore] # pylint: disable=unused-import
     from matplotlib.legend import Legend # type:ignore[untyped-import,unused-ignore] # pylint: disable=unused-import
     from PyQt6.QtWidgets import QLayoutItem, QLayout, QScrollBar # pylint: disable=unused-import
     from PyQt6.QtGui import QStandardItem, QKeyEvent, QDropEvent, QDragEnterEvent, QCloseEvent # pylint: disable=unused-import
     from PyQt6.QtCore import QMimeData # pylint: disable=unused-import
 
 from artisanlib.util import (deltaLabelUTF8, decodeLocal, decodeLocalStrict, stringfromseconds, fromFtoCstrict,
-        fromCtoFstrict, fill_gaps, float2float, deserialize, float2str)
+        fromCtoFstrict, fill_gaps, float2float, deserialize, float2str, smooth_list)
 from artisanlib.suppress_errors import suppress_stdout_stderr
 from artisanlib.dialogs import ArtisanDialog
 from artisanlib.widgets import MyQComboBox
@@ -364,8 +364,10 @@ def recompute(self) -> None:
             timex_lin = numpy.linspace(self.timex[0],self.timex[-1],len(self.timex))
         else:
             timex_lin = None
-        self.stemp1 = list(self.aw.qmc.smooth_list(self.timex,self.temp1,window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin))
-        self.stemp2 = list(self.aw.qmc.smooth_list(self.timex,self.temp2,window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin))
+        self.stemp1 = list(smooth_list(self.timex,self.temp1,window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin,
+                medfilt_factor=self.aw.qmc.median_filter_factor, filter_dropouts=self.aw.qmc.filterDropOuts))
+        self.stemp2 = list(smooth_list(self.timex,self.temp2,window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin,
+                medfilt_factor=self.aw.qmc.median_filter_factor, filter_dropouts=self.aw.qmc.filterDropOuts))
         # we resample the temperatures of extra device curves to regular interval timestamps
         self.extrastemp1 = []
         self.extrastemp2 = []
@@ -374,12 +376,16 @@ def recompute(self) -> None:
                 timex_lin = numpy.linspace(timex[0],timex[-1],len(timex))
             else:
                 timex_lin = None
-            self.extrastemp1.append(list(self.aw.qmc.smooth_list(timex,self.extratemp1[i],window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin)))
-            self.extrastemp2.append(list(self.aw.qmc.smooth_list(timex,self.extratemp2[i],window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin)))
+            self.extrastemp1.append(list(smooth_list(timex,self.extratemp1[i],window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin,
+                medfilt_factor=self.aw.qmc.median_filter_factor, filter_dropouts=self.aw.qmc.filterDropOuts)))
+            self.extrastemp2.append(list(smooth_list(timex,self.extratemp2[i],window_len=self.aw.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=timex_lin,
+                medfilt_factor=self.aw.qmc.median_filter_factor, filter_dropouts=self.aw.qmc.filterDropOuts)))
         # recompute deltas
         cf = self.aw.qmc.curvefilter*2 # we smooth twice as heavy for PID/RoR calculation as for normal curve smoothing
-        t1 = self.aw.qmc.smooth_list(self.timex,self.temp1,window_len=cf,decay_smoothing=decay_smoothing_p,a_lin=timex_lin)
-        t2 = self.aw.qmc.smooth_list(self.timex,self.temp2,window_len=cf,decay_smoothing=decay_smoothing_p,a_lin=timex_lin)
+        t1 = smooth_list(self.timex,self.temp1,window_len=cf,decay_smoothing=decay_smoothing_p,a_lin=timex_lin,
+                medfilt_factor=self.aw.qmc.median_filter_factor, filter_dropouts=self.aw.qmc.filterDropOuts)
+        t2 = smooth_list(self.timex,self.temp2,window_len=cf,decay_smoothing=decay_smoothing_p,a_lin=timex_lin,
+                medfilt_factor=self.aw.qmc.median_filter_factor, filter_dropouts=self.aw.qmc.filterDropOuts)
         if self.timeindex[0]>-1:
             RoR_start = min(self.timeindex[0]+10, len(self.timex)-1)
         else:
@@ -1094,7 +1100,7 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', foreground:str|None =
         self.disableButtons()
         self.aw.disableEditMenus(compare=True)
 
-        self.pick_handler_id = self.aw.qmc.fig.canvas.mpl_connect('pick_event', self.onpick_event)
+        self.pick_handler_id = self.aw.qmc.fig.canvas.mpl_connect('pick_event', cast('Callable[[Event],None]', self.onpick_event))
 
         settings = QSettings()
         if settings.contains('CompareGeometry'):

src/artisanlib/comparator.py

@@ -2724,7 +2724,7 @@ def setcoloreventline3(self,_:bool = False) -> None:
         self.setcoloreventline(3)
 
     def setcoloreventline(self, b:int) -> None:
-        colorf = self.aw.colordialog(QColor(self.aw.qmc.EvalueColor[b]), parent=self)
+        colorf = self.aw.colordialog(QColor(self.aw.qmc.EvalueColor[b]))
         if colorf.isValid():
             colorname = str(colorf.name())
             self.aw.qmc.EvalueColor[b] = colorname
@@ -2746,7 +2746,7 @@ def setcoloreventtext3(self,_:bool = False) -> None:
         self.setcoloreventtext(3)
 
     def setcoloreventtext(self, b:int) -> None:
-        colorf = self.aw.colordialog(QColor(self.aw.qmc.EvalueTextColor[b]), parent=self)
+        colorf = self.aw.colordialog(QColor(self.aw.qmc.EvalueTextColor[b]))
         if colorf.isValid():
             colorname = str(colorf.name())
             self.aw.qmc.EvalueTextColor[b] = colorname
@@ -3152,7 +3152,7 @@ def setvisibilitytyeventbutton(self, _:int) -> None:
     def setbuttoncolor(self, _:bool = False) -> None:
         i = self.aw.findWidgetsRow(self.eventbuttontable,self.sender(),7)
         if i is not None and i < len(self.extraeventbuttoncolor):
-            colorf = self.aw.colordialog(QColor(self.extraeventbuttoncolor[i]), parent=self)
+            colorf = self.aw.colordialog(QColor(self.extraeventbuttoncolor[i]))
             if colorf.isValid():
                 self.extraeventbuttoncolor[i] = str(colorf.name())
                 textColor = self.extraeventbuttontextcolor[i]
@@ -3171,7 +3171,7 @@ def setbuttoncolor(self, _:bool = False) -> None:
     def setbuttontextcolor(self, _:bool = False) -> None:
         i = self.aw.findWidgetsRow(self.eventbuttontable,self.sender(),8)
         if i is not None and i < len(self.extraeventbuttontextcolor):
-            colorf = self.aw.colordialog(QColor(self.extraeventbuttontextcolor[i]), parent=self)
+            colorf = self.aw.colordialog(QColor(self.extraeventbuttontextcolor[i]))
             if colorf.isValid():
                 self.extraeventbuttontextcolor[i] = str(colorf.name())
                 textColor = self.extraeventbuttontextcolor[i]