Merge 71833ef into 12fc691

danielhrisca · Oct 20, 2023 · f4e8e4a · f4e8e4a
2 parents 12fc691 + 71833ef
commit f4e8e4a
Show file tree

Hide file tree

Showing 56 changed files with 1,677 additions and 1,499 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,4 @@ pandas
 typing_extensions
 python-dateutil
 isal; platform_machine == "x86_64" or platform_machine == "AMD64"
-lxml<=4.9.2
+lxml>=4.9.3
diff --git a/requirements_exe_build.txt b/requirements_exe_build.txt
@@ -5,11 +5,11 @@ numpy>=1.23.0
 pandas
 typing_extensions
 isal; platform_machine == "x86_64" or platform_machine == "AMD64"
-lxml<=4.9.2
+lxml==4.9.3
 natsort 
 psutil 
-PySide6==6.2.2
-pyqtgraph==0.12.4
+PySide6==6.6.0
+pyqtgraph==0.13.3
 QtPy==2.3.1
 pyqtlet2
 pyopengl
@@ -21,8 +21,8 @@ cChardet==2.1.5
 chardet
 cryptography
 keyring
-pyinstaller<6.0; sys_platform=="win32"
+pyinstaller; sys_platform=="win32"
 pyinstaller<6.0; sys_platform=="darwin"
-pyinstaller==4.10; sys_platform=="linux"
+pyinstaller<6.0; sys_platform=="linux"
 scipy
 sympy
diff --git a/setup.py b/setup.py
@@ -104,18 +104,19 @@ def _get_ext_modules():
         "export": [
             "fastparquet",
             "h5py",
-            "hdf5storage>=0.1.17",
+            "hdf5storage>=0.1.19",
             "python-snappy",
         ],
         "export_matlab_v5": "scipy",
         "gui": [
-            "lxml<=4.9.2",
+            "lxml>=4.9.2",
             "natsort",
             "psutil",
-            "PySide6<=6.3.1",
-            "pyqtgraph>=0.12.4",
-            "pyqtlet2>=0.8.0",
+            "PySide6==6.6.0",
+            "pyqtgraph==0.13.3",
+            "pyqtlet2==0.9.3",
             "packaging",
+            "QtPy==2.3.1",
         ],
         "encryption": ["cryptography", "keyring"],
         "symbolic_math": "sympy",

diff --git a/src/asammdf/gui/__init__.py b/src/asammdf/gui/__init__.py
@@ -0,0 +1 @@
+
diff --git a/src/asammdf/gui/asammdfgui.py b/src/asammdf/gui/asammdfgui.py
@@ -5,6 +5,7 @@
 os.environ["QT_API"] = "pyside6"
 os.environ["PYQTGRAPH_QT_LIB"] = "PySide6"
 os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0"
+os.environ["PYSIDE6_OPTION_PYTHON_ENUM"] = "2"
 
 alternative_sitepacakges = os.environ.get("ASAMMDF_PYTHONPATH", "")
 

diff --git a/src/asammdf/gui/dialogs/advanced_search.py b/src/asammdf/gui/dialogs/advanced_search.py
@@ -102,7 +102,7 @@ def __init__(
                 self.case_sensitivity_pattern.setCurrentText("Case sensitive")
             else:
                 self.case_sensitivity_pattern.setCurrentText("Case insensitive")
-            self.raw.setCheckState(QtCore.Qt.Checked if pattern["raw"] else QtCore.Qt.Unchecked)
+            self.raw.setCheckState(QtCore.Qt.CheckState.Checked if pattern["raw"] else QtCore.Qt.CheckState.Unchecked)
             self.name.setText(pattern["name"])
             self.ranges = pattern["ranges"]
             self.integer_format.setCurrentText(pattern.get("integer_format", "phys"))
@@ -116,13 +116,13 @@ def __init__(
         self.matches.setColumnWidth(self.SourceNameColumn, 170)
         self.matches.setColumnWidth(self.SourcePathColumn, 170)
 
-        self.setWindowFlag(QtCore.Qt.WindowMaximizeButtonHint, True)
+        self.setWindowFlag(QtCore.Qt.WindowType.WindowMaximizeButtonHint, True)
 
         self.showMaximized()
 
     def search_text_changed(self):
         text = self.search_box.text().strip()
-        extened_search = self.extended_search.checkState() == QtCore.Qt.Checked
+        extened_search = self.extended_search.checkState() == QtCore.Qt.CheckState.Checked
 
         if len(text) >= 2:
             self.matches.collapseAll()
@@ -337,7 +337,7 @@ def _apply_pattern(self, event):
             "case_sensitive": self.case_sensitivity_pattern.currentText() == "Case sensitive",
             "filter_type": self.filter_type.currentText(),
             "filter_value": self.filter_value.value(),
-            "raw": self.raw.checkState() == QtCore.Qt.Checked,
+            "raw": self.raw.checkState() == QtCore.Qt.CheckState.Checked,
             "ranges": self.ranges,
             "name": self.name.text().strip(),
             "integer_format": self.integer_format.currentText(),

diff --git a/src/asammdf/gui/dialogs/bus_database_manager.py b/src/asammdf/gui/dialogs/bus_database_manager.py
@@ -14,7 +14,7 @@ def __init__(
         self.setObjectName("BusDatabaseManagerDialog")
         self.resize(404, 294)
         self.setSizeGripEnabled(True)
-        self.setWindowFlags(QtCore.Qt.Window)
+        self.setWindowFlags(QtCore.Qt.WindowType.Window)
         self.verticalLayout = QtWidgets.QVBoxLayout(self)
 
         self._settings = QtCore.QSettings()
@@ -39,7 +39,9 @@ def __init__(
 
         self.horLayout = QtWidgets.QHBoxLayout(self)
 
-        spacer = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacer = QtWidgets.QSpacerItem(
+            40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum
+        )
         self.apply_btn = QtWidgets.QPushButton("Apply")
         self.cancel_btn = QtWidgets.QPushButton("Cancel")
         self.horLayout.addSpacerItem(spacer)

diff --git a/src/asammdf/gui/dialogs/channel_group_info.py b/src/asammdf/gui/dialogs/channel_group_info.py
@@ -8,7 +8,7 @@ class ChannelGroupInfoDialog(QtWidgets.QDialog):
     def __init__(self, mdf, group, index, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.setWindowFlags(QtCore.Qt.Window)
+        self.setWindowFlags(QtCore.Qt.WindowType.Window)
 
         layout = QtWidgets.QVBoxLayout()
         self.setLayout(layout)
@@ -20,7 +20,7 @@ def __init__(self, mdf, group, index, *args, **kwargs):
         self.setStyleSheet('font: 8pt "Consolas";}')
 
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/info.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/info.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
 
         self.setWindowIcon(icon)
         self.setGeometry(240, 60, 1200, 600)
diff --git a/src/asammdf/gui/dialogs/channel_info.py b/src/asammdf/gui/dialogs/channel_info.py
@@ -8,7 +8,7 @@ class ChannelInfoDialog(QtWidgets.QDialog):
     def __init__(self, channel, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.setWindowFlags(QtCore.Qt.Window)
+        self.setWindowFlags(QtCore.Qt.WindowType.Window)
 
         layout = QtWidgets.QVBoxLayout()
         self.setLayout(layout)
@@ -20,7 +20,7 @@ def __init__(self, channel, *args, **kwargs):
         self.setStyleSheet('font: 8pt "Consolas";}')
 
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/info.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/info.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
 
         self.setWindowIcon(icon)
         self.setGeometry(240, 60, 1200, 600)
diff --git a/src/asammdf/gui/dialogs/conversion_editor.py b/src/asammdf/gui/dialogs/conversion_editor.py
@@ -164,8 +164,8 @@ def __init__(self, channel_name="", conversion=None, *args, **kwargs):
 
         self.pressed_button = None
 
-        self.setWindowFlag(QtCore.Qt.WindowMinimizeButtonHint, True)
-        self.setWindowFlag(QtCore.Qt.WindowMaximizeButtonHint, True)
+        self.setWindowFlag(QtCore.Qt.WindowType.WindowMinimizeButtonHint, True)
+        self.setWindowFlag(QtCore.Qt.WindowType.WindowMaximizeButtonHint, True)
 
     def apply(self, event):
         if self.tabs.currentIndex() == 1:

diff --git a/src/asammdf/gui/dialogs/define_channel.py b/src/asammdf/gui/dialogs/define_channel.py
@@ -30,15 +30,17 @@ def __init__(
         super().__init__(*args, **kwargs)
         self.setupUi(self)
 
-        self.setWindowFlags(QtCore.Qt.WindowMinMaxButtonsHint | self.windowFlags())
+        self.setWindowFlags(QtCore.Qt.WindowType.WindowMinMaxButtonsHint | self.windowFlags())
 
         self.mdf = mdf
         self.result = None
         self.pressed_button = None
         self.origin_uuid = origin_uuid or (mdf.uuid if mdf else os.urandom(6).hex())
 
         self.arg_widgets = []
-        spacer = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacer = QtWidgets.QSpacerItem(
+            20, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding
+        )
         self.arg_layout.addItem(spacer, len(self.arg_widgets) + 2, 0)
         self.arg_widgets.append(spacer)
 
@@ -174,7 +176,7 @@ def function_changed(self, *args):
         func = locals()[name]
 
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/search.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/search.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
 
         parameters = list(inspect.signature(func).parameters)[:-1]
         for i, arg_name in enumerate(parameters, 2):
@@ -189,7 +191,9 @@ def function_changed(self, *args):
 
             self.arg_widgets.append((label, text_edit, button))
 
-        spacer = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacer = QtWidgets.QSpacerItem(
+            20, 20, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding
+        )
 
         self.arg_layout.addItem(spacer, len(self.arg_widgets) + 2, 0)
         self.arg_widgets.append(spacer)
@@ -239,19 +243,19 @@ def show_definition(self, *args):
             PythonHighlighter(info.document())
             info.setReadOnly(True)
             info.setLineWrapMode(info.NoWrap)
-            info.setWindowFlags(QtCore.Qt.WindowMinMaxButtonsHint | info.windowFlags())
+            info.setWindowFlags(QtCore.Qt.WindowType.WindowMinMaxButtonsHint | info.windowFlags())
             info.setWindowTitle(f"{function} definition")
-            info.setWindowModality(QtCore.Qt.ApplicationModal)
+            info.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
 
             p = info.palette()
-            for active in (QtGui.QPalette.Active, QtGui.QPalette.Inactive):
-                p.setColor(active, QtGui.QPalette.Base, QtGui.QColor("#131314"))
-                p.setColor(active, QtGui.QPalette.WindowText, QtGui.QColor("#ffffff"))
-                p.setColor(active, QtGui.QPalette.Text, QtGui.QColor("#ffffff"))
+            for active in (QtGui.QPalette.ColorGroup.Active, QtGui.QPalette.ColorGroup.Inactive):
+                p.setColor(active, QtGui.QPalette.ColorRole.Base, QtGui.QColor("#131314"))
+                p.setColor(active, QtGui.QPalette.ColorRole.WindowText, QtGui.QColor("#ffffff"))
+                p.setColor(active, QtGui.QPalette.ColorRole.Text, QtGui.QColor("#ffffff"))
             info.setPalette(p)
 
             icon = QtGui.QIcon()
-            icon.addPixmap(QtGui.QPixmap(":/info.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+            icon.addPixmap(QtGui.QPixmap(":/info.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
             info.setWindowIcon(icon)
 
             info.show()

diff --git a/src/asammdf/gui/dialogs/dependencies_dlg.py b/src/asammdf/gui/dialogs/dependencies_dlg.py
@@ -37,7 +37,7 @@ def _setup_widgets(self) -> None:
         self.setMinimumHeight(500)
 
         icon = QIcon()
-        icon.addFile(":/asammdf.png", QSize(), QIcon.Normal, QIcon.Off)
+        icon.addFile(":/asammdf.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.setWindowIcon(icon)
 
         headers = ["package", "required", "installed", "summary", "url"]

diff --git a/src/asammdf/gui/dialogs/error_dialog.py b/src/asammdf/gui/dialogs/error_dialog.py
@@ -44,7 +44,7 @@ def __init__(self, title, message, trace, *args, **kwargs):
         self.trace.setReadOnly(True)
 
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/error.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/error.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
 
         self.setWindowIcon(icon)
 
@@ -80,7 +80,7 @@ def count_down(self):
             self.close()
 
     def keyPressEvent(self, event):
-        if event.key() == QtCore.Qt.Key_F1:
+        if event.key() == QtCore.Qt.Key.Key_F1:
             self.timer.stop()
             self.status.clear()
         else:

diff --git a/src/asammdf/gui/dialogs/functions_manager.py b/src/asammdf/gui/dialogs/functions_manager.py
@@ -40,15 +40,17 @@ def __init__(
         self.setObjectName("FunctionsManagerDialog")
         self.resize(404, 294)
         self.setSizeGripEnabled(True)
-        self.setWindowFlags(QtCore.Qt.Window)
+        self.setWindowFlags(QtCore.Qt.WindowType.Window)
         self.verticalLayout = QtWidgets.QVBoxLayout(self)
         self.widget = FunctionsManager(deepcopy(definitions), channels, selected_definition)
 
         self.verticalLayout.addWidget(self.widget)
 
         self.horLayout = QtWidgets.QHBoxLayout(self)
 
-        spacer = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacer = QtWidgets.QSpacerItem(
+            40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum
+        )
         self.apply_btn = QtWidgets.QPushButton("Apply")
         self.cancel_btn = QtWidgets.QPushButton("Cancel")
         self.horLayout.addSpacerItem(spacer)

diff --git a/src/asammdf/gui/dialogs/messagebox.py b/src/asammdf/gui/dialogs/messagebox.py
@@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs):
         self.timer.start(1000)
 
     def keyPressEvent(self, event):
-        if event.key() == QtCore.Qt.Key_F1:
+        if event.key() == QtCore.Qt.Key.Key_F1:
             self.timer.stop()
             self.setText(self.original_text)
         else:
@@ -78,9 +78,9 @@ def about(
         parent,
         title,
         text,
-        buttons=QtWidgets.QMessageBox.Ok,
-        defaultButton=QtWidgets.QMessageBox.Ok,
-        escapeButton=QtWidgets.QMessageBox.Ok,
+        buttons=QtWidgets.QMessageBox.StandardButton.Ok,
+        defaultButton=QtWidgets.QMessageBox.StandardButton.Ok,
+        escapeButton=QtWidgets.QMessageBox.StandardButton.Ok,
         timeout=DEFAULT_TIMEOUT,
     ):
         msg = cls(
@@ -101,9 +101,9 @@ def critical(
         parent,
         title,
         text,
-        buttons=QtWidgets.QMessageBox.Ok,
-        defaultButton=QtWidgets.QMessageBox.Ok,
-        escapeButton=QtWidgets.QMessageBox.Ok,
+        buttons=QtWidgets.QMessageBox.StandardButton.Ok,
+        defaultButton=QtWidgets.QMessageBox.StandardButton.Ok,
+        escapeButton=QtWidgets.QMessageBox.StandardButton.Ok,
         timeout=DEFAULT_TIMEOUT,
     ):
         msg = cls(
@@ -125,9 +125,9 @@ def information(
         parent,
         title,
         text,
-        buttons=QtWidgets.QMessageBox.Ok,
-        defaultButton=QtWidgets.QMessageBox.Ok,
-        escapeButton=QtWidgets.QMessageBox.Ok,
+        buttons=QtWidgets.QMessageBox.StandardButton.Ok,
+        defaultButton=QtWidgets.QMessageBox.StandardButton.Ok,
+        escapeButton=QtWidgets.QMessageBox.StandardButton.Ok,
         timeout=DEFAULT_TIMEOUT,
     ):
         msg = cls(
@@ -148,9 +148,9 @@ def question(
         parent,
         title,
         text,
-        buttons=QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,
-        defaultButton=QtWidgets.QMessageBox.No,
-        escapeButton=QtWidgets.QMessageBox.No,
+        buttons=QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No,
+        defaultButton=QtWidgets.QMessageBox.StandardButton.No,
+        escapeButton=QtWidgets.QMessageBox.StandardButton.No,
         timeout=DEFAULT_TIMEOUT,
     ):
         msg = cls(
@@ -171,9 +171,9 @@ def warning(
         parent,
         title,
         text,
-        buttons=QtWidgets.QMessageBox.Ok,
-        defaultButton=QtWidgets.QMessageBox.Ok,
-        escapeButton=QtWidgets.QMessageBox.Ok,
+        buttons=QtWidgets.QMessageBox.StandardButton.Ok,
+        defaultButton=QtWidgets.QMessageBox.StandardButton.Ok,
+        escapeButton=QtWidgets.QMessageBox.StandardButton.Ok,
         timeout=DEFAULT_TIMEOUT,
     ):
         msg = cls(

diff --git a/src/asammdf/gui/dialogs/multi_search.py b/src/asammdf/gui/dialogs/multi_search.py
@@ -15,7 +15,11 @@ class MultiSearch(Ui_MultiSearchDialog, QtWidgets.QDialog):
     def __init__(self, channels_dbs, measurements, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.setupUi(self)
-        self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowMinMaxButtonsHint)
+        self.setWindowFlags(
+            self.windowFlags()
+            | QtCore.Qt.WindowType.WindowSystemMenuHint
+            | QtCore.Qt.WindowType.WindowMinMaxButtonsHint
+        )
 
         for widget in (
             self.apply_btn,
@@ -30,7 +34,7 @@ def __init__(self, channels_dbs, measurements, *args, **kwargs):
         self.channels_dbs = channels_dbs
         self.measurements = measurements
 
-        self.matches.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
+        self.matches.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
 
         self.apply_btn.clicked.connect(self._apply)
         self.add_btn.clicked.connect(self._add)

diff --git a/src/asammdf/gui/dialogs/range_editor.py b/src/asammdf/gui/dialogs/range_editor.py
@@ -9,7 +9,11 @@ class RangeEditor(Ui_RangeDialog, QtWidgets.QDialog):
     def __init__(self, name, unit="", ranges=None, brush=False, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.setupUi(self)
-        self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowMinMaxButtonsHint)
+        self.setWindowFlags(
+            self.windowFlags()
+            | QtCore.Qt.WindowType.WindowSystemMenuHint
+            | QtCore.Qt.WindowType.WindowMinMaxButtonsHint
+        )
 
         self.name = name
         self.unit = unit