adds containers

Author: MAKOMO

src/artisanlib/canvas.py

@@ -2444,6 +2444,10 @@ def dummy_or_special_device(self, device_id:int, channel_offset:int) -> bool:
              device_id in self.specialDevices
              )
 
+    def get_container_weight(self, container_idx:int) -> Optional[int]:
+        if len(self.container_weights) > container_idx >= 0:
+            return self.container_weights[container_idx]
+        return None
 
     # toggles the y cursor coordinate see self.fmt_data_curve
     def nextFmtDataCurve(self) -> None:

src/artisanlib/devices.py

@@ -20,19 +20,20 @@
 import re
 
 try:
-    from PyQt6.QtCore import Qt, QEvent, QSettings, pyqtSlot, QRegularExpression # @UnusedImport @Reimport  @UnresolvedImport
+    from PyQt6.QtCore import Qt, QEvent, QSettings, pyqtSlot, pyqtSignal, QRegularExpression # @UnusedImport @Reimport  @UnresolvedImport
     from PyQt6.QtWidgets import (QApplication, QWidget, QDialog, QMessageBox, QDialogButtonBox, QTextEdit,  # @UnusedImport @Reimport  @UnresolvedImport
-                QHBoxLayout, QVBoxLayout, QLabel, QLineEdit, QLayout)  # @UnusedImport @Reimport  @UnresolvedImport
+                QHBoxLayout, QVBoxLayout, QLabel, QLineEdit, QLayout, QTableWidget, QHeaderView, QPushButton)  # @UnusedImport @Reimport  @UnresolvedImport
     from PyQt6.QtGui import QKeySequence, QAction, QIntValidator, QTextCharFormat, QTextCursor, QColor  # @UnusedImport @Reimport  @UnresolvedImport
 except ImportError:
-    from PyQt5.QtCore import Qt, QEvent, QSettings, pyqtSlot, QRegularExpression # type: ignore # @UnusedImport @Reimport  @UnresolvedImport
+    from PyQt5.QtCore import Qt, QEvent, QSettings, pyqtSlot, pyqtSignal, QRegularExpression # type: ignore # @UnusedImport @Reimport  @UnresolvedImport
     from PyQt5.QtWidgets import (QApplication, QWidget, QAction, QDialog, QMessageBox, QDialogButtonBox, QTextEdit, # type: ignore # @UnusedImport @Reimport  @UnresolvedImport
-                QHBoxLayout, QVBoxLayout, QLabel, QLineEdit, QLayout) # @UnusedImport @Reimport  @UnresolvedImport
+                QHBoxLayout, QVBoxLayout, QLabel, QLineEdit, QLayout, QTableWidget, QHeaderView, QPushButton) # @UnusedImport @Reimport  @UnresolvedImport
     from PyQt5.QtGui import QKeySequence, QIntValidator, QTextCharFormat, QTextCursor, QColor # type: ignore # @UnusedImport @Reimport  @UnresolvedImport
 
-from artisanlib.widgets import MyQComboBox
+from artisanlib.widgets import MyQComboBox, ClickableQLineEdit
+from artisanlib.util import comma2dot
 
-from typing import Optional, List, Tuple, TYPE_CHECKING
+from typing import Optional, List, Tuple, cast, Callable, TYPE_CHECKING
 from typing import Final  # Python <=3.7
 if TYPE_CHECKING:
     from artisanlib.main import ApplicationWindow # pylint: disable=unused-import
@@ -179,15 +180,15 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', title:str = '', conte
         # Initialize search state variables
         self.matches: List[QTextCursor] = []
         self.current_match_index = 0
-        self.previous_search_term = ""
+        self.previous_search_term = ''
 
         # Search bar
         self.search_input = QLineEdit()
         self.search_input.setPlaceholderText(QApplication.translate('Label', 'Enter text to search'))
 
         # Connect Enter key to search and navigate results
         self.search_input.returnPressed.connect(self.doSearch)
-        
+
         # Show only the ArtisanDialog standard OK button
         self.dialogbuttons.removeButton(self.dialogbuttons.button(QDialogButtonBox.StandardButton.Cancel))
 
@@ -251,31 +252,31 @@ def doSearch(self) -> None:
         tc = self.phelp.textCursor()
         tc.clearSelection()
         self.phelp.setTextCursor(tc)
-        
+
         search_term = self.search_input.text().strip()
-        
+
         # Clear highlights and state when search term is empty
-        if search_term == "":
+        if search_term == '':
             self.matches = []
-            self.previous_search_term = ""
+            self.previous_search_term = ''
             return
 
         # Do a fresh search when a new search_term is entered
         if self.previous_search_term.lower() != search_term.lower():
             self.previous_search_term = search_term
             self.current_match_index = 0
             self.matches = []
-            
+
             # Create a case-insensitive regular expression.
             regex = QRegularExpression(re.escape(search_term))
             regex.setPatternOptions(QRegularExpression.PatternOption.CaseInsensitiveOption)
-            
+
             # Start at the beginning of the document.
             cursor = self.phelp.textCursor()
             cursor.movePosition(QTextCursor.MoveOperation.Start)
-            
+
             # Collect all matches.
-            for _ in range(500000):  # arbitrarily large limit, better than while True, should always exit via break 
+            for _ in range(500000):  # arbitrarily large limit, better than while True, should always exit via break
                 found = self.phelp.document().find(regex, cursor)  # type: ignore  #self.phelp.document() will never be None
                 if found.isNull():
                     break
@@ -293,10 +294,10 @@ def doSearch(self) -> None:
             self.current_match_index = (self.current_match_index + 1) % len(self.matches)
 
         extraSelections = []
-        match_text = "black"
-        current_match_highlight = "#A6FF00" 
-        extra_matches_highlight = "yellow"
-        
+        match_text = 'black'
+        current_match_highlight = '#A6FF00'
+        extra_matches_highlight = 'yellow'
+
         if self.matches:
             # Highlight all matches, the current match in current_match_highlight and all others in extra_matches_highlight
             for i, matchCursor in enumerate(self.matches):
@@ -309,7 +310,7 @@ def doSearch(self) -> None:
                 else:
                     fmt.setBackground(QColor(extra_matches_highlight))
                 if self.aw.app.darkmode:
-                    fmt.setForeground(QColor("black"))
+                    fmt.setForeground(QColor('black'))
                 selection.format = fmt
                 extraSelections.append(selection)
             # Move the visible cursor to the current match and clear its active selection
@@ -578,3 +579,153 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', value:int, value_min:
     def accept(self) -> None:
         self.value = int(self.valueEdit.text())
         super().accept()
+
+
+##########################################################################
+#####################  VIEW Tare  ########################################
+##########################################################################
+
+
+class tareDlg(ArtisanDialog):
+    tare_updated_signal = pyqtSignal()  # signalled after tare data table got updated
+
+    def __init__(self, parent:ArtisanDialog, aw:'ApplicationWindow', get_scale_weight: Callable[[], Optional[float]]) -> None:
+        super().__init__(parent, aw)
+        self.parent_dialog = parent
+        self.get_scale_weight = get_scale_weight
+        self.setModal(True)
+        self.setWindowTitle(QApplication.translate('Form Caption','Containers'))
+
+        self.taretable = QTableWidget()
+        self.taretable.setTabKeyNavigation(True)
+        self.createTareTable()
+
+        self.taretable.itemSelectionChanged.connect(self.selectionChanged)
+
+        addButton = QPushButton(QApplication.translate('Button','Add'))
+        addButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        self.delButton = QPushButton(QApplication.translate('Button','Delete'))
+        self.delButton.setDisabled(True)
+        self.delButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+
+        addButton.clicked.connect(self.addTare)
+        self.delButton.clicked.connect(self.delTare)
+
+        okButton = QPushButton(QApplication.translate('Button','OK'))
+        cancelButton = QPushButton(QApplication.translate('Button','Cancel'))
+        cancelButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        okButton.clicked.connect(self.accept)
+        cancelButton.clicked.connect(self.reject)
+        contentbuttonLayout = QHBoxLayout()
+        contentbuttonLayout.addStretch()
+        contentbuttonLayout.addWidget(addButton)
+        contentbuttonLayout.addWidget(self.delButton)
+        contentbuttonLayout.addStretch()
+
+        buttonLayout = QHBoxLayout()
+        buttonLayout.addStretch()
+        buttonLayout.addWidget(cancelButton)
+        buttonLayout.addWidget(okButton)
+        layout = QVBoxLayout()
+        layout.addWidget(self.taretable)
+        layout.addLayout(contentbuttonLayout)
+        layout.addLayout(buttonLayout)
+        self.setLayout(layout)
+        self.setMinimumWidth(230)
+        self.setMinimumHeight(250)
+
+    @pyqtSlot()
+    def selectionChanged(self) -> None:
+        if len(self.taretable.selectedRanges()) > 0:
+            self.delButton.setDisabled(False)
+        else:
+            self.delButton.setDisabled(False)
+
+    @pyqtSlot()
+    def accept(self) -> None:
+        self.saveTareTable()
+        self.tare_updated_signal.emit()
+        self.close()
+        super().accept()
+
+    def setTableRow(self, row:int, name:str, weight:float) -> None:
+        name_widget = QLineEdit()
+        name_widget.setAlignment(Qt.AlignmentFlag.AlignRight)
+        name_widget.setText(name)
+        weight_widget = ClickableQLineEdit()
+        weight_widget.setAlignment(Qt.AlignmentFlag.AlignRight)
+        weight_widget.setText(str(weight))
+        weight_widget.setValidator(QIntValidator(0,1999, weight_widget))
+        weight_widget.editingFinished.connect(self.weightEdited)
+        self.taretable.setCellWidget(row, 0, name_widget)
+        self.taretable.setCellWidget(row, 1, weight_widget)
+
+    @pyqtSlot(bool)
+    def addTare(self, _:bool = False) -> None:
+        rows = self.taretable.rowCount()
+        self.taretable.setRowCount(rows + 1)
+        weight = self.get_scale_weight() # read value from scale in 'g' (or None)
+        if weight is None or weight < 0:
+            weight = 0
+        #add widgets to the table
+        self.setTableRow(rows, QApplication.translate('Label', 'container'), weight)
+
+    @pyqtSlot(bool)
+    def delTare(self, _:bool = False) -> None:
+        selected = self.taretable.selectedRanges()
+        if len(selected) > 0:
+            bindex = selected[0].topRow()
+            if bindex >= 0:
+                self.taretable.removeRow(bindex)
+
+    def saveTareTable(self) -> None:
+        tars = self.taretable.rowCount()
+        names = []
+        weights = []
+        for i in range(tars):
+            nameWidget = cast(QLineEdit, self.taretable.cellWidget(i,0))
+            name = nameWidget.text()
+            weightWidget = cast(QLineEdit, self.taretable.cellWidget(i,1))
+            weight = 0
+            try:
+                weight = int(round(float(comma2dot(weightWidget.text()))))
+            except Exception: # pylint: disable=broad-except
+                pass
+            names.append(name)
+            weights.append(weight)
+        self.aw.qmc.container_names = names
+        self.aw.qmc.container_weights = weights
+
+    @pyqtSlot()
+    def weightEdited(self) -> None:
+        _log.debug('PRINT weightEdited')
+        sender = self.sender()
+        if sender and isinstance(sender, QLineEdit):
+            text = sender.text().strip()
+            if text == '':
+                w = self.get_scale_weight() # read value from scale in 'g'
+                sender.setText(str(w if w is not None and w > 0 else 0))
+
+    def createTareTable(self) -> None:
+        self.taretable.clear()
+        self.taretable.setRowCount(len(self.aw.qmc.container_names))
+        self.taretable.setColumnCount(2)
+        self.taretable.setHorizontalHeaderLabels([QApplication.translate('Table','Name'),
+                                                         QApplication.translate('Table','Weight')])
+        self.taretable.setAlternatingRowColors(True)
+        self.taretable.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
+        self.taretable.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows)
+        self.taretable.setSelectionMode(QTableWidget.SelectionMode.SingleSelection)
+        self.taretable.setShowGrid(True)
+        vheader: Optional[QHeaderView] = self.taretable.verticalHeader()
+        if vheader is not None:
+            vheader.setSectionResizeMode(QHeaderView.ResizeMode.Fixed)
+        for i, cn in enumerate(self.aw.qmc.container_names):
+            #add widgets to the table
+            self.setTableRow(i, cn, self.aw.qmc.container_weights[i])
+
+        header: Optional[QHeaderView] = self.taretable.horizontalHeader()
+        if header is not None:
+            header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch)
+            header.setSectionResizeMode(1, QHeaderView.ResizeMode.Fixed)
+        self.taretable.setColumnWidth(1,65)

src/artisanlib/dialogs.py

@@ -1496,7 +1496,7 @@ class ApplicationWindow(QMainWindow):  # pyright: ignore [reportGeneralTypeIssue
         'weblcds_index_path', 'weblcds_websocket_path',
         'taskWebDisplayGreenActive', 'taskWebDisplayGreenPort', 'taskWebDisplayRoastedActive', 'taskWebDisplayRoastedPort',
         'taskWebDisplayRoastedIndexPath', 'taskWebDisplayRoastedWebSocketPath', 'taskWebDisplayGreen_server', 'taskWebDisplayRoasted_server',
-        'scale_manager', 'scale1_model', 'scale1_id', 'scale2_model', 'scale2_name', 'scale2_id',
+        'scale_manager', 'scale1_model', 'scale1_id', 'container1_idx', 'scale2_model', 'scale2_name', 'scale2_id', 'container2_idx',
         'WebLCDsAlerts', 'EventsDlg_activeTab', 'graphColorDlg_activeTab', 'PID_DlgControl_activeTab', 'CurveDlg_activeTab', 'editGraphDlg_activeTab',
         'backgroundDlg_activeTab', 'DeviceAssignmentDlg_activeTab', 'AlarmDlg_activeTab', 'schedule_activeTab', 'StatisticsDlg_activeTab', 'resetqsettings', 'settingspath', 'wheelpath', 'profilepath',
         'userprofilepath', 'printer', 'main_widget', 'defaultdpi', 'dpi', 'qmc', 'HottopControlActive', 'AsyncSamplingTimer', 'wheeldialog',
@@ -1689,10 +1689,12 @@ def __init__(self, parent:Optional[QWidget] = None, *, locale:str, WebEngineSupp
         self.scale1_model:Optional[int] = None
         self.scale1_name:Optional[str] = None  # the display/local name of the device (like "ACAIA162FC")
         self.scale1_id:Optional[str] = None    # the id, eg. the BT address (like "24:71:89:cc:09:05")
+        self.container1_idx:int = -1 # -1: no container set; otherwise index into selected qmc.container_names/qmc.container_weights
         # scale2: just for green
         self.scale2_model:Optional[int] = None
         self.scale2_name:Optional[str] = None  # the display/local name of the device (like "ACAIA162FC")
         self.scale2_id:Optional[str] = None    # the device id, eg. the BT address (like "24:71:89:cc:09:05")
+        self.container2_idx:int = -1 # -1: no container set; otherwise index into selected qmc.container_names/qmc.container_weights
 
         # active tab
         self.EventsDlg_activeTab:int = 0
@@ -18578,11 +18580,13 @@ def settingsLoad(self, filename:Optional[str] = None, theme:bool = False, machin
             self.scale1_model = settings.value('scale1_model',self.scale1_model)
             self.scale1_name = settings.value('scale1_name',self.scale1_name)
             self.scale1_id = settings.value('scale1_id',self.scale1_id)
+            self.container1_idx = settings.value('container1_idx',self.container1_idx)
             self.scale2_model = settings.value('scale2_model',self.scale2_model)
             self.scale2_name = settings.value('scale2_name',self.scale2_name)
             self.scale2_id = settings.value('scale2_id',self.scale2_id)
+            self.container2_idx = settings.value('container2_idx',self.container2_idx)
             settings.endGroup()
-#--- END GROUP Tasks
+#--- END GROUP Scales
 
             self.schedule_day_filter =toBool(settings.value('ScheduleDayFilter',self.schedule_day_filter))
             self.schedule_user_filter = toBool(settings.value('ScheduleUserFilter',self.schedule_user_filter))
@@ -20210,11 +20214,13 @@ def saveAllSettings(self, settings:QSettings, default_settings:Optional[Dict[str
             self.settingsSetValue(settings, default_settings, 'scale1_model',self.scale1_model, read_defaults)
             self.settingsSetValue(settings, default_settings, 'scale1_name',self.scale1_name, read_defaults)
             self.settingsSetValue(settings, default_settings, 'scale1_id',self.scale1_id, read_defaults)
+            self.settingsSetValue(settings, default_settings, 'container1_idx',self.container1_idx, read_defaults)
             self.settingsSetValue(settings, default_settings, 'scale2_model',self.scale2_model, read_defaults)
             self.settingsSetValue(settings, default_settings, 'scale2_name',self.scale2_name, read_defaults)
             self.settingsSetValue(settings, default_settings, 'scale2_id',self.scale2_id, read_defaults)
+            self.settingsSetValue(settings, default_settings, 'container2_idx',self.container2_idx, read_defaults)
             settings.endGroup()
-#--- END GROUP Tasks
+#--- END GROUP Scales
 
             self.settingsSetValue(settings, default_settings, 'ScheduleDayFilter',self.schedule_day_filter, read_defaults)
             self.settingsSetValue(settings, default_settings, 'ScheduleUserFilter',self.schedule_user_filter, read_defaults)