fixes typo in new event replay

Author: MAKOMO

src/artisanlib/acaia.py

@@ -23,6 +23,10 @@
 if TYPE_CHECKING:
     from bleak.backends.characteristic import BleakGATTCharacteristic  # pylint: disable=unused-import
 
+try:
+    from PyQt6.QtCore import QObject # @UnusedImport @Reimport  @UnresolvedImport
+except ImportError:
+    from PyQt5.QtCore import QObject # type: ignore # @UnusedImport @Reimport  @UnresolvedImport
 
 from artisanlib.ble_port import ClientBLE
 from artisanlib.async_comm import AsyncIterable, IteratorReader
@@ -121,8 +125,7 @@ class ACAIA_TIMER(IntEnum):
 
 
 
-class AcaiaBLE(ClientBLE):
-
+class AcaiaBLE(QObject, ClientBLE): # pyright: ignore [reportGeneralTypeIssues] # Argument to class must be a base class
 
 
     # Acaia message constants
@@ -177,6 +180,12 @@ def __init__(self, connected_handler:Optional[Callable[[], None]] = None,
         self.add_notify(ACAIA_NOTIFY_UUID, self.notify_callback)
         self.add_write(ACAIA_SERVICE_UUID, ACAIA_WRITE_UUID)
 
+    def set_connected_handler(self, connected_handler:Optional[Callable[[], None]]) -> None:
+        self._connected_handler = connected_handler
+
+    def set_disconnected_handler(self, disconnected_handler:Optional[Callable[[], None]]) -> None:
+        self._disconnected_handler = disconnected_handler
+
 
     # protocol parser
 
@@ -517,23 +526,16 @@ def battery_changed(self, new_value:int) -> None: # pylint: disable=no-self-use
 
 
 
-# QObject needs to go first in this mixing and AcaiaBLE and its super class are not allowed to hold __slots__
-class Acaia(Scale, AcaiaBLE): # pyright: ignore [reportGeneralTypeIssues] # Argument to class must be a base class
+# AcaiaBLE and its super class are not allowed to hold __slots__
+class Acaia(AcaiaBLE, Scale): # pyright: ignore [reportGeneralTypeIssues] # Argument to class must be a base class
 
-    def __init__(self, connected_handler:Optional[Callable[[], None]] = None,
+    def __init__(self, model:int, ident:Optional[str], name:Optional[str], connected_handler:Optional[Callable[[], None]] = None,
                        disconnected_handler:Optional[Callable[[], None]] = None):
-        Scale.__init__(self)
+        Scale.__init__(self, model, ident, name)
         AcaiaBLE.__init__(self, connected_handler = connected_handler, disconnected_handler=disconnected_handler)
-        self.address:Optional[str] = None # if set, connects are restricted to the device with this BLE address
-
-    def set_address(self, address:Optional[str]) -> None:
-        self.address = address
-
-    def get_address(self) -> Optional[str]:
-        return self.address
 
     def connect(self) -> None:
-        self.start(address=self.address)
+        self.start(address=self.ident)
 
     def disconnect(self) -> None:
         self.stop()

src/artisanlib/background.py

@@ -765,7 +765,7 @@ def readChecks(self) -> None:
         self.aw.qmc.backgroundETcurve = bool(self.backgroundETflag.isChecked())
         self.aw.qmc.backgroundBTcurve = bool(self.backgroundBTflag.isChecked())
         self.aw.qmc.backgroundShowFullflag = bool(self.backgroundFullflag.isChecked())
-        self.aw.qmc.redraw(recomputeAllDeltas=True)
+        self.aw.qmc.redraw_keep_view(recomputeAllDeltas=True)
 
     @pyqtSlot(int)
     def changeAlignEventidx(self, i:int) -> None:

src/artisanlib/canvas.py

@@ -186,6 +186,7 @@ class tgraphcanvas(FigureCanvas):
     showEventsSignal = pyqtSignal(int, bool)
     showBackgroundEventsSignal = pyqtSignal(bool)
     redrawSignal = pyqtSignal(bool,bool,bool,bool,bool)
+    redrawKeepViewSignal = pyqtSignal(bool,bool,bool,bool,bool)
 
     umlaute_dict : Final[Dict[str, str]] = {
        uchr(228): 'ae',  # U+00E4   \xc3\xa4
@@ -2417,6 +2418,7 @@ def __init__(self, parent:QWidget, dpi:int, locale:str, aw:'ApplicationWindow')
         self.showEventsSignal.connect(self.showEvents)
         self.showBackgroundEventsSignal.connect(self.showBackgroundEvents)
         self.redrawSignal.connect(self.redraw, type=Qt.ConnectionType.QueuedConnection) # type: ignore
+        self.redrawKeepViewSignal.connect(self.redraw_keep_view, type=Qt.ConnectionType.QueuedConnection) # type: ignore
 
     #NOTE: empty Figure is initially drawn at the end of self.awsettingsload()
     #################################    FUNCTIONS    ###################################
@@ -5896,34 +5898,32 @@ def playbackevent(self) -> None:
                                         # if last registered event of event_type has higher BT as next to be replayed one, we
                                         # expect a temperature decrease instead of an increase
                                         last_registered_event_index = len(self.specialeventstype) - 1 - self.specialeventstype[::-1].index(event_type)
-                                        if self.stemp2B[self.specialevents[last_registered_event_index]] > self.stemp2B[bge]:
+                                        if self.ctemp2[self.specialevents[last_registered_event_index]] > self.stemp2B[bge]:
                                             delta = self.ctemp2[-1] - self.stemp2B[bge]
                                             increasing = False
                                     except Exception: # pylint: disable=broad-except
                                         # a previous event of that type might not yet exist
                                         pass
-                                    next_byTemp_checked[event_type] = True
                             else: # before TP we switch back to time-based
                                 delta = timed
-                                next_byTemp_checked[event_type] = True
+                            next_byTemp_checked[event_type] = True
                         elif not next_byTemp_checked[event_type] and self.replayType == 2: # replay by ET (after TP)
                             if self.TPalarmtimeindex is not None:
-                                if len(self.ctemp1)> 0 and self.ctemp1[-1] is not None and len(self.stemp1)>bge:
+                                if len(self.ctemp1)> 0 and self.ctemp1[-1] is not None and len(self.stemp1B)>bge:
                                     delta = self.stemp1B[bge] - self.ctemp1[-1]
                                     try:
                                         # if last registered event of event_type has higher BT as next to be replayed one, we
                                         # expect a temperature decrease instead of an increase
                                         last_registered_event_index = len(self.specialeventstype) - 1 - self.specialeventstype[::-1].index(event_type)
-                                        if self.stemp1B[self.specialevents[last_registered_event_index]] > self.stemp1B[bge]:
+                                        if self.ctemp1[self.specialevents[last_registered_event_index]] > self.stemp1B[bge]:
                                             delta = self.ctemp1[-1] - self.stemp1B[bge]
                                             increasing = False
                                     except Exception: # pylint: disable=broad-except
                                         # a previous event of that type might not yet exist
                                         pass
-                                    next_byTemp_checked[event_type] = True
                             else: # before TP we switch back to time-based
                                 delta = timed
-                                next_byTemp_checked[event_type] = True
+                            next_byTemp_checked[event_type] = True
                         else:
                             delta = 99999 # don't trigger this one
 
@@ -6097,7 +6097,6 @@ def playbackevent(self) -> None:
                                             coefficients = numpy.polyfit([last_time, next_time], [last_event_value, next_event_value], 1)
                                             ramps[event_type] = numpy.poly1d(coefficients)(now)
 
-
                 # now move the sliders to the new values (if any)
                 for k,v in slider_events.items():
                     self.aw.moveslider(k,v)
@@ -8853,6 +8852,7 @@ def twoAxisMode(self) -> bool:
                     any(self.aw.extraDelta1[:len(self.extratimex)]) or
                     any(self.aw.extraDelta2[:len(self.extratimex)])))
 
+    @pyqtSlot(bool,bool,bool,bool,bool)
     def redraw_keep_view(self, *args:bool, **kwargs:bool) -> None:
         xlimit_min: Optional[float] = None
         xlimit: Optional[float] = None

src/artisanlib/devices.py

@@ -1698,6 +1698,7 @@ def scale1ModelChanged(self, i:int) -> None:
             self.scale1NameComboBox.setEnabled(False)
             self.scale1ScanButton.setEnabled(True)
         else:
+            self.aw.scale1_name = None
             self.aw.scale1_model = None
             self.scale1NameComboBox.clear()
             self.scale1NameComboBox.setEnabled(False)
@@ -1708,9 +1709,11 @@ def scale1NameChanged(self, i:int) -> None:
         if 0 <= i < len(self.scale1_devices) and self.aw.scale1_model is not None:
             self.aw.scale1_name = self.scale1_devices[i][0]
             self.aw.scale1_id = self.scale1_devices[i][1]
-            scale = self.aw.scale_manager.get_scale(self.aw.scale1_model, self.scale1_devices[i][1])
+            scale = self.aw.scale_manager.get_scale(self.aw.scale1_model, self.aw.scale1_id, self.aw.scale1_name)
             self.aw.scale_manager.set_scale1(scale)
             if scale is not None:
+                scale.set_connected_handler(lambda : self.aw.sendmessageSignal.emit(QApplication.translate('Message', '{} connected').format(self.aw.scale1_name),True,None))
+                scale.set_disconnected_handler(lambda : self.aw.sendmessageSignal.emit(QApplication.translate('Message', '{} disconnected').format(self.aw.scale1_name),True,None))
                 scale.connect()
         # i == -1 if self.scale1NameComboBox is empty!
         else:
@@ -1743,6 +1746,7 @@ def scale2ModelChanged(self, i:int) -> None:
             self.scale2NameComboBox.setEnabled(False)
             self.scale2ScanButton.setEnabled(True)
         else:
+            self.aw.scale2_name = None
             self.aw.scale2_model = None
             self.scale2NameComboBox.clear()
             self.scale2NameComboBox.setEnabled(False)
@@ -1753,7 +1757,7 @@ def scale2NameChanged(self, i:int) -> None:
         if 0 <= i < len(self.scale2_devices) and self.aw.scale2_model is not None:
             self.aw.scale2_name = self.scale2_devices[i][0]
             self.aw.scale2_id = self.scale2_devices[i][1]
-            scale = self.aw.scale_manager.get_scale(self.aw.scale2_model, self.scale2_devices[i][1])
+            scale = self.aw.scale_manager.get_scale(self.aw.scale2_model, self.aw.scale2_id, self.aw.scale2_name)
             self.aw.scale_manager.set_scale2(scale)
             if scale is not None:
                 scale.connect()

src/artisanlib/main.py

@@ -9953,15 +9953,29 @@ def eventaction_internal(self, action:int, cmd:str, eventtype:Optional[int]) ->
                                     if len(args) == 2:
                                         event_type = int(args[0])
                                         if 0 < event_type < 5:
+                                            updated:bool = False
                                             try:
                                                 state = toBool(eval(args[1])) # pylint: disable=eval-used
-                                                self.qmc.specialeventplaybackramp[event_type - 1] = state
+                                                if self.qmc.specialeventplaybackramp[event_type - 1] != state:
+                                                    self.qmc.specialeventplaybackramp[event_type - 1] = state
+                                                    updated = True
                                             except Exception: # pylint: disable=broad-except
                                                 value_str = args[1].strip()
                                                 if value_str.lower() in {'yes', 'true', 't', '1'}:
-                                                    self.qmc.specialeventplaybackramp[event_type - 1] = True
-                                                else:
+                                                    if not self.qmc.specialeventplaybackramp[event_type - 1]:
+                                                        self.qmc.specialeventplaybackramp[event_type - 1] = True
+                                                        updated = True
+                                                elif self.qmc.specialeventplaybackramp[event_type - 1]:
                                                     self.qmc.specialeventplaybackramp[event_type - 1] = False
+                                                    updated = True
+                                            if updated:
+                                                self.qmc.redrawKeepViewSignal.emit(
+                                                    False, # recomputeAllDeltas (default: True)
+                                                    False, # re_smooth_foreground (default: True)
+                                                    True,  # takelock (default: True)
+                                                    False, # forceRenewAxis (default: False)
+                                                    False, # re_smooth_background (default: False)
+                                                    )
                                 except Exception as e: # pylint: disable=broad-except
                                     _log.exception(e)
                             # playback(<int>, <bool>) with <int> from {1,2,3,4} selecting one of the four event types

src/artisanlib/roast_properties.py

@@ -1374,6 +1374,9 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
                 try:
                     from artisanlib.acaia import Acaia
                     self.acaia = Acaia(
+                        model = 1,
+                        ident = None,
+                        name = 'Acaia',
                         connected_handler=lambda : self.aw.sendmessageSignal.emit(QApplication.translate('Message', '{} connected').format('Acaia'),True,None),
                         disconnected_handler=lambda : self.aw.sendmessageSignal.emit(QApplication.translate('Message', '{} disconnected').format('Acaia'),True,None))
                     self.acaia.weight_changed_signal.connect(self.ble_weight_changed)
@@ -2569,7 +2572,7 @@ def closeEvent(self, _:Optional['QCloseEvent'] = None) -> None:
         self.aw.qmc.clear_last_picked_event_selection()
         self.aw.eNumberSpinBox.setValue(0)
 
-        self.aw.qmc.redraw(recomputeAllDeltas=False)
+        self.aw.qmc.redraw_keep_view(recomputeAllDeltas=False)
 
         self.clean_up()
         super().reject()
@@ -5282,7 +5285,7 @@ def accept(self) -> None:
             try:
                 self.aw.qmc.background = not self.aw.qmc.hideBgafterprofileload
                 self.aw.qmc.timealign(redraw=False)
-                self.aw.qmc.redraw()
+                self.aw.qmc.redraw_keep_view()
             except Exception: # pylint: disable=broad-except
                 pass
         elif ((not self.aw.qmc.flagon) or

src/artisanlib/scale.py

@@ -16,12 +16,12 @@
 # Marko Luther, 2025
 
 import logging
-from typing import Final, List, Tuple, Optional
+from typing import Final, List, Tuple, Optional, Callable
 
 try:
-    from PyQt6.QtCore import QObject, pyqtSignal # @UnusedImport @Reimport  @UnresolvedImport
+    from PyQt6.QtCore import pyqtSignal # @UnusedImport @Reimport  @UnresolvedImport
 except ImportError:
-    from PyQt5.QtCore import QObject, pyqtSignal # type: ignore # @UnusedImport @Reimport  @UnresolvedImport
+    from PyQt5.QtCore import pyqtSignal # type: ignore # @UnusedImport @Reimport  @UnresolvedImport
 
 
 _log: Final[logging.Logger] = logging.getLogger(__name__)
@@ -38,15 +38,42 @@
 
 
 # NOTE: this class and all subclasses are not allowed to hold __slots__
-class Scale(QObject): # pyright: ignore [reportGeneralTypeIssues] # Argument to class must be a base class
+class Scale:
 
     weight_changed_signal = pyqtSignal(int)   # delivers new weight in g
     battery_changed_signal = pyqtSignal(int)  # delivers new batter level in %
     disconnected_signal = pyqtSignal()        # issued on disconnect
 
-    def __init__(self) -> None:
-        QObject.__init__(self)
+    def __init__(self, model:int, ident:Optional[str], name:Optional[str]):
+        self.model = model
+        self.ident = ident
+        self.name = name
+
+    def set_model(self, model:int) -> None:
+        self.model = model
+
+    def get_model(self) -> int:
+        return self.model
+
+    def set_ident(self, ident:Optional[str]) -> None:
+        self.ident = ident
+
+    def get_ident(self) -> Optional[str]:
+        return self.ident
+
+    def set_name(self, name:Optional[str]) -> None:
+        self.name = name
 
+    def get_name(self) -> Optional[str]:
+        return self.name
+
+    #---
+
+    def set_connected_handler(self, connected_handler:Optional[Callable[[], None]]) -> None:
+        pass
+
+    def set_disconnected_handler(self, disconnected_handler:Optional[Callable[[], None]]) -> None:
+        pass
 
     def connect(self) -> None:
         pass
@@ -56,7 +83,6 @@ def disconnect(self) -> None:
 
 
 
-
 class ScaleManager:
 
     __slots__ = [ 'scale1', 'scale2' ]
@@ -85,12 +111,10 @@ def scan_for_scales(model:int) -> ScaleSpecs:
         return []
 
     @staticmethod
-    def get_scale(model:int, address:str) -> Optional[Scale]:
+    def get_scale(model:int, ident:str, name:str) -> Optional[Scale]:
         if model == 0:
             from artisanlib.acaia import Acaia
-            scale = Acaia()
-            scale.set_address(address)
-            return scale
+            return Acaia(model, ident, name)
         return None
 
     def set_scale1(self, scale:Optional[Scale]) -> None:

src/includes/Machines/Santoker/Cube_Bluetooth_PID.aset

@@ -156,7 +156,7 @@ positiveTargetMin=0
 positiveTargetRangeLimit=false
 svLookahead=5
 svMode=0
-svSlider=true
+svSlider=false
 svSliderMax=230
 svSliderMin=0
 svValue=0

src/requirements-dev.txt

@@ -26,7 +26,7 @@ pytest-cov==6.0.0
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
 hypothesis>=6.129.3
-coverage>=7.6.12
+coverage>=7.7.0
 coverage-badge==1.1.2
 codespell==2.4.1
 # the following 2 packages are not installed along aiohttp on Python3.12 and make mypy complain

src/requirements.txt

@@ -52,7 +52,7 @@ psutil==7.0.0
 typing-extensions==4.10.0; python_version < '3.8' # required for supporting Final and TypeDict on Python <3.8
 protobuf==5.29.3 # v5.30.x drops support for Python 3.8!
 numpy==1.24.3; python_version < '3.9' # last Python 3.8 release
-numpy==2.2.3; python_version >= '3.9'
+numpy==2.2.4; python_version >= '3.9'
 scipy==1.10.1; python_version < '3.9' # last Python 3.8 release
 scipy==1.15.2; python_version >= '3.9'
 wquantiles==0.6
@@ -67,7 +67,7 @@ matplotlib==3.7.3; python_version < '3.9' # last Python 3.8 release
 matplotlib==3.10.0; python_version >= '3.9'
 jinja2==3.1.5
 aiohttp==3.10.11; python_version < '3.9' # last Python 3.8 release
-aiohttp==3.11.11; python_version >= '3.9'
+aiohttp==3.11.14; python_version >= '3.9'
 aiohttp_jinja2==1.6
 python-bidi==0.4.2; python_version < '3.9' # last Python 3.8 release
 python-bidi==0.6.6; python_version >= '3.9'

wiki/ReleaseHistory.md

@@ -52,6 +52,7 @@ v3.1.1
   - the quick custom event entry using the q, w, e and e key followed by number keys now requires the ENTER/RETURN key to establish the new value.  The last entered digit can be removed by using the backspace key. ESC cancels the action.
   - improved accuracy on rendering [artisan.plus](https://artisan.plus) blend component weights
   - improved Cropster importer
+  - event replay not at any time ensures that only future events are replayed. As the set of future events may change on moving the background profile, an event can be replayed again. In previous Artisan versions, events did replay only once.
 
 * FIXES
   - ensure complete reset to defaults in energy tab loads tab
@@ -63,6 +64,7 @@ v3.1.1
   - fixed an issue in event replay where certain events failed to be replayed by temperature
   - fixes an issue where the PID Input for external MODBUS/SV PIDs was not correctly persisted
   - fixes broken `button` Modbus Command
+  - fixes communication with some Santoker R Master Series machines ([Issue #1811](../../../issues/1811))
 
 * REMOVALS
   - support for the non-standard MODBUS little-endian byte order has been removed