Add: Features: change the color of changed zones and Undo changes

Author: Barracuda09

EcuZoneCheckBox.py

@@ -19,21 +19,39 @@
    Or, point your browser to http://www.gnu.org/copyleft/gpl.html
 """
 
-from PySide6.QtCore import Qt
+from PySide6.QtCore import Qt, Slot
 from PySide6.QtWidgets import QCheckBox
 
 
 class EcuZoneCheckBox(QCheckBox):
     """
     """
     initialValue = 0
+    newValue = 0
+    style = ""
     zoneObject = {}
     itemReadOnly = False
     def __init__(self, parent, zoneObject: dict, readOnly: bool):
         super(EcuZoneCheckBox, self).__init__(parent)
         self.itemReadOnly = readOnly
         self.zoneObject = zoneObject
 
+        # Notify changes, to change color if changed
+        self.checkStateChanged.connect(self.stateChange)
+
+        # Save current style-sheet
+        self.style = self.styleSheet()
+
+    @Slot()
+    def stateChange(self, state):
+        if state != self.newValue:
+            self.newValue = state
+
+        if self.newValue == self.initialValue or self.initialValue == 0:
+            self.setStyleSheet(self.style)
+        else:
+            self.setStyleSheet("background-color: rgb(42, 130, 218)")
+
     def getDescriptionName(self):
         return self.zoneObject["name"]
 
@@ -47,7 +65,7 @@ def setCheckState(self, val):
         self.initialValue = val;
         super().setCheckState(val)
 
-    def isCheckBoxChanged(self, virginWrite: bool()):
+    def isCheckBoxChanged(self, virginWrite: bool):
         return self.isEnabled() and not(self.itemReadOnly) and self.initialValue != 0 and self.initialValue != self.checkState()
 
     def getValuesAsCSV(self):
@@ -60,10 +78,10 @@ def getValuesAsCSV(self):
         return value
 
     def clearZoneValue(self):
-        initialValue = 0
+        self.initialValue = 0
         self.setCheckState(Qt.Unchecked)
 
-    def getZoneAndHex(self, virginWrite: bool()):
+    def getZoneAndHex(self, virginWrite: bool):
         value = "None"
         if "mask" in self.zoneObject:
             print("EcuZoneCheckBox.getZoneAndHex(..) has mask?")

EcuZoneComboBox.py

@@ -19,16 +19,19 @@
    Or, point your browser to http://www.gnu.org/copyleft/gpl.html
 """
 
-from PySide6.QtGui import QKeyEvent
-from PySide6.QtCore import Qt, QEvent
-from PySide6.QtWidgets import QComboBox
+from PySide6.QtGui import QKeyEvent, QAction, QIcon, QPalette
+from PySide6.QtCore import Qt, Slot, QEvent, QSize, QPoint
+from PySide6.QtWidgets import QComboBox, QMenu
 
 from i18n import i18n
+import PyPSADiagGUI
 
 class EcuZoneComboBox(QComboBox):
     """
     """
-    value = 0
+    initialValue = 0
+    newValue = 0
+    style = ""
     zoneObject = {}
     itemReadOnly = False
     def __init__(self, parent, zoneObject: dict, readOnly: bool):
@@ -48,6 +51,37 @@ def __init__(self, parent, zoneObject: dict, readOnly: bool):
                 self.addItem(name, "h:" + paramObject["value"])
         self.setCurrentIndex(0)
 
+        # Notify changes, to change color if changed
+        self.currentIndexChanged.connect(self.indexChanged)
+
+        # Make Undo possible
+        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.customContextMenuRequested.connect(self.contextMenu)
+
+        # Save current style-sheet
+        self.style = self.styleSheet()
+
+    @Slot()
+    def indexChanged(self, index):
+        if index != self.newValue:
+            self.newValue = index
+
+        if self.newValue == self.initialValue:
+            self.setStyleSheet(self.style)
+        else:
+            self.setStyleSheet("combobox-popup: 3; background-color: rgb(42, 130, 218)")
+
+    @Slot()
+    def contextMenu(self, pos: QPoint):
+        contextMenu = QMenu(self)
+        undoIcon = QIcon.fromTheme(QIcon.ThemeIcon.EditUndo)
+        undoAction = QAction(undoIcon, i18n().tr("&Undo"), contextMenu)
+        contextMenu.addAction(undoAction)
+
+        action = contextMenu.exec_(self.mapToGlobal(pos))
+        if action == undoAction:
+            self.setCurrentIndex(self.initialValue)
+
     def getItemDataAsInt(self, index: int) -> int:
         """Convert stored string data back to integer"""
         data = self.itemData(index)
@@ -87,11 +121,11 @@ def getCorrespondingByteSize(self):
         return 1
 
     def setCurrentIndex(self, val):
-        self.value = val;
+        self.initialValue = val;
         super().setCurrentIndex(val)
 
-    def isComboBoxChanged(self, virginWrite: bool()):
-        return self.isEnabled() and not(self.itemReadOnly) and self.value != self.currentIndex()
+    def isComboBoxChanged(self, virginWrite: bool):
+        return self.isEnabled() and not(self.itemReadOnly) and self.initialValue != self.currentIndex()
 
     def getValuesAsCSV(self):
         value = "Disabled"
@@ -101,10 +135,10 @@ def getValuesAsCSV(self):
         return value
 
     def clearZoneValue(self):
-        value = 0
+        self.initialValue = 0
         self.setCurrentIndex(0)
 
-    def getZoneAndHex(self, virginWrite: bool()):
+    def getZoneAndHex(self, virginWrite: bool):
         value = "None"
         if self.isComboBoxChanged(virginWrite):
             index = self.currentIndex()

EcuZoneLineEdit.py

@@ -22,7 +22,7 @@
 import json
 import os
 from PySide6.QtGui import QKeyEvent
-from PySide6.QtCore import Qt, QEvent
+from PySide6.QtCore import Qt, QEvent, Slot
 from PySide6.QtWidgets import QLineEdit
 
 
@@ -31,15 +31,33 @@ class EcuZoneLineEdit(QLineEdit):
     """
     zoneObject = {}
     valueType = ""
-    initialValue = ""
+    initialLineValue = ""
+    newLineLineValue = ""
     initialRaw = ""
+    style = ""
     itemReadOnly = False
     def __init__(self, parent, zoneObject: dict, readOnly: bool):
         super(EcuZoneLineEdit, self).__init__(parent)
         self.itemReadOnly = readOnly
         self.setReadOnly(readOnly)
         self.zoneObject = zoneObject
 
+        # Notify changes, to change color if changed
+        self.textEdited.connect(self.textChange)
+
+        # Save current style-sheet
+        self.style = self.styleSheet()
+
+    @Slot()
+    def textChange(self, text):
+        if text != self.newLineLineValue:
+            self.newLineLineValue = text
+
+        if self.newLineLineValue == self.initialLineValue:
+            self.setStyleSheet(self.style)
+        else:
+            self.setStyleSheet("background-color: rgb(42, 130, 218)")
+
     def event(self, event: QEvent):
         if event.type() == QEvent.KeyPress:
             keyEvent = QKeyEvent(event)
@@ -64,14 +82,14 @@ def getCorrespondingByteSize(self):
         return 1
 
     def __setText(self, val):
-        self.initialValue = val;
+        self.initialLineValue = val;
         super().setText(val)
 
     def updateText(self, val):
         super().setText(val)
 
-    def isLineEditChanged(self, virginWrite: bool()):
-        return self.isEnabled() and not(self.itemReadOnly) and (self.initialValue != self.text() or virginWrite)
+    def isLineEditChanged(self, virginWrite: bool):
+        return self.isEnabled() and not(self.itemReadOnly) and (self.initialLineValue != self.text() or virginWrite)
 
     def __convertZoneData(self):
         if self.valueType == "string_ascii":
@@ -92,12 +110,12 @@ def getValuesAsCSV(self):
         return "Disabled"
 
     def clearZoneValue(self):
-        valueType = ""
-        initialValue = ""
-        initialRaw = ""
+        self.initialLineValue = ""
+        self.valueType = ""
+        self.initialRaw = ""
         self.clear()
 
-    def getZoneAndHex(self, virginWrite: bool()):
+    def getZoneAndHex(self, virginWrite: bool):
         value = "None"
         if self.isLineEditChanged(virginWrite):
             return self.__convertZoneData()