- switch acaia COSMO to streaming mode

- RoastHubs profile upload respecting current curve smoothing settings
- fixed size login dialogs
- adds Artisan Commands `zoom(<x>[,<y>])`, `pan(<x>[,<y>])`, `center(<x>,<y>[,<clamp>])`, `clamp(<n>)`, `followMode(<bool>)`, and `followModePanning(<x>[,<y>])` to update the canvas perspective
- adds Artisan Commands `home`, `back` and `forward` to operate the navigation bar
- improved PID buttons layout
- updated icons and translations
- lib updates

Author: MAKOMO

doc/help_dialogs/Input_files/eventbuttons.xlsx

@@ -982,6 +982,51 @@
             <td>upload2RoastHubs</td>
             <td>upload current loaded profile to RoastHubs</td>
         </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>zoom(&lt;x&gt;[,&lt;y&gt;])</td>
+            <td>zooms the canvas by factor &lt;x&gt; horizontally and the optional &lt;y&gt; vertically. &lt;y&gt; defaults to &lt;x&gt;.</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>pan(&lt;x&gt;[,&lt;y&gt;])</td>
+            <td>pans the canvas by factor &lt;x&gt; horizontally and the optional &lt;y&gt; vertically. A factor 0 does not apply any panning, a factor 1 moves by one full screen to the left/bottom, a factor -1 by one full screen to the right/top. &lt;y&gt; defaults to &lt;x&gt;.</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>center(&lt;x&gt;,&lt;y&gt;[,&lt;clamp&gt;])</td>
+            <td>centers canvas and then applies panning according to the given x/y parameters in horizontal and vertical direction. 0: no panning, 1: pan canvas one full screen to the left/bottom, -1: pan canvas one full screen to the right/top. If &lt;clamp&gt; is 0 the canvas is centered w.r.t. both axis limits. If not recording, and &lt;clamp&gt; i -1 the canvas is centered only horizontally wr.t. its x-axis limits and with clamp in {1,..,4} w.r.t. to both axis limits. While recording if &lt;clamp&gt; is -1 the canvas is centered horizontally to the current time, if 1 also centered to current BT, 2 current ET, 3 current BT RoR, 4 current ET RoR. &lt;clamp&gt; defaults to -1 if xy-cursor widget is clamped to any temp or RoR curve (z-key), 0 if zoom follow is OFF and xy-cursor not clamped, 1-4 if zoom follow is ON and xy-cursor not clamped, centering on the value zoom followed.</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>clamp(&lt;n&gt;)</td>
+            <td>set xy cursor clamp mode (shortcut key z) to 0: off, 1: BT@x, 2: ET@x, 3: BTB@x, 4: ETB@x</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>followMode(&lt;bool&gt;)</td>
+            <td>enables/disables follow mode</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>followModePanning(&lt;x&gt;[,&lt;y&gt;])</td>
+            <td>sets additional panning in horizontal and vertical direction, applied in follow mode after the centering. 0: no panning, 1: pan canvas one full screen to the left/bottom, -1: pan canvas one full screen to the right/top. &lt;y&gt; defaults to &lt;x&gt;.</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>home</td>
+            <td>toolbar home action</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>back</td>
+            <td>toolbar back action</td>
+        </tr>
+        <tr>
+            <td>&#160;</td>
+            <td>forward</td>
+            <td>toolbar forward action</td>
+        </tr>
         <tr>
             <td>RC Command</td>
             <td>pulse(ch,min,max[,sn])</td>

doc/help_dialogs/Output_html/eventbuttons_help.html

@@ -6,7 +6,7 @@ Artisan is free for personal and commercial use, but asks for a [donation](https
 
 <https://artisan-scope.org>
 
-The home of its development is on GitHub were all source and binary files are available as well as an issue tracker.
+The home of its development is on GitHub where all source and binary files are available as well as an issue tracker.
 
 <https://github.com/artisan-roaster-scope/artisan>
 

src/README.txt

@@ -236,7 +236,7 @@ class ACAIA_TIMER(IntEnum):
 
 HEARTBEAT_FREQUENCY:Final[int] = 5 # send the heartbeat every 5 sec
 
-RELAY_STREAMING:Final[bool] = False # if set, configure Acaia relay (and COSMO) scales to streaming mode, otherwise they work in non-streaming mode reporting only weight changes
+RELAY_STREAMING:Final[bool] = True # if set, configure Acaia relay (and COSMO) scales to streaming mode, otherwise they work in non-streaming mode reporting only weight changes
 WEIGHT_ROUNDING:Final[bool] = False # if set, received weights are rounded to appropriate values based on scales readability
 # rounding for scales with readability>1 (to 4g), no rounding otherwise
 

src/artisanlib/acaia.py

@@ -1842,20 +1842,10 @@ def activateSVSlider(self, flag:bool) -> None:
 
     def showSVButtons(self) -> None:
         if self.aw.qmc.flagon and self.aw.qmc.Controlbuttonflag:
-            self.aw.buttonSVp5.setVisible(True)
-            self.aw.buttonSVp10.setVisible(True)
-            self.aw.buttonSVp20.setVisible(True)
-            self.aw.buttonSVm20.setVisible(True)
-            self.aw.buttonSVm10.setVisible(True)
-            self.aw.buttonSVm5.setVisible(True)
+            self.aw.pidbuttonFrame.setVisible(True)
 
     def hideSVButtons(self) -> None:
-        self.aw.buttonSVp5.setVisible(False)
-        self.aw.buttonSVp10.setVisible(False)
-        self.aw.buttonSVp20.setVisible(False)
-        self.aw.buttonSVm20.setVisible(False)
-        self.aw.buttonSVm10.setVisible(False)
-        self.aw.buttonSVm5.setVisible(False)
+        self.aw.pidbuttonFrame.setVisible(False)
 
     def activateONOFFeasySV(self, flag:bool) -> None:
         if flag:

src/artisanlib/canvas.py

@@ -164,7 +164,8 @@ def __init__(self, parent:'editGraphDlg', aw:'ApplicationWindow', weightIn:float
         self.coffeeinweight.setReadOnly(True)
         self.coffeeinweight.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         if sys.platform.startswith('darwin'):
-            self.coffeeinweight.setStyleSheet("border: 0.5px solid lightgrey; background-color:'lightgrey'")
+            #self.coffeeinweight.setStyleSheet("border: 0.5px solid lightgrey; background-color:'lightgrey'")
+            pass
         else:
             self.coffeeinweight.setStyleSheet("background-color:'lightgrey'")
         coffeeinweightUnit = QLabel(weight_units[weightunit])
@@ -236,7 +237,8 @@ def __init__(self, parent:'editGraphDlg', aw:'ApplicationWindow', weightIn:float
         self.coffeeoutweight.setAlignment(Qt.AlignmentFlag.AlignRight)
         self.coffeeoutweight.setReadOnly(True)
         if sys.platform.startswith('darwin'):
-            self.coffeeoutweight.setStyleSheet("border: 0.5px solid lightgrey; background-color:'lightgrey'")
+            # self.coffeeoutweight.setStyleSheet("border: 0.5px solid lightgrey; background-color:'lightgrey'")
+            pass
         else:
             self.coffeeoutweight.setStyleSheet("background-color:'lightgrey'")
         self.coffeeoutweight.setFocusPolicy(Qt.FocusPolicy.NoFocus)
@@ -2200,21 +2202,23 @@ def markPlusCoffeeFields(self, b:bool) -> None:
 
 
         # for QLineEdit
-        if b:
-            if self.aw.app.darkmode:
-                qlineedit_marked_style = 'QLineEdit { background-color: #0D658F; selection-background-color: darkgray; }'
+        # not on macOS as there seems to be an interaction between the native and Qt widget
+        if not sys.platform.startswith('darwin'):
+            if b:
+                if self.aw.app.darkmode:
+                    qlineedit_marked_style = 'QLineEdit { background-color: #0D658F; selection-background-color: darkgray; }'
+                else:
+                    qlineedit_marked_style = 'QLineEdit { background-color: #e4f3f8; selection-background-color: #424242; }'
+                self.bean_density_in_edit.setStyleSheet(qlineedit_marked_style)
+                self.bean_size_min_edit.setStyleSheet(qlineedit_marked_style)
+                self.bean_size_max_edit.setStyleSheet(qlineedit_marked_style)
+                self.moisture_greens_edit.setStyleSheet(qlineedit_marked_style)
             else:
-                qlineedit_marked_style = 'QLineEdit { background-color: #e4f3f8; selection-background-color: #424242; }'
-            self.bean_density_in_edit.setStyleSheet(qlineedit_marked_style)
-            self.bean_size_min_edit.setStyleSheet(qlineedit_marked_style)
-            self.bean_size_max_edit.setStyleSheet(qlineedit_marked_style)
-            self.moisture_greens_edit.setStyleSheet(qlineedit_marked_style)
-        else:
-            background_white_style = ''
-            self.bean_density_in_edit.setStyleSheet(background_white_style)
-            self.bean_size_min_edit.setStyleSheet(background_white_style)
-            self.bean_size_max_edit.setStyleSheet(background_white_style)
-            self.moisture_greens_edit.setStyleSheet(background_white_style)
+                background_white_style = ''
+                self.bean_density_in_edit.setStyleSheet(background_white_style)
+                self.bean_size_min_edit.setStyleSheet(background_white_style)
+                self.bean_size_max_edit.setStyleSheet(background_white_style)
+                self.moisture_greens_edit.setStyleSheet(background_white_style)
 
     def updateTitle(self, prev_coffee_label:str|None, prev_blend_label:str|None) -> None:
         titles_to_be_overwritten = [ '', QApplication.translate('Scope Title', 'Roaster Scope') ]
@@ -4934,13 +4938,14 @@ def deleteEventTable(self, _:bool = False) -> None:
 
     # mark widget w if b holds otherwise unmark it
     def markWidget(self, w:QLineEdit, b:bool) -> None:
-        if b:
-            if self.aw.app.darkmode:
-                w.setStyleSheet("""QLineEdit { background-color: #ad0427;  }""")
+        if not sys.platform.startswith('darwin'):
+            if b:
+                if self.aw.app.darkmode:
+                    w.setStyleSheet("""QLineEdit { background-color: #ad0427;  }""")
+                else:
+                    w.setStyleSheet("""QLineEdit { color: #CC0F50; }""")
             else:
-                w.setStyleSheet("""QLineEdit { color: #CC0F50; }""")
-        else:
-            w.setStyleSheet('QLineEdit { }')
+                w.setStyleSheet('QLineEdit { }')
 
     def checkWeightOut(self) -> None:
         try:

src/artisanlib/main.py

@@ -41,7 +41,7 @@
     from proto import artisan_roast_pb2 # pylint: disable=unused-import
 
 from PyQt6.QtWidgets import (QApplication, QGroupBox, QHBoxLayout,
-    QVBoxLayout, QLabel, QLineEdit, QDialogButtonBox)
+    QVBoxLayout, QLabel, QLineEdit, QDialogButtonBox, QLayout)
 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QKeySequence, QAction
 
@@ -105,11 +105,47 @@ async def send_roast(roast:'artisan_roast_pb2.Roast', token:str,
         _log.error('exception in roasthubs:send_roast: %s', e)
 
 
-def send_profile(profile:'ProfileData', org_id:str, machine_id:str, token:str,
-        on_success:Callable[[], None] | None, on_failure:Callable[[], None] | None) -> None:
+def send_profile(
+        profile:'ProfileData',
+        org_id:str,
+        machine_id:str,
+        token:str,
+        # filter conf
+        interpolate_drops:bool = True,
+        curvefilter:int = 3,
+        medfilt_factor:int = 3,
+        limit_ror:bool = True,
+        ror_limit_min:int = 0,
+        ror_limit_max:int = 170,
+        delta_span_ET:int = 20,
+        delta_span_BT:int = 20,
+        medfilt_factor_RoR:int = 3,
+        delta_ET_filter:int = 7,
+        delta_BT_filter:int = 7,
+        # handlers
+        on_success:Callable[[], None] | None = None,
+        on_failure:Callable[[], None] | None = None) -> None:
     if org_id != '' and machine_id != '' and token != '':
         # only if org_id and machin_id are not empty the connector is active
-        roast:artisan_roast_pb2.Roast|None = roast_message(profile, org_id=org_id, machine_id=machine_id) # pylint: disable=no-member
+        roast:artisan_roast_pb2.Roast|None = roast_message( # pylint: disable=no-member
+                profile,
+                org_id=org_id,
+                machine_id=machine_id,
+                # filter conf
+                interpolate_drops=interpolate_drops,
+                smooth_curves=True,
+                curvefilter=curvefilter,
+                medfilt_factor=medfilt_factor,
+                decay_smoothing_p=False, # optimal smoothing # qmc.optimalSmoothing
+                limit_ror=limit_ror,
+                ror_limit_min=ror_limit_min,
+                ror_limit_max=ror_limit_max,
+                delta_span_ET=delta_span_ET,
+                delta_span_BT=delta_span_BT,
+                medfilt_factor_RoR=medfilt_factor_RoR,
+                delta_ET_filter=delta_ET_filter,
+                delta_BT_filter=delta_BT_filter
+            ) # pylint: disable=no-member
         if roast is not None:
             with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
                 executor.submit(asyncio.run, send_roast(roast, token, on_success, on_failure))
@@ -228,7 +264,10 @@ def __init__(self, aw:'ApplicationWindow') -> None:
         layout.addLayout(buttonLayout)
         layout.setContentsMargins(10, 10, 10, 10)
         layout.setSpacing(5)
-        self.setLayout(layout)
+
+        # not resizable
+        layout.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize)
+        self.setSizeGripEnabled(False)
 
 
     @pyqtSlot(str)

src/artisanlib/pid_control.py

@@ -34,7 +34,7 @@
 if TYPE_CHECKING:
     from artisanlib.main import ApplicationWindow # noqa: F401 # pylint: disable=unused-import
 
-from PyQt6.QtWidgets import (QApplication, QGroupBox, QHBoxLayout,
+from PyQt6.QtWidgets import (QApplication, QGroupBox, QHBoxLayout, QLayout,
     QVBoxLayout, QLabel, QLineEdit, QToolButton, QDialogButtonBox, QComboBox)
 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QKeySequence, QAction, QIcon
@@ -543,7 +543,10 @@ def __init__(self, aw:'ApplicationWindow', client_id:str, client_secret:str) ->
         layout.addLayout(buttonLayout)
         layout.setContentsMargins(10, 10, 10, 10)
         layout.setSpacing(5)
-        self.setLayout(layout)
+
+        # not resizable
+        layout.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize)
+        self.setSizeGripEnabled(False)
 
     @pyqtSlot(str)
     def textChanged(self, _:str) -> None: