- fixes Issue #1781

- corrects energy defaults for some Giesen setups - extends energy defaults to latest electric Probat machines - translation updates
artisan-roaster-scope · Jan 17, 2025 · 4a9fe82 · 4a9fe82
1 parent 3c2395a
commit 4a9fe82
Show file tree

Hide file tree

Showing 38 changed files with 35,294 additions and 34,239 deletions.
diff --git a/src/artisanlib/main.py b/src/artisanlib/main.py
@@ -4182,7 +4182,7 @@ def __init__(self, parent:Optional[QWidget] = None, *, locale:str, WebEngineSupp
         QTimer.singleShot(2000,self.donate)
 
         QTimer.singleShot(0, self.logStartupTime)
-        QTimer.singleShot(200, self.updateBadge)
+        QTimer.singleShot(500, self.updateBadge)
 
         self.zoomInShortcut = QShortcut(QKeySequence.StandardKey.ZoomIn, self)
         self.zoomInShortcut.activated.connect(self.zoomIn)
@@ -23908,7 +23908,7 @@ def stopdesigner(self) -> None:
     @pyqtSlot()
     @pyqtSlot(bool)
     def editgraph(self, _:bool = False) -> None:
-        if self.editgraphdialog is not False: # Roast Properties dialog is not blocked!
+        if self.editgraphdialog is not False and self.editgraphdialog is None: # Roast Properties dialog is not blocked!
             from artisanlib.roast_properties import editGraphDlg
             self.editgraphdialog = editGraphDlg(self,self,self.editGraphDlg_activeTab)
             self.editgraphdialog.show()

diff --git a/src/includes/Machines/Giesen/W140A_v1.aset b/src/includes/Machines/Giesen/W140A_v1.aset
@@ -173,4 +173,5 @@ etypes=, , SP, , --
 renderEventsDescr=false
 
 [EnergyDefaults]
-ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x1\x17\x80\x4\x95\f\x1\0\0\0\0\0\0}\x94K\x2}\x94G@F\x80\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(K\x80G@#ffffffK\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x1K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuss.)
+ratings="@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x1\x18\x80\x4\x95\r\x1\0\0\0\0\0\0}\x94K\x2}\x94G@a\x80\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(M\x9c\x1G@;\x87\xae\x14z\xe1HK\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x1K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuss.)"
+
diff --git a/src/includes/Machines/Giesen/W140A_v2.aset b/src/includes/Machines/Giesen/W140A_v2.aset
@@ -173,4 +173,5 @@ etypes=, , SP, , --
 renderEventsDescr=false
 
 [EnergyDefaults]
-ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x1\x17\x80\x4\x95\f\x1\0\0\0\0\0\0}\x94K\x2}\x94G@F\x80\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(K\x80G@#ffffffK\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x1K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuss.)
+ratings="@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x1\x18\x80\x4\x95\r\x1\0\0\0\0\0\0}\x94K\x2}\x94G@a\x80\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(M\x9c\x1G@;\x87\xae\x14z\xe1HK\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x1K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuss.)"
+
diff --git a/src/includes/Machines/Giesen/W60A.aset b/src/includes/Machines/Giesen/W60A.aset
@@ -173,4 +173,4 @@ etypes=, , SP, , --
 renderEventsDescr=false
 
 [EnergyDefaults]
-ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x1\x17\x80\x4\x95\f\x1\0\0\0\0\0\0}\x94K\x2}\x94G@F\x80\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(K\x80G@#ffffffK\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x1K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuss.)
+ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x1\x10\x80\x4\x95\x5\x1\0\0\0\0\0\0}\x94K\x2}\x94G@N\0\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(K\xaeK\fK\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x1K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuss.)
diff --git a/src/includes/Machines/Probat/P_Series_III.aset b/src/includes/Machines/Probat/P_Series_III.aset
@@ -117,4 +117,4 @@ request_data_command=getCurrentRoastingStep
 request_timeout=0.5
 
 [EnergyDefaults]
-ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x4{\x80\x4\x95p\x4\0\0\0\0\0\0}\x94(K\x1}\x94(K\x5}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Motors\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(G@+\xb8Q\xeb\x85\x1e\xb8G?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\0K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuK\f}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\x1cG?\xf8\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\0K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\x19}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K7G@\x6\x66\x66\x66\x66\x66\x66K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\0K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuuK\x2}\x94(K\x5}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(G@+\xb8Q\xeb\x85\x1e\xb8G?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x1K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\f}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\x1cG?\xf8\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x1K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\x19}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K7G@\x6\x66\x66\x66\x66\x66\x66K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x1K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuuK\x3}\x94(K\x1}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\vG?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\x5}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\x11G?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuuu.)
+ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x5m\x80\x4\x95\x62\x5\0\0\0\0\0\0}\x94(K\x1}\x94(K\x5}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6\x42urner\x94\x8c\x6Motors\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(G@+\xb8Q\xeb\x85\x1e\xb8G?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\0K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuK\f}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\x1cG?\xf8\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\0K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\x19}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K7G@\x6\x66\x66\x66\x66\x66\x66K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\0K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuuK\x2}\x94(K\x5}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(G@+\xb8Q\xeb\x85\x1e\xb8G?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x1K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\f}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\x1cG?\xf8\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x1K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\x19}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K7G@\x6\x66\x66\x66\x66\x66\x66K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x1K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuuK\x3}\x94(K\x1}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\vG?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\x5}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\x11G?\xf3\x33\x33\x33\x33\x33\x33K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\f}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(K\x1eG?\xf8\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuK\x19}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(KAG@\x6\x66\x66\x66\x66\x66\x66K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuuu.)
diff --git a/src/plus/schedule.py b/src/plus/schedule.py
@@ -1282,7 +1282,7 @@ def itemMenu(self) -> None:
             addToItemAction.triggered.connect(self.addLoadedProfileToSelectedScheduleItem)
             self.menu.addAction(addToItemAction)
         if is_hidden(self.data):
-            showaction:QAction = QAction(QApplication.translate('Contextual Menu', 'Show'),self)
+            showaction:QAction = QAction(QApplication.translate('CheckBox', 'Show'),self)
             showaction.triggered.connect(self.showItem)
             self.menu.addAction(showaction)
         else:
@@ -2723,8 +2723,8 @@ def openScheduleItemsCount(aw:'ApplicationWindow') -> int:
                     pass # validation fails for outdated items
             today:datetime.date = datetime.datetime.now(datetime.timezone.utc).astimezone().date()
             return sum(max(0, x.count - len(x.roasts)) for x in scheduled_items if aw.scheduledItemsfilter(today, x, is_hidden(x)))
-        except Exception as e:  # pylint: disable=broad-except
-            _log.exception(e)
+        except Exception:  # pylint: disable=broad-except
+#            _log.exception(e) # this can raise an exception on macOS if Artisan is started using sudo as the logging framework might not fully initialized
             return 0
 
     @pyqtSlot()