- adds two more MODBUS device channels

- adds autoCHARGE/autoDROP recognition to the IMF 'control' setup which picks up CHARGE and DROP events from the machine
- adds Midnight Glow theme
- adds support for MAX subscription
- adds Config menu item to update machine name
- moves settings menu items to Expert mode
- UI updates (round elements, friendly icons, improved layout, nice tables, reworked events editor)
- improved performance on theme loading
- replaces QTextEdit by the faster QPlainTextEdit in various places
- simplified about box
- improved MODBUS/S7 scanner
- removed all png icons
- some code refactoring reducing duplicate code

Author: MAKOMO

src/artisan-mac.spec

@@ -277,6 +277,7 @@ Qt_modules = [
     'QtNetwork',
     'QtDBus',
     'QtPdf',
+    'QtSvgWidgets',
 ]
 Qt_frameworks = [module + '.framework' for module in Qt_modules]
 

src/artisanlib/alarms.py

@@ -44,6 +44,7 @@
 from artisanlib.dialogs import ArtisanResizeablDialog
 from artisanlib.widgets import (MyQComboBox, MyTableWidgetItemNumber, MyTableWidgetItemQCheckBox,
                                 MyTableWidgetItemQComboBox, MyTableWidgetItemQLineEdit, MyTableWidgetItemQTime)
+from artisanlib.table_style import horizontal_header_style
 
 
 from PyQt6.QtCore import (Qt, pyqtSlot, QSettings, QTimer)
@@ -79,6 +80,9 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
 
         #table for alarms
         self.alarmtable = QTableWidget()
+        horizontal_header = self.alarmtable.horizontalHeader()
+        if horizontal_header is not None:
+            horizontal_header.setStyleSheet(horizontal_header_style(self.aw.app.darkmode))
         self.alarmtable.itemSelectionChanged.connect(self.selectionChanged)
         allonButton = QPushButton(QApplication.translate('Button','All On'))
         allonButton.clicked.connect(self.alarmsAllOn)

src/artisanlib/background.py

@@ -32,6 +32,8 @@
 from artisanlib.util import deltaLabelUTF8, deltaLabelPrefix, stringfromseconds
 from artisanlib.dialogs import ArtisanResizeablDialog
 from artisanlib.widgets import (MyTableWidgetItemNumber)
+from artisanlib.table_style import horizontal_header_style, vertical_header_style
+
 from typing import override, Final, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -185,6 +187,13 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
         #TAB 2 EVENTS
         #table for showing events
         self.eventtable = QTableWidget()
+        horizontal_header = self.eventtable.horizontalHeader()
+        if horizontal_header is not None:
+            horizontal_header.setStyleSheet(horizontal_header_style(self.aw.app.darkmode))
+        vertical_header = self.eventtable.verticalHeader()
+        if vertical_header is not None:
+            vertical_header.setStyleSheet(vertical_header_style(self.aw.app.darkmode))
+            vertical_header.setDefaultAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignVCenter)
         self.eventtable.setTabKeyNavigation(True)
         self.copyeventTableButton = QPushButton(QApplication.translate('Button', 'Copy Table'))
         self.copyeventTableButton.setToolTip(QApplication.translate('Tooltip','Copy table to clipboard, OPTION or ALT click for tabular text'))
@@ -195,6 +204,13 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
         #TAB 3 DATA
         #table for showing data
         self.datatable = QTableWidget()
+        horizontal_header = self.datatable.horizontalHeader()
+        if horizontal_header is not None:
+            horizontal_header.setStyleSheet(horizontal_header_style(self.aw.app.darkmode))
+        vertical_header = self.datatable.verticalHeader()
+        if vertical_header is not None:
+            vertical_header.setStyleSheet(vertical_header_style(self.aw.app.darkmode))
+            vertical_header.setDefaultAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignVCenter)
         self.datatable.setTabKeyNavigation(True)
         self.copydataTableButton = QPushButton(QApplication.translate('Button', 'Copy Table'))
         self.copydataTableButton.setToolTip(QApplication.translate('Tooltip','Copy table to clipboard, OPTION or ALT click for tabular text'))

src/artisanlib/canvas.py

@@ -1016,6 +1016,7 @@ def __init__(self, parent:QWidget, dpi:int, locale:str, aw:'ApplicationWindow')
                        '+MQTT 78',                   #204
                        '+MQTT 910',                  #205
                        '+MQTT 1112',                 #206
+                       '+MODBUS 1112',               #207
                        ]
 
         # ADD DEVICE:
@@ -4492,10 +4493,9 @@ def updateLargeExtraLCDs(self, extra1:list[str|None]|None = None, extra2:list[st
             _log.exception(e)
 
 
-    # ADD DEVICE:
-
     # returns True if the extra device n, channel c, is of type MODBUS or S7, has no factor defined, nor any math formula, and is of type int
     # channel c is either 0 or 1
+    # ADD DEVICE:
     @functools.cache # noqa: B019 # pylint: disable=W1518 # Not relevant here, as qmc is only created once: [B019] Use of `functools.lru_cache` or `functools.cache` on methods can lead to memory leaks
     def intChannel(self, n:int, c:int) -> bool:
         if len(self.extradevices) > n:
@@ -4505,7 +4505,7 @@ def intChannel(self, n:int, c:int) -> bool:
             if c == 1:
                 no_math_formula_defined = bool(self.extramathexpression2[n] == '')
             # MODBUS channels
-            for idx, dev_type in enumerate([29,33,55,109,150]): # MODBUS, MODBUS_34, MODBUS_56, MODBUS_78, MODBUS_910
+            for idx, dev_type in enumerate([29,33,55,109,150,207]): # MODBUS, MODBUS_34, MODBUS_56, MODBUS_78, MODBUS_910, MODBUS_1112
                 if self.extradevices[n] == dev_type:
                     return ((self.aw.modbus.inputFloatsAsInt[idx*2 + c] or self.aw.modbus.inputBCDsAsInt[idx*2 + c] or not self.aw.modbus.inputFloats[idx*2 + c]) and
                         self.aw.modbus.inputDivs[idx*2 + c] == 0 and
@@ -5531,7 +5531,7 @@ def updateLCDs(self, time:float|None, temp1:list[float], temp2:list[float], delt
                 if i < self.aw.nLCDS:
                     try:
                         extra1_value = resLCD
-                        if idx is not None and XTs1[i] and idx < len(XTs1[i]):
+                        if idx is not None and i < len(XTs1) and idx < len(XTs1[i]):
                             fmt = lcdformat
                             v = float(XTs1[i][idx])
                             if v != -1:
@@ -5553,7 +5553,7 @@ def updateLCDs(self, time:float|None, temp1:list[float], temp2:list[float], delt
                         self.aw.extraLCD1[i].display(extra1_value)
                     try:
                         extra2_value = resLCD
-                        if idx is not None and XTs2[i] and idx < len(XTs2[i]):
+                        if idx is not None and i < len(XTs2) and idx < len(XTs2[i]):
                             fmt = lcdformat
                             v = float(XTs2[i][idx])
                             if v != -1:
@@ -9275,9 +9275,9 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
 
                     decay_smoothing_p = (not self.optimalSmoothing) or self.flagon
 
-                    scale = 1 if self.graphstyle == 1 else 0
-                    length = 700 # 100 (128 the default)
-                    randomness = 12 # 2 (16 default)
+                    scale = 1.5 if self.graphstyle == 1 else 0
+                    length = 800 # 100 (128 the default)
+                    randomness = 16 # 2 (16 default)
                     rcParams['path.sketch'] = (scale, length, randomness)
 
                     # if no axis are set, we need to forceRenewAxis in any case
@@ -12574,7 +12574,6 @@ def changeGColor(self, color:int) -> None:
                 self.EvalueColor = self.EvalueColor_default.copy()
                 self.EvalueTextColor = self.EvalueTextColor_default.copy()
                 self.aw.sendmessage(QApplication.translate('Message','Colors set to defaults'))
-#                self.aw.closeEventSettings()
 
         elif color == 2:
             self.aw.sendmessage(QApplication.translate('Message','Colors set to grey'))
@@ -12596,7 +12595,6 @@ def changeGColor(self, color:int) -> None:
             self.backgroundxtcolor      = self.aw.convertToGreyscale(self.backgroundxtcolor)
             self.backgroundytcolor      = self.aw.convertToGreyscale(self.backgroundytcolor)
             self.aw.setLCDsBW()
-#            self.aw.closeEventSettings()
 
         elif color == 3:
             from artisanlib.colors import graphColorDlg
@@ -12640,23 +12638,15 @@ def changeGColor(self, color:int) -> None:
                 self.backgrounddeltabtcolor = str(dialog.bgdeltabtButton.text())
                 self.backgroundxtcolor = str(dialog.bgextraButton.text())
                 self.backgroundytcolor = str(dialog.bgextra2Button.text())
-#                self.aw.closeEventSettings()
-
-#            #deleteLater() will not work here as the dialog is still bound via the parent
-#            #dialog.deleteLater() # now we explicitly allow the dialog an its widgets to be GCed
-#            # the following will immediately release the memory despite this parent link
-#            QApplication.processEvents() # we ensure events concerning this dialog are processed before deletion
-#            try: # sip not supported on older PyQt versions (RPi!)
-#                sip.delete(dialog)
-#                #print(sip.isdeleted(dialog))
-#            except Exception:  # pylint: disable=broad-except
-#                pass
+                # release the dialog
+                dialog.destroy()
+                del dialog
 
         #update screen with new colors
         self.aw.updateCanvasColors()
         self.aw.applyStandardButtonVisibility()
         self.aw.update_extraeventbuttons_visibility()
-        self.fig.canvas.draw_idle() #.redraw()
+        self.fig.canvas.draw_idle()
 
     def clearFlavorChart(self) -> None:
         self.flavorchart_plotf = None
@@ -12950,6 +12940,7 @@ def StopAsyncSamplingAction(self) -> None:
     # indicating which curves should not be temperature converted
     # True indicates a non-temperature device (data should not be converted)
     # False indicates a temperature device (data should be converted if temperature unit changes)
+    # ADD DEVICE:
     def generateNoneTempHints(self) -> None:
         self.extraNoneTempHint1 = []
         self.extraNoneTempHint2 = []
@@ -12969,6 +12960,12 @@ def generateNoneTempHints(self) -> None:
             elif d == 109: # +MODBUS 78
                 self.extraNoneTempHint1.append(self.aw.modbus.inputModes[6] == '')
                 self.extraNoneTempHint2.append(self.aw.modbus.inputModes[7] == '')
+            elif d == 150: # +MODBUS 910
+                self.extraNoneTempHint1.append(self.aw.modbus.inputModes[8] == '')
+                self.extraNoneTempHint2.append(self.aw.modbus.inputModes[9] == '')
+            elif d == 207: # +MODBUS 1112
+                self.extraNoneTempHint1.append(self.aw.modbus.inputModes[10] == '')
+                self.extraNoneTempHint2.append(self.aw.modbus.inputModes[11] == '')
             elif d == 79: # S7
                 self.extraNoneTempHint1.append(not bool(self.aw.s7.mode[0]))
                 self.extraNoneTempHint2.append(not bool(self.aw.s7.mode[1]))
@@ -12999,9 +12996,6 @@ def generateNoneTempHints(self) -> None:
             elif d == 119: # +WebSocket 910
                 self.extraNoneTempHint1.append(not bool(self.aw.ws.channel_modes[8]))
                 self.extraNoneTempHint2.append(not bool(self.aw.ws.channel_modes[9]))
-            elif d == 150: # +MODBUS 910
-                self.extraNoneTempHint1.append(self.aw.modbus.inputModes[8] == '')
-                self.extraNoneTempHint2.append(self.aw.modbus.inputModes[9] == '')
             elif d == 151: # +S7 1112
                 self.extraNoneTempHint1.append(not bool(self.aw.s7.mode[10]))
                 self.extraNoneTempHint2.append(not bool(self.aw.s7.mode[11]))

src/artisanlib/comm.py

@@ -591,7 +591,8 @@ def __init__(self, aw:'ApplicationWindow') -> None:
                                    self.MQTT_56,                     #203
                                    self.MQTT_78,                     #204
                                    self.MQTT_910,                    #205
-                                   self.MQTT_1112                    #206
+                                   self.MQTT_1112,                   #206
+                                   self.MODBUS_1112,                 #207
                                    ]
         #string with the name of the program for device #27
         self.externalprogram:str = 'test.py'
@@ -1664,6 +1665,9 @@ def MODBUS_78(self) -> tuple[float,float,float]:
     def MODBUS_910(self) -> tuple[float,float,float]:
         return self.aw.extraMODBUStx,self.aw.extraMODBUStemps[9],self.aw.extraMODBUStemps[8]
 
+    def MODBUS_1112(self) -> tuple[float,float,float]:
+        return self.aw.extraMODBUStx,self.aw.extraMODBUStemps[11],self.aw.extraMODBUStemps[10]
+
     def HH802U(self) -> tuple[float,float,float]:
         tx = self.aw.qmc.timeclock.elapsedMilli()
         t2,t1 = self.HH806AUtemperature()

src/artisanlib/comparator.py

@@ -51,6 +51,7 @@
 from artisanlib.dialogs import ArtisanDialog
 from artisanlib.widgets import MyQComboBox
 from artisanlib.qcheckcombobox import CheckComboBox
+from artisanlib.table_style import horizontal_header_style, vertical_header_style
 
 with suppress_stdout_stderr():
     from matplotlib import colormaps # pyrefly:ignore[missing-module-attribute]
@@ -1062,19 +1063,20 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', foreground:str|None =
         settings1Layout = QHBoxLayout()
         settings1Layout.addWidget(self.modeComboBox)
         settings1Layout.addStretch()
-        settings1Layout.addSpacing(10)
-        settings1Layout.addStretch()
+        settings1Layout.addSpacing(8)
         settings1Layout.addWidget(alignLabel)
+        settings1Layout.addSpacing(4)
         settings1Layout.addWidget(self.alignComboBox)
 
         settings2Layout = QHBoxLayout()
         settings2Layout.addWidget(self.cb)
-        settings1Layout.addSpacing(2)
+        settings2Layout.addSpacing(4)
         settings2Layout.addWidget(self.eventsComboBox)
 
         settingsLayout = QVBoxLayout()
         settingsLayout.addLayout(settings2Layout)
         settingsLayout.addLayout(settings1Layout)
+        settingsLayout.setSpacing(2)
 
         buttonLayout = QHBoxLayout()
         buttonLayout.addStretch()
@@ -1575,33 +1577,33 @@ def createProfileTable(self) -> None:
             vheader: QHeaderView|None = self.profileTable.verticalHeader()
             if vheader is not None:
                 vheader.setSectionResizeMode(QHeaderView.ResizeMode.Fixed)
+                vheader.setSectionsMovable(True)
+                vheader.setDragDropMode(QTableWidget.DragDropMode.InternalMove)
+                vheader.sectionMoved.connect(self.sectionMoved)
+                vheader.sectionDoubleClicked.connect(self.tableSectionClicked)
+                vheader.setStyleSheet(vertical_header_style(self.aw.app.darkmode))
+                vheader.setDefaultAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignVCenter)
+
+
             self.profileTable.setHorizontalHeaderLabels(['',
                                                          QApplication.translate('Label','ON'),
                                                          QApplication.translate('Label','Title')])
-            hheader: QHeaderView|None = self.profileTable.horizontalHeader()
-            if hheader is not None:
-                hheader.sectionClicked.connect(self.columnHeaderClicked)
             self.profileTable.setCornerButtonEnabled(True) # click in the left header corner selects all entries in the table
             self.profileTable.setSortingEnabled(False)
 
-            vheader = self.profileTable.verticalHeader()
-            if vheader is not None:
-                vheader.setSectionsMovable(True)
-                vheader.setDragDropMode(QTableWidget.DragDropMode.InternalMove)
-                vheader.sectionMoved.connect(self.sectionMoved)
-                vheader.sectionDoubleClicked.connect(self.tableSectionClicked)
-
             self.profileTable.itemSelectionChanged.connect(self.selectionChanged)
             self.profileTable.deleteKeyPressed.connect(self.deleteSelected)
 
             header: QHeaderView|None = self.profileTable.horizontalHeader()
             if header is not None:
+                header.sectionClicked.connect(self.columnHeaderClicked)
                 header.setStretchLastSection(True)
                 header.setMinimumSectionSize(10)  # color column size
 #                header.setSectionResizeMode(0, QHeaderView.ResizeMode.Fixed)
                 header.setSectionResizeMode(0, QHeaderView.ResizeMode.ResizeToContents)
                 header.setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)
                 header.setSectionResizeMode(2, QHeaderView.ResizeMode.Stretch)
+                header.setStyleSheet(horizontal_header_style(self.aw.app.darkmode))
 
             self.profileTable.setColumnWidth(0,10) # color column size
             self.profileTable.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)