first try to motion to PyQt6

Co-authored-by: Dominik Demuth <dominik.demuth@physik.tu-darmstadt.de>
Reviewed-on: #285

.gitea/ISSUE_TEMPLATE/BUG_TEMPLATE.yml

@@ -0,0 +1,51 @@
+name: 🐞 Bug Report
+description: File a bug/issue
+title: "[BUG] <title>"
+labels: ["Kind/Bug"]
+assignees: 
+  - dominik
+body:
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Version
+      description: For which version have you observed this behavior?
+      placeholder: You find the program version in "Help/About"
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: If possible, describe steps to reproduce the behavior.
+      placeholder: |
+        1. Pressed button '...'
+        2. See error...
+        3. Infinite sadness 😞
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label:  Log messages
+      description: |
+        Please copy and paste any relevant log output.
+      render: shell
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Everything else that could provide more context about the issue, e.g. screenshots.
+    validations:
+      required: false

.gitea/ISSUE_TEMPLATE/FEATURE_TEMPLATE.yml

@@ -0,0 +1,26 @@
+name: 🙂 Feature Request
+about: Request a new feature or feature improvement
+title: "[Feature]: <title>"
+labels: ["Kind/Feature", "Kind/Enhancement"]
+assignees:
+  - dominik
+body:
+  - type: textarea
+    attributes:
+      label: Proposed Behavior
+      description: A concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible benefits
+      description: A concise description of why this is an benefit for users.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Everything else that could provide more context about the issue, e.g. screenshots.
+    validations:
+      required: false

.gitea/ISSUE_TEMPLATE/config.yaml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Mystery
+    url: https://c.xkcd.com/random/comic/
+    about: What is behind door number 3?

.gitea/workflows/build-appimage.yaml

@@ -0,0 +1,38 @@
+name: Build AppImage
+run-name: ${{ gitea.actor }} is building THE AppImage 🚀   # a lot of excitement for this build
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: bookworm
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - run: |
+          apt-get -y update
+          apt-get -y install python3-yaml python3-requests
+      - name: Declare some variables
+        shell: bash
+        run: |
+          echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "YEAR=$(date +%Y)" >> $GITHUB_ENV
+      - name: Build AppImage
+        run: |
+          echo $GO_PIPELINE_LABEL
+          eval $(gpg-agent --daemon --allow-preset-passphrase --default-cache-ttl 1 --max-cache-ttl 7200)
+          /usr/lib/gnupg/gpg-preset-passphrase --preset --passphrase ${GPG_PASSPHRASE} ${GPG_KEYGRIP}
+          ./tools/update_version.py
+          ./tools/build.sh
+        env:
+          GPG_KEYGRIP: ${{ vars.GPG_KEYGRIP }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GO_PIPELINE_LABEL: ${{ env.YEAR }}.${{ gitea.run_number }}_${{ env.SHA_SHORT }}
+      - name: Upload AppImage
+        run: ./tools/upload_gitea.sh
+        env:
+          GO_PIPELINE_LABEL: ${{ env.YEAR }}.${{ gitea.run_number }}_${{ env.SHA_SHORT }}
+          UPLOAD_TOKEN: ${{ secrets.UPLOAD_TOKEN }}
+          UPLOAD_USER: ${{ vars.UPLOAD_USER }}

.gitignore

@@ -5,3 +5,4 @@ AppDir
 NMReval*.zsync
 .idea
 *.zs-old
+docs

AppImageBuilder.yml

@@ -12,7 +12,10 @@ script:
   # Copy the python application code into the AppDir
   - cp bin/evaluate.py  $TARGET_APPDIR/usr/bin/
   - cp -r src/*  $TARGET_APPDIR/usr/src/
-  - cp src/pkm.vogel.nmreval.desktop $TARGET_APPDIR/usr/share/applications
+  - cp src/resources/pkm.vogel.nmreval.desktop $TARGET_APPDIR/usr/share/applications
+  # set current date as version info
+  - sed -i "s/CURRENT_DATE/$(date +'%Y-%m-%d')/" $TARGET_APPDIR/usr/src/nmreval/version.py
+  - python3 -m pip install --ignore-installed --prefix=/usr --root=$TARGET_APPDIR -r requirements.txt
 
 
 AppDir:
@@ -30,35 +33,51 @@ AppDir:
     arch: amd64
     allow_unauthenticated: true
     sources:
-      - sourceline: 'deb [arch=amd64] http://mirror.infra.pkm/ bullseye main contrib non-free'
+      - sourceline: 'deb [arch=amd64] http://ftp.uni-mainz.de/debian bullseye main contrib non-free'
 
     include:
       # for /usr/bin/env
-      - coreutils
+#      - coreutils
-      - dash
+#      - dash
-      - zsync
+#      - zsync
-      - hicolor-icon-theme
+#      - hicolor-icon-theme
-      - libatlas3-base
+#      - libatlas3-base
-      - python3.9-minimal
+      - gnuplot-nox
-      - python3-numpy
+      - python3-minimal
-      - python3-scipy
+      - libpython3-stdlib
-      # - python3-matplotlib
+#      - python3-numpy
-      # - python-matplotlib-data
+#      - python3-scipy
-      - python3-bsddb3
+#      - python3-bsddb3
-      - python3-h5py
+#      - python3-h5py
-      - python3-pyqt5
+#      - python3-pyqt6
-      - python3-pyqtgraph
+#      - python3-pyqtgraph
-      - python3-requests
+#    exclude:
-      - python3-urllib3
+#      # lots of qt stuff we do not use
-      # - python3-tk
+#      - libqt5designer5
+#      - libqt5help5
+#      - libqt5network5
+#      - libqt5sql5
+#      - libqt5test5
+#      - libqt5xml5
+#      - qtbase5-dev-tools
+#      - pyqt5-dev-tools
+#      - libavahi-client3
+#      - libavahi-common-data
+#      - libavahi-common3
+#      - libwacom2
+#      - libwacom-common
+
+  files:
     exclude:
-      - libavahi-client3
+      - usr/share/man
-      - libavahi-common-data
+      - usr/share/doc/*/README.*
-      - libavahi-common3
+      - usr/share/doc/*/changelog.*
-  after_bundle: |
+      - usr/share/doc/*/NEWS.*
-    echo "MONSTER SED FOLLOWING...(uncomment if needed for mpl-data)"
+      - usr/share/doc/*/TODO.*
-    #sed -i s,\'/usr/share/matplotlib/mpl-data\',"f\"\{os.environ.get\('APPDIR'\,'/'\)\}/usr/share/matplotlib/mpl-data\"", ${TARGET_APPDIR}/usr/lib/python3/dist-packages/matplotlib/__init__.py
   runtime:
+    # if needed, apparently replaces hardcoded location with APPDIR location
+    # path_mappings:
+    #   - /usr/share/matplotlib/mpl-data:$APPDIR/usr/share/matplotlib/mpl-data
     version: "continuous"
     env:
       PATH: '${APPDIR}/usr/bin:${PATH}'

Makefile

@@ -5,30 +5,36 @@ PYUIC = pyuic5
 PYRCC = pyrcc5
 
 #Directory with ui files
-RESOURCE_DIR = resources/_ui
+RESOURCE_DIR = src/resources/_ui
 
 #Directory for compiled resources
-COMPILED_DIR = nmreval/gui_qt/_py
+PYQT_DIR = src/gui_qt/_py
 
 #UI files to compile, uses every *.ui found in RESOURCE_DIR
 UI_FILES = $(foreach dir, $(RESOURCE_DIR), $(notdir $(wildcard $(dir)/*.ui)))
-COMPILED_UI = $(UI_FILES:%.ui=$(COMPILED_DIR)/%.py)
+PYQT_UI = $(UI_FILES:%.ui=$(PYQT_DIR)/%.py)
 
 SVG_FILES = $(foreach dir, $(RCC_DIR), $(notdir $(wildcard $(dir)/*.svg)))
 PNG_FILES = $(SVG_FILES:%.svg=$(RCC_DIR)/%.png)
 
-all : ui
+CC = gcc
+CFLAGS = -O2 -fPIC
+LDFLAGS = -shared
 
-ui : $(COMPILED_UI)
+C_DIR = src/nmreval/clib
 
-rcc:  $(PNG_FILES)
+all : ui compile
 
+ui : $(PYQT_UI)
+
+rcc : $(PNG_FILES)
+
+# only one C file at the moment
+compile : $(C_DIR)/integrate.c
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(C_DIR)/integrate.so $<
 
 $(COMPILED_DIR)/%.py : $(RESOURCE_DIR)/%.ui
 	$(PYUIC) $< -o $@
-# 	replace import of ressource to correct path
-#	@sed -i s/images_rc/nmrevalqt.$(COMPILED_DIR).images_rc/g $@
-#	@sed -i /images_rc/d $@
 
 $(RCC_DIR)/%.png : $(RCC_DIR)/%.svg
 	convert -background none $< $@

bin/evaluate.py

@@ -2,6 +2,7 @@
 
 import sys
 import pathlib
+import os
 sys.path.append(str(pathlib.Path(__file__).absolute().parent.parent / 'src'))
 
 from nmreval.configs import check_for_config
@@ -16,12 +17,45 @@ from nmreval.lib.logger import handle_exception
 sys.excepthook = handle_exception
 
 from gui_qt import App
+from gui_qt.Qt import QtCore
 
-app = App(['Team Rocket FTW!'])
+app = App(['NMReval'])
 
 from gui_qt.main.mainwindow import NMRMainWindow
+from gui_qt.lib.backup import BackupManager
+
+
+def do_autosave():
+    # autosave and update timestamp in db
+    success = mplQt.autosave()
+    if success:
+        backuping.update_last_save()
+
+# autosave stuff: keep track of instance and their backup files
+backuping = BackupManager()
+
+# look for autosaves in DB without running programs
+files = backuping.search_unsaved()
+
+# tell everyone what autosave files belongs to this process
+pid = os.getpid()
+bck_name = backuping.create_entry(pid)
+mplQt = NMRMainWindow(bck_file=bck_name)
+
+# one manual autosave to create the file
+do_autosave()
+
+# load all selected autosaves to program
+for f in files:
+    mplQt.management.load_files(f)
+    f.unlink()
+
+timer = QtCore.QTimer()
+timer.timeout.connect(do_autosave)
+timer.start(3 * 60 * 1000)
+
+app.aboutToQuit.connect(backuping.close)
 
-mplQt = NMRMainWindow()
 mplQt.show()
 
 sys.exit(app.exec())

requirements.txt

@@ -1,8 +1,6 @@
-matplotlib
+#matplotlib
 numpy
 scipy
-PyQt5
+PyQt6
 h5py
 pyqtgraph
-bsddb3
-requests

src/gui_qt/Qt.py

@@ -1,5 +1,5 @@
 
-from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport
+from PyQt6 import QtCore, QtGui, QtWidgets, QtPrintSupport
 
 # from PySide2 import QtCore, QtGui, QtWidgets, QtPrintSupport
 # QtCore.pyqtSignal = QtCore.Signal

src/gui_qt/_py/agroptiondialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/agroptiondialog.ui'
-
-# Form implementation generated from reading ui file '_ui/agroptiondialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
@@ -16,91 +15,91 @@ class Ui_Dialog(object):
         Dialog.resize(513, 466)
         self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidget = QtWidgets.QTabWidget(Dialog)
+        self.tabWidget = QtWidgets.QTabWidget(parent=Dialog)
-        self.tabWidget.setTabShape(QtWidgets.QTabWidget.Rounded)
+        self.tabWidget.setTabShape(QtWidgets.QTabWidget.TabShape.Rounded)
         self.tabWidget.setObjectName("tabWidget")
         self.tabWidgetPage1 = QtWidgets.QWidget()
         self.tabWidgetPage1.setObjectName("tabWidgetPage1")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.tabWidgetPage1)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.frame_2 = QtWidgets.QFrame(self.tabWidgetPage1)
+        self.frame_2 = QtWidgets.QFrame(parent=self.tabWidgetPage1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.frame_2.sizePolicy().hasHeightForWidth())
         self.frame_2.setSizePolicy(sizePolicy)
-        self.frame_2.setFrameShape(QtWidgets.QFrame.Panel)
+        self.frame_2.setFrameShape(QtWidgets.QFrame.Shape.Panel)
-        self.frame_2.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_2.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
         self.frame_2.setLineWidth(3)
         self.frame_2.setMidLineWidth(5)
         self.frame_2.setObjectName("frame_2")
         self.gridLayout_4 = QtWidgets.QGridLayout(self.frame_2)
         self.gridLayout_4.setSpacing(3)
         self.gridLayout_4.setObjectName("gridLayout_4")
-        self.bottomMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(self.frame_2)
+        self.bottomMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.frame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.bottomMarginDoubleSpinBox.sizePolicy().hasHeightForWidth())
         self.bottomMarginDoubleSpinBox.setSizePolicy(sizePolicy)
-        self.bottomMarginDoubleSpinBox.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.bottomMarginDoubleSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.bottomMarginDoubleSpinBox.setObjectName("bottomMarginDoubleSpinBox")
         self.gridLayout_4.addWidget(self.bottomMarginDoubleSpinBox, 5, 2, 1, 1)
-        self.bottomMarginLabel = QtWidgets.QLabel(self.frame_2)
+        self.bottomMarginLabel = QtWidgets.QLabel(parent=self.frame_2)
         self.bottomMarginLabel.setObjectName("bottomMarginLabel")
         self.gridLayout_4.addWidget(self.bottomMarginLabel, 5, 1, 1, 1)
-        self.rightMarginLabel = QtWidgets.QLabel(self.frame_2)
+        self.rightMarginLabel = QtWidgets.QLabel(parent=self.frame_2)
-        self.rightMarginLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.rightMarginLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.rightMarginLabel.setObjectName("rightMarginLabel")
         self.gridLayout_4.addWidget(self.rightMarginLabel, 2, 3, 1, 1)
-        self.rightMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(self.frame_2)
+        self.rightMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.frame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.rightMarginDoubleSpinBox.sizePolicy().hasHeightForWidth())
         self.rightMarginDoubleSpinBox.setSizePolicy(sizePolicy)
         self.rightMarginDoubleSpinBox.setObjectName("rightMarginDoubleSpinBox")
         self.gridLayout_4.addWidget(self.rightMarginDoubleSpinBox, 3, 3, 1, 1)
-        self.leftMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(self.frame_2)
+        self.leftMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.frame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.leftMarginDoubleSpinBox.sizePolicy().hasHeightForWidth())
         self.leftMarginDoubleSpinBox.setSizePolicy(sizePolicy)
         self.leftMarginDoubleSpinBox.setObjectName("leftMarginDoubleSpinBox")
         self.gridLayout_4.addWidget(self.leftMarginDoubleSpinBox, 3, 0, 1, 1)
-        self.leftMarginLabel = QtWidgets.QLabel(self.frame_2)
+        self.leftMarginLabel = QtWidgets.QLabel(parent=self.frame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.leftMarginLabel.sizePolicy().hasHeightForWidth())
         self.leftMarginLabel.setSizePolicy(sizePolicy)
-        self.leftMarginLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.leftMarginLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.leftMarginLabel.setObjectName("leftMarginLabel")
         self.gridLayout_4.addWidget(self.leftMarginLabel, 2, 0, 1, 1)
-        self.topMarginLabel = QtWidgets.QLabel(self.frame_2)
+        self.topMarginLabel = QtWidgets.QLabel(parent=self.frame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.topMarginLabel.sizePolicy().hasHeightForWidth())
         self.topMarginLabel.setSizePolicy(sizePolicy)
         self.topMarginLabel.setObjectName("topMarginLabel")
         self.gridLayout_4.addWidget(self.topMarginLabel, 0, 1, 1, 1)
-        self.topMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(self.frame_2)
+        self.topMarginDoubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.frame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.topMarginDoubleSpinBox.sizePolicy().hasHeightForWidth())
         self.topMarginDoubleSpinBox.setSizePolicy(sizePolicy)
         self.topMarginDoubleSpinBox.setObjectName("topMarginDoubleSpinBox")
         self.gridLayout_4.addWidget(self.topMarginDoubleSpinBox, 0, 2, 1, 1)
-        self.frame = QtWidgets.QFrame(self.frame_2)
+        self.frame = QtWidgets.QFrame(parent=self.frame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth())
         self.frame.setSizePolicy(sizePolicy)
-        self.frame.setFrameShape(QtWidgets.QFrame.WinPanel)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.WinPanel)
         self.frame.setMidLineWidth(0)
         self.frame.setObjectName("frame")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.frame)
@@ -110,48 +109,48 @@ class Ui_Dialog(object):
         self.gridLayout_2.addWidget(self.frame_2, 1, 0, 2, 2)
         self.verticalLayout_3 = QtWidgets.QVBoxLayout()
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_3.addItem(spacerItem)
-        self.heightLabel = QtWidgets.QLabel(self.tabWidgetPage1)
+        self.heightLabel = QtWidgets.QLabel(parent=self.tabWidgetPage1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.heightLabel.sizePolicy().hasHeightForWidth())
         self.heightLabel.setSizePolicy(sizePolicy)
         self.heightLabel.setObjectName("heightLabel")
         self.verticalLayout_3.addWidget(self.heightLabel)
-        self.heightDoubleSpinBox = QtWidgets.QDoubleSpinBox(self.tabWidgetPage1)
+        self.heightDoubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.tabWidgetPage1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.heightDoubleSpinBox.sizePolicy().hasHeightForWidth())
         self.heightDoubleSpinBox.setSizePolicy(sizePolicy)
         self.heightDoubleSpinBox.setObjectName("heightDoubleSpinBox")
         self.verticalLayout_3.addWidget(self.heightDoubleSpinBox)
-        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_3.addItem(spacerItem1)
         self.gridLayout_2.addLayout(self.verticalLayout_3, 1, 2, 2, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem2)
-        self.widthLabel = QtWidgets.QLabel(self.tabWidgetPage1)
+        self.widthLabel = QtWidgets.QLabel(parent=self.tabWidgetPage1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.widthLabel.sizePolicy().hasHeightForWidth())
         self.widthLabel.setSizePolicy(sizePolicy)
         self.widthLabel.setObjectName("widthLabel")
         self.horizontalLayout.addWidget(self.widthLabel)
-        self.widthDoubleSpinBox = QtWidgets.QDoubleSpinBox(self.tabWidgetPage1)
+        self.widthDoubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.tabWidgetPage1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.widthDoubleSpinBox.sizePolicy().hasHeightForWidth())
         self.widthDoubleSpinBox.setSizePolicy(sizePolicy)
         self.widthDoubleSpinBox.setObjectName("widthDoubleSpinBox")
         self.horizontalLayout.addWidget(self.widthDoubleSpinBox)
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem3)
         self.gridLayout_2.addLayout(self.horizontalLayout, 0, 0, 1, 2)
         self.tabWidget.addTab(self.tabWidgetPage1, "")
@@ -159,11 +158,11 @@ class Ui_Dialog(object):
         self.tab.setObjectName("tab")
         self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.tab)
         self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.label_11 = QtWidgets.QLabel(self.tab)
+        self.label_11 = QtWidgets.QLabel(parent=self.tab)
         self.label_11.setObjectName("label_11")
         self.verticalLayout_4.addWidget(self.label_11)
-        self.spinBox_2 = QtWidgets.QSpinBox(self.tab)
+        self.spinBox_2 = QtWidgets.QSpinBox(parent=self.tab)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.spinBox_2.sizePolicy().hasHeightForWidth())
@@ -172,11 +171,11 @@ class Ui_Dialog(object):
         self.spinBox_2.setProperty("value", 100)
         self.spinBox_2.setObjectName("spinBox_2")
         self.verticalLayout_4.addWidget(self.spinBox_2)
-        self.legendLabel = QtWidgets.QLabel(self.tab)
+        self.legendLabel = QtWidgets.QLabel(parent=self.tab)
         self.legendLabel.setObjectName("legendLabel")
         self.verticalLayout_4.addWidget(self.legendLabel)
-        self.spinBox = QtWidgets.QSpinBox(self.tab)
+        self.spinBox = QtWidgets.QSpinBox(parent=self.tab)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.spinBox.sizePolicy().hasHeightForWidth())
@@ -185,15 +184,15 @@ class Ui_Dialog(object):
         self.spinBox.setProperty("value", 100)
         self.spinBox.setObjectName("spinBox")
         self.verticalLayout_4.addWidget(self.spinBox)
-        self.groupBox_4 = QtWidgets.QGroupBox(self.tab)
+        self.groupBox_4 = QtWidgets.QGroupBox(parent=self.tab)
         self.groupBox_4.setObjectName("groupBox_4")
         self.formLayout_2 = QtWidgets.QFormLayout(self.groupBox_4)
         self.formLayout_2.setObjectName("formLayout_2")
-        self.verticalAxisTickLabel = QtWidgets.QLabel(self.groupBox_4)
+        self.verticalAxisTickLabel = QtWidgets.QLabel(parent=self.groupBox_4)
         self.verticalAxisTickLabel.setObjectName("verticalAxisTickLabel")
-        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.verticalAxisTickLabel)
+        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.verticalAxisTickLabel)
-        self.spinBox_5 = QtWidgets.QSpinBox(self.groupBox_4)
+        self.spinBox_5 = QtWidgets.QSpinBox(parent=self.groupBox_4)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.spinBox_5.sizePolicy().hasHeightForWidth())
@@ -201,9 +200,9 @@ class Ui_Dialog(object):
         self.spinBox_5.setMaximum(1000)
         self.spinBox_5.setProperty("value", 100)
         self.spinBox_5.setObjectName("spinBox_5")
-        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.spinBox_5)
+        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.spinBox_5)
-        self.verticalAxisLabelSpinBox = QtWidgets.QSpinBox(self.groupBox_4)
+        self.verticalAxisLabelSpinBox = QtWidgets.QSpinBox(parent=self.groupBox_4)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.verticalAxisLabelSpinBox.sizePolicy().hasHeightForWidth())
@@ -211,17 +210,17 @@ class Ui_Dialog(object):
         self.verticalAxisLabelSpinBox.setMaximum(1000)
         self.verticalAxisLabelSpinBox.setProperty("value", 100)
         self.verticalAxisLabelSpinBox.setObjectName("verticalAxisLabelSpinBox")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.verticalAxisLabelSpinBox)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.verticalAxisLabelSpinBox)
-        self.verticalAxisLabelLabel = QtWidgets.QLabel(self.groupBox_4)
+        self.verticalAxisLabelLabel = QtWidgets.QLabel(parent=self.groupBox_4)
         self.verticalAxisLabelLabel.setObjectName("verticalAxisLabelLabel")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.verticalAxisLabelLabel)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.verticalAxisLabelLabel)
         self.verticalLayout_4.addWidget(self.groupBox_4)
-        self.groupBox_3 = QtWidgets.QGroupBox(self.tab)
+        self.groupBox_3 = QtWidgets.QGroupBox(parent=self.tab)
         self.groupBox_3.setObjectName("groupBox_3")
         self.formLayout = QtWidgets.QFormLayout(self.groupBox_3)
         self.formLayout.setObjectName("formLayout")
-        self.spinBox_4 = QtWidgets.QSpinBox(self.groupBox_3)
+        self.spinBox_4 = QtWidgets.QSpinBox(parent=self.groupBox_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.spinBox_4.sizePolicy().hasHeightForWidth())
@@ -229,9 +228,9 @@ class Ui_Dialog(object):
         self.spinBox_4.setMaximum(1000)
         self.spinBox_4.setProperty("value", 100)
         self.spinBox_4.setObjectName("spinBox_4")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.spinBox_4)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.spinBox_4)
-        self.spinBox_3 = QtWidgets.QSpinBox(self.groupBox_3)
+        self.spinBox_3 = QtWidgets.QSpinBox(parent=self.groupBox_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.spinBox_3.sizePolicy().hasHeightForWidth())
@@ -239,58 +238,58 @@ class Ui_Dialog(object):
         self.spinBox_3.setMaximum(1000)
         self.spinBox_3.setProperty("value", 100)
         self.spinBox_3.setObjectName("spinBox_3")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.spinBox_3)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.spinBox_3)
-        self.label_10 = QtWidgets.QLabel(self.groupBox_3)
+        self.label_10 = QtWidgets.QLabel(parent=self.groupBox_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_10.sizePolicy().hasHeightForWidth())
         self.label_10.setSizePolicy(sizePolicy)
         self.label_10.setObjectName("label_10")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_10)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_10)
-        self.label_12 = QtWidgets.QLabel(self.groupBox_3)
+        self.label_12 = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label_12.setObjectName("label_12")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_12)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_12)
         self.verticalLayout_4.addWidget(self.groupBox_3)
-        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_4.addItem(spacerItem4)
         self.tabWidget.addTab(self.tab, "")
         self.tab_2 = QtWidgets.QWidget()
         self.tab_2.setObjectName("tab_2")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_2)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.spinBox_6 = QtWidgets.QSpinBox(self.tab_2)
+        self.spinBox_6 = QtWidgets.QSpinBox(parent=self.tab_2)
         self.spinBox_6.setMaximum(1000)
         self.spinBox_6.setProperty("value", 100)
         self.spinBox_6.setObjectName("spinBox_6")
         self.gridLayout_3.addWidget(self.spinBox_6, 0, 1, 1, 1)
-        self.label_3 = QtWidgets.QLabel(self.tab_2)
+        self.label_3 = QtWidgets.QLabel(parent=self.tab_2)
         self.label_3.setObjectName("label_3")
         self.gridLayout_3.addWidget(self.label_3, 0, 0, 1, 1)
-        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.gridLayout_3.addItem(spacerItem5, 2, 1, 1, 1)
-        self.doubleSpinBox_7 = QtWidgets.QDoubleSpinBox(self.tab_2)
+        self.doubleSpinBox_7 = QtWidgets.QDoubleSpinBox(parent=self.tab_2)
         self.doubleSpinBox_7.setDecimals(1)
         self.doubleSpinBox_7.setMaximum(20.0)
         self.doubleSpinBox_7.setSingleStep(0.5)
         self.doubleSpinBox_7.setProperty("value", 1.0)
         self.doubleSpinBox_7.setObjectName("doubleSpinBox_7")
         self.gridLayout_3.addWidget(self.doubleSpinBox_7, 1, 1, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.tab_2)
+        self.label_4 = QtWidgets.QLabel(parent=self.tab_2)
         self.label_4.setObjectName("label_4")
         self.gridLayout_3.addWidget(self.label_4, 1, 0, 1, 1)
         self.tabWidget.addTab(self.tab_2, "")
         self.verticalLayout.addWidget(self.tabWidget)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(Dialog)
         self.tabWidget.setCurrentIndex(0)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):

src/gui_qt/_py/apod_dialog.py

@@ -1,74 +1,234 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/apod_dialog.ui'
-
-# Form implementation generated from reading ui file '_ui/apod_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_ApodEdit(object):
     def setupUi(self, ApodEdit):
         ApodEdit.setObjectName("ApodEdit")
-        ApodEdit.resize(784, 484)
+        ApodEdit.resize(1144, 655)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(ApodEdit.sizePolicy().hasHeightForWidth())
         ApodEdit.setSizePolicy(sizePolicy)
         self.gridLayout = QtWidgets.QGridLayout(ApodEdit)
-        self.gridLayout.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout.setContentsMargins(9, 9, 9, 9)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        self.graphicsView = PlotWidget(ApodEdit)
+        self.freq_graph = NMRPlotWidget(parent=ApodEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
+        self.freq_graph.setObjectName("freq_graph")
+        self.gridLayout.addWidget(self.freq_graph, 2, 2, 1, 1)
+        self.time_graph = NMRPlotWidget(parent=ApodEdit)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.graphicsView.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.time_graph.sizePolicy().hasHeightForWidth())
-        self.graphicsView.setSizePolicy(sizePolicy)
+        self.time_graph.setSizePolicy(sizePolicy)
-        self.graphicsView.setObjectName("graphicsView")
+        self.time_graph.setObjectName("time_graph")
-        self.gridLayout.addWidget(self.graphicsView, 2, 0, 1, 1)
+        self.gridLayout.addWidget(self.time_graph, 2, 1, 1, 1)
-        self.graphicsView_2 = PlotWidget(ApodEdit)
+        self.widget = QtWidgets.QWidget(parent=ApodEdit)
-        self.graphicsView_2.setObjectName("graphicsView_2")
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Preferred)
-        self.gridLayout.addWidget(self.graphicsView_2, 2, 1, 1, 1)
-        self.apodcombobox = QtWidgets.QComboBox(ApodEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.apodcombobox.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.widget.sizePolicy().hasHeightForWidth())
-        self.apodcombobox.setSizePolicy(sizePolicy)
+        self.widget.setSizePolicy(sizePolicy)
+        self.widget.setObjectName("widget")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.widget)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.baseline_box = QtWidgets.QCheckBox(parent=self.widget)
+        self.baseline_box.setObjectName("baseline_box")
+        self.verticalLayout.addWidget(self.baseline_box)
+        self.shift_box = QtWidgets.QGroupBox(parent=self.widget)
+        self.shift_box.setFlat(True)
+        self.shift_box.setCheckable(True)
+        self.shift_box.setChecked(False)
+        self.shift_box.setObjectName("shift_box")
+        self.gridLayout_4 = QtWidgets.QGridLayout(self.shift_box)
+        self.gridLayout_4.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout_4.setSpacing(3)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.ls_lineedit = QtWidgets.QLineEdit(parent=self.shift_box)
+        self.ls_lineedit.setObjectName("ls_lineedit")
+        self.gridLayout_4.addWidget(self.ls_lineedit, 1, 1, 1, 1)
+        self.ls_spinbox = QtWidgets.QSpinBox(parent=self.shift_box)
+        self.ls_spinbox.setMaximum(999999)
+        self.ls_spinbox.setObjectName("ls_spinbox")
+        self.gridLayout_4.addWidget(self.ls_spinbox, 0, 1, 1, 1)
+        self.ls_combobox = QtWidgets.QComboBox(parent=self.shift_box)
+        self.ls_combobox.setObjectName("ls_combobox")
+        self.ls_combobox.addItem("")
+        self.ls_combobox.addItem("")
+        self.gridLayout_4.addWidget(self.ls_combobox, 0, 0, 2, 1)
+        self.verticalLayout.addWidget(self.shift_box)
+        self.apod_box = QtWidgets.QGroupBox(parent=self.widget)
+        self.apod_box.setFlat(True)
+        self.apod_box.setCheckable(True)
+        self.apod_box.setChecked(False)
+        self.apod_box.setObjectName("apod_box")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.apod_box)
+        self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
+        self.verticalLayout_2.setSpacing(3)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.apodcombobox = QtWidgets.QComboBox(parent=self.apod_box)
         self.apodcombobox.setObjectName("apodcombobox")
-        self.gridLayout.addWidget(self.apodcombobox, 0, 0, 1, 1)
+        self.verticalLayout_2.addWidget(self.apodcombobox)
+        self.eqn_label = QtWidgets.QLabel(parent=self.apod_box)
+        self.eqn_label.setIndent(3)
+        self.eqn_label.setObjectName("eqn_label")
+        self.verticalLayout_2.addWidget(self.eqn_label)
         self.widget_layout = QtWidgets.QHBoxLayout()
         self.widget_layout.setContentsMargins(-1, 6, -1, -1)
         self.widget_layout.setSpacing(20)
         self.widget_layout.setObjectName("widget_layout")
-        self.gridLayout.addLayout(self.widget_layout, 1, 0, 1, 2)
+        self.verticalLayout_2.addLayout(self.widget_layout)
-        self.buttonBox = QtWidgets.QDialogButtonBox(ApodEdit)
+        self.verticalLayout.addWidget(self.apod_box)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.zerofill_box = QtWidgets.QGroupBox(parent=self.widget)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.zerofill_box.setFlat(True)
+        self.zerofill_box.setCheckable(True)
+        self.zerofill_box.setChecked(False)
+        self.zerofill_box.setObjectName("zerofill_box")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.zerofill_box)
+        self.horizontalLayout.setContentsMargins(3, 3, 3, 3)
+        self.horizontalLayout.setSpacing(3)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.label = QtWidgets.QLabel(parent=self.zerofill_box)
+        self.label.setObjectName("label")
+        self.horizontalLayout.addWidget(self.label)
+        self.zf_spinbox = QtWidgets.QSpinBox(parent=self.zerofill_box)
+        self.zf_spinbox.setMinimum(1)
+        self.zf_spinbox.setMaximum(3)
+        self.zf_spinbox.setObjectName("zf_spinbox")
+        self.horizontalLayout.addWidget(self.zf_spinbox)
+        self.verticalLayout.addWidget(self.zerofill_box)
+        self.phase_box = QtWidgets.QGroupBox(parent=self.widget)
+        self.phase_box.setFlat(True)
+        self.phase_box.setCheckable(True)
+        self.phase_box.setChecked(False)
+        self.phase_box.setObjectName("phase_box")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.phase_box)
+        self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout_2.setSpacing(3)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.label_3 = QtWidgets.QLabel(parent=self.phase_box)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout_2.addWidget(self.label_3, 1, 0, 1, 1)
+        self.label_4 = QtWidgets.QLabel(parent=self.phase_box)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout_2.addWidget(self.label_4, 2, 0, 1, 1)
+        self.ph0_spinbox = QtWidgets.QDoubleSpinBox(parent=self.phase_box)
+        self.ph0_spinbox.setWrapping(True)
+        self.ph0_spinbox.setDecimals(1)
+        self.ph0_spinbox.setMinimum(-180.0)
+        self.ph0_spinbox.setMaximum(180.0)
+        self.ph0_spinbox.setSingleStep(0.5)
+        self.ph0_spinbox.setObjectName("ph0_spinbox")
+        self.gridLayout_2.addWidget(self.ph0_spinbox, 0, 1, 1, 1)
+        self.pivot_lineedit = QtWidgets.QLineEdit(parent=self.phase_box)
+        self.pivot_lineedit.setObjectName("pivot_lineedit")
+        self.gridLayout_2.addWidget(self.pivot_lineedit, 2, 1, 1, 1)
+        self.label_2 = QtWidgets.QLabel(parent=self.phase_box)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 1)
+        self.ph1_spinbox = QtWidgets.QDoubleSpinBox(parent=self.phase_box)
+        self.ph1_spinbox.setWrapping(True)
+        self.ph1_spinbox.setDecimals(2)
+        self.ph1_spinbox.setMinimum(-720.0)
+        self.ph1_spinbox.setMaximum(720.0)
+        self.ph1_spinbox.setSingleStep(0.05)
+        self.ph1_spinbox.setObjectName("ph1_spinbox")
+        self.gridLayout_2.addWidget(self.ph1_spinbox, 1, 1, 1, 1)
+        self.verticalLayout.addWidget(self.phase_box)
+        self.ft_box = QtWidgets.QGroupBox(parent=self.widget)
+        self.ft_box.setCheckable(True)
+        self.ft_box.setChecked(False)
+        self.ft_box.setObjectName("ft_box")
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.ft_box)
+        self.verticalLayout_3.setContentsMargins(3, 3, 3, 3)
+        self.verticalLayout_3.setSpacing(3)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.phase_before_button = QtWidgets.QRadioButton(parent=self.ft_box)
+        self.phase_before_button.setChecked(True)
+        self.phase_before_button.setObjectName("phase_before_button")
+        self.buttonGroup = QtWidgets.QButtonGroup(ApodEdit)
+        self.buttonGroup.setObjectName("buttonGroup")
+        self.buttonGroup.addButton(self.phase_before_button)
+        self.verticalLayout_3.addWidget(self.phase_before_button)
+        self.phase_after_button = QtWidgets.QRadioButton(parent=self.ft_box)
+        self.phase_after_button.setObjectName("phase_after_button")
+        self.buttonGroup.addButton(self.phase_after_button)
+        self.verticalLayout_3.addWidget(self.phase_after_button)
+        self.verticalLayout.addWidget(self.ft_box)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.verticalLayout.addItem(spacerItem)
+        self.gridLayout.addWidget(self.widget, 2, 0, 1, 1)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=ApodEdit)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 4, 0, 1, 2)
+        self.gridLayout.addWidget(self.buttonBox, 4, 1, 1, 2)
-        self.eqn_label = QtWidgets.QLabel(ApodEdit)
+        self.log_freq_widget = QtWidgets.QWidget(parent=ApodEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        self.log_freq_widget.setObjectName("log_freq_widget")
-        sizePolicy.setHorizontalStretch(0)
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.log_freq_widget)
-        sizePolicy.setVerticalStretch(0)
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        sizePolicy.setHeightForWidth(self.eqn_label.sizePolicy().hasHeightForWidth())
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.eqn_label.setSizePolicy(sizePolicy)
+        self.horizontalLayout_3.addItem(spacerItem1)
-        self.eqn_label.setIndent(3)
+        self.logx_freq = QtWidgets.QCheckBox(parent=self.log_freq_widget)
-        self.eqn_label.setObjectName("eqn_label")
+        self.logx_freq.setObjectName("logx_freq")
-        self.gridLayout.addWidget(self.eqn_label, 0, 1, 1, 1)
+        self.horizontalLayout_3.addWidget(self.logx_freq)
+        self.logy_freq = QtWidgets.QCheckBox(parent=self.log_freq_widget)
+        self.logy_freq.setObjectName("logy_freq")
+        self.horizontalLayout_3.addWidget(self.logy_freq)
+        self.gridLayout.addWidget(self.log_freq_widget, 3, 2, 1, 1)
+        self.logtime_widget = QtWidgets.QWidget(parent=ApodEdit)
+        self.logtime_widget.setObjectName("logtime_widget")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.logtime_widget)
+        self.horizontalLayout_2.setContentsMargins(-1, 1, -1, -1)
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem2)
+        self.logx_time = QtWidgets.QCheckBox(parent=self.logtime_widget)
+        self.logx_time.setObjectName("logx_time")
+        self.horizontalLayout_2.addWidget(self.logx_time)
+        self.logy_time = QtWidgets.QCheckBox(parent=self.logtime_widget)
+        self.logy_time.setObjectName("logy_time")
+        self.horizontalLayout_2.addWidget(self.logy_time)
+        self.gridLayout.addWidget(self.logtime_widget, 3, 1, 1, 1)
 
         self.retranslateUi(ApodEdit)
-        self.buttonBox.accepted.connect(ApodEdit.accept)
+        self.buttonBox.accepted.connect(ApodEdit.accept) # type: ignore
-        self.buttonBox.rejected.connect(ApodEdit.close)
+        self.buttonBox.rejected.connect(ApodEdit.close) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(ApodEdit)
 
     def retranslateUi(self, ApodEdit):
         _translate = QtCore.QCoreApplication.translate
         ApodEdit.setWindowTitle(_translate("ApodEdit", "Apodization"))
+        self.baseline_box.setText(_translate("ApodEdit", "Baseline"))
+        self.shift_box.setTitle(_translate("ApodEdit", "Shift"))
+        self.ls_lineedit.setText(_translate("ApodEdit", "0"))
+        self.ls_combobox.setItemText(0, _translate("ApodEdit", "Points"))
+        self.ls_combobox.setItemText(1, _translate("ApodEdit", "Seconds"))
+        self.apod_box.setTitle(_translate("ApodEdit", "Apodization"))
         self.eqn_label.setText(_translate("ApodEdit", "TextLabel"))
-from pyqtgraph import PlotWidget
+        self.zerofill_box.setTitle(_translate("ApodEdit", "Zero fill"))
+        self.label.setText(_translate("ApodEdit", "Double length"))
+        self.zf_spinbox.setSuffix(_translate("ApodEdit", "x"))
+        self.phase_box.setTitle(_translate("ApodEdit", "Phase correction"))
+        self.label_3.setText(_translate("ApodEdit", "Phase 1"))
+        self.label_4.setText(_translate("ApodEdit", "Pivot"))
+        self.pivot_lineedit.setText(_translate("ApodEdit", "0"))
+        self.label_2.setText(_translate("ApodEdit", "Phase 0"))
+        self.ft_box.setTitle(_translate("ApodEdit", "Fourier transform"))
+        self.phase_before_button.setText(_translate("ApodEdit", "before phase correction"))
+        self.phase_after_button.setText(_translate("ApodEdit", "after phase correction"))
+        self.logx_freq.setText(_translate("ApodEdit", "Log X"))
+        self.logy_freq.setText(_translate("ApodEdit", "Log Y"))
+        self.logx_time.setText(_translate("ApodEdit", "Log X"))
+        self.logy_time.setText(_translate("ApodEdit", "Log Y"))
+from ..lib.graph_items import NMRPlotWidget

src/gui_qt/_py/asciidialog.py

@@ -1,154 +1,226 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/asciidialog.ui'
-
-# Form implementation generated from reading ui file 'src/resources/_ui/asciidialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.7
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_ascii_reader(object):
     def setupUi(self, ascii_reader):
         ascii_reader.setObjectName("ascii_reader")
-        ascii_reader.resize(627, 703)
+        ascii_reader.resize(665, 904)
         self.verticalLayout = QtWidgets.QVBoxLayout(ascii_reader)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidget = QtWidgets.QTabWidget(ascii_reader)
+        self.tabWidget = QtWidgets.QTabWidget(parent=ascii_reader)
         self.tabWidget.setObjectName("tabWidget")
         self.tabWidgetPage1 = QtWidgets.QWidget()
         self.tabWidgetPage1.setObjectName("tabWidgetPage1")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.tabWidgetPage1)
         self.verticalLayout_3.setContentsMargins(6, 6, 6, 6)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.header_widget = ExpandableWidget(self.tabWidgetPage1)
+        self.header_widget = ExpandableWidget(parent=self.tabWidgetPage1)
         self.header_widget.setObjectName("header_widget")
         self.verticalLayout_3.addWidget(self.header_widget)
-        self.groupBox = QtWidgets.QGroupBox(self.tabWidgetPage1)
+        self.groupBox = QtWidgets.QGroupBox(parent=self.tabWidgetPage1)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth())
+        self.groupBox.setSizePolicy(sizePolicy)
         self.groupBox.setObjectName("groupBox")
-        self.gridLayout = QtWidgets.QGridLayout(self.groupBox)
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.groupBox)
-        self.gridLayout.setContentsMargins(3, 3, 3, 3)
+        self.horizontalLayout_4.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout.setHorizontalSpacing(9)
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.gridLayout.setObjectName("gridLayout")
+        self.verticalLayout_6 = QtWidgets.QVBoxLayout()
-        self.FID_radioButton = QtWidgets.QRadioButton(self.groupBox)
+        self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.FID_radioButton.setAutoExclusive(True)
+        self.column_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
-        self.FID_radioButton.setObjectName("FID_radioButton")
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
-        self.buttonGroup = QtWidgets.QButtonGroup(ascii_reader)
-        self.buttonGroup.setObjectName("buttonGroup")
-        self.buttonGroup.addButton(self.FID_radioButton)
-        self.gridLayout.addWidget(self.FID_radioButton, 2, 1, 1, 1)
-        self.x_lineedit = QtWidgets.QLineEdit(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.x_lineedit.sizePolicy().hasHeightForWidth())
-        self.x_lineedit.setSizePolicy(sizePolicy)
-        self.x_lineedit.setInputMethodHints(QtCore.Qt.ImhFormattedNumbersOnly|QtCore.Qt.ImhPreferNumbers)
-        self.x_lineedit.setObjectName("x_lineedit")
-        self.gridLayout.addWidget(self.x_lineedit, 1, 3, 1, 1)
-        self.y_label = QtWidgets.QLabel(self.groupBox)
-        self.y_label.setObjectName("y_label")
-        self.gridLayout.addWidget(self.y_label, 2, 2, 1, 1)
-        self.pts_radioButton = QtWidgets.QRadioButton(self.groupBox)
-        self.pts_radioButton.setChecked(True)
-        self.pts_radioButton.setAutoExclusive(True)
-        self.pts_radioButton.setObjectName("pts_radioButton")
-        self.buttonGroup.addButton(self.pts_radioButton)
-        self.gridLayout.addWidget(self.pts_radioButton, 1, 1, 1, 1)
-        self.deltay_lineEdit = QtWidgets.QLineEdit(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.deltay_lineEdit.sizePolicy().hasHeightForWidth())
-        self.deltay_lineEdit.setSizePolicy(sizePolicy)
-        self.deltay_lineEdit.setObjectName("deltay_lineEdit")
-        self.gridLayout.addWidget(self.deltay_lineEdit, 3, 3, 1, 1)
-        self.label_5 = QtWidgets.QLabel(self.groupBox)
-        self.label_5.setObjectName("label_5")
-        self.gridLayout.addWidget(self.label_5, 3, 2, 1, 1)
-        self.column_checkBox = QtWidgets.QCheckBox(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.column_checkBox.sizePolicy().hasHeightForWidth())
         self.column_checkBox.setSizePolicy(sizePolicy)
         self.column_checkBox.setObjectName("column_checkBox")
-        self.gridLayout.addWidget(self.column_checkBox, 0, 0, 1, 1)
+        self.verticalLayout_6.addWidget(self.column_checkBox)
-        self.label = QtWidgets.QLabel(self.groupBox)
+        self.line_spinBox = QtWidgets.QSpinBox(parent=self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 0, 1, 1, 1)
-        self.label_7 = QtWidgets.QLabel(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_7.sizePolicy().hasHeightForWidth())
-        self.label_7.setSizePolicy(sizePolicy)
-        self.label_7.setObjectName("label_7")
-        self.gridLayout.addWidget(self.label_7, 0, 2, 1, 2)
-        self.y_lineedit = QtWidgets.QLineEdit(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.y_lineedit.sizePolicy().hasHeightForWidth())
-        self.y_lineedit.setSizePolicy(sizePolicy)
-        self.y_lineedit.setInputMethodHints(QtCore.Qt.ImhFormattedNumbersOnly|QtCore.Qt.ImhPreferNumbers)
-        self.y_lineedit.setObjectName("y_lineedit")
-        self.gridLayout.addWidget(self.y_lineedit, 2, 3, 1, 1)
-        self.spectrum_radioButton = QtWidgets.QRadioButton(self.groupBox)
-        self.spectrum_radioButton.setObjectName("spectrum_radioButton")
-        self.buttonGroup.addButton(self.spectrum_radioButton)
-        self.gridLayout.addWidget(self.spectrum_radioButton, 3, 1, 1, 1)
-        self.x_label = QtWidgets.QLabel(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.x_label.sizePolicy().hasHeightForWidth())
-        self.x_label.setSizePolicy(sizePolicy)
-        self.x_label.setObjectName("x_label")
-        self.gridLayout.addWidget(self.x_label, 1, 2, 1, 1)
-        self.line_spinBox = QtWidgets.QSpinBox(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.line_spinBox.sizePolicy().hasHeightForWidth())
         self.line_spinBox.setSizePolicy(sizePolicy)
         self.line_spinBox.setMinimum(1)
         self.line_spinBox.setObjectName("line_spinBox")
-        self.gridLayout.addWidget(self.line_spinBox, 1, 0, 1, 1)
+        self.verticalLayout_6.addWidget(self.line_spinBox)
-        self.preview_spinBox = QtWidgets.QSpinBox(self.groupBox)
+        self.label_6 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_6.setObjectName("label_6")
+        self.verticalLayout_6.addWidget(self.label_6)
+        self.preview_spinBox = QtWidgets.QSpinBox(parent=self.groupBox)
         self.preview_spinBox.setMinimum(1)
         self.preview_spinBox.setProperty("value", 10)
         self.preview_spinBox.setObjectName("preview_spinBox")
-        self.gridLayout.addWidget(self.preview_spinBox, 3, 0, 1, 1)
+        self.verticalLayout_6.addWidget(self.preview_spinBox)
-        self.label_6 = QtWidgets.QLabel(self.groupBox)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.label_6.setObjectName("label_6")
+        self.verticalLayout_6.addItem(spacerItem)
-        self.gridLayout.addWidget(self.label_6, 2, 0, 1, 1)
+        self.horizontalLayout_4.addLayout(self.verticalLayout_6)
+        self.verticalLayout_5 = QtWidgets.QVBoxLayout()
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.label = QtWidgets.QLabel(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy)
+        self.label.setObjectName("label")
+        self.verticalLayout_5.addWidget(self.label)
+        self.pts_radioButton = QtWidgets.QRadioButton(parent=self.groupBox)
+        self.pts_radioButton.setChecked(True)
+        self.pts_radioButton.setAutoExclusive(True)
+        self.pts_radioButton.setObjectName("pts_radioButton")
+        self.buttonGroup = QtWidgets.QButtonGroup(ascii_reader)
+        self.buttonGroup.setObjectName("buttonGroup")
+        self.buttonGroup.addButton(self.pts_radioButton)
+        self.verticalLayout_5.addWidget(self.pts_radioButton)
+        self.dsc_radioButton = QtWidgets.QRadioButton(parent=self.groupBox)
+        self.dsc_radioButton.setObjectName("dsc_radioButton")
+        self.buttonGroup.addButton(self.dsc_radioButton)
+        self.verticalLayout_5.addWidget(self.dsc_radioButton)
+        self.FID_radioButton = QtWidgets.QRadioButton(parent=self.groupBox)
+        self.FID_radioButton.setAutoExclusive(True)
+        self.FID_radioButton.setObjectName("FID_radioButton")
+        self.buttonGroup.addButton(self.FID_radioButton)
+        self.verticalLayout_5.addWidget(self.FID_radioButton)
+        self.spectrum_radioButton = QtWidgets.QRadioButton(parent=self.groupBox)
+        self.spectrum_radioButton.setObjectName("spectrum_radioButton")
+        self.buttonGroup.addButton(self.spectrum_radioButton)
+        self.verticalLayout_5.addWidget(self.spectrum_radioButton)
+        self.bds_radioButton = QtWidgets.QRadioButton(parent=self.groupBox)
+        self.bds_radioButton.setObjectName("bds_radioButton")
+        self.buttonGroup.addButton(self.bds_radioButton)
+        self.verticalLayout_5.addWidget(self.bds_radioButton)
+        self.horizontalLayout_4.addLayout(self.verticalLayout_5)
+        self.gridLayout_2 = QtWidgets.QGridLayout()
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.deltay_lineEdit = QtWidgets.QLineEdit(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.deltay_lineEdit.sizePolicy().hasHeightForWidth())
+        self.deltay_lineEdit.setSizePolicy(sizePolicy)
+        self.deltay_lineEdit.setObjectName("deltay_lineEdit")
+        self.gridLayout_2.addWidget(self.deltay_lineEdit, 3, 1, 1, 1)
+        self.label_7 = QtWidgets.QLabel(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_7.sizePolicy().hasHeightForWidth())
+        self.label_7.setSizePolicy(sizePolicy)
+        self.label_7.setObjectName("label_7")
+        self.gridLayout_2.addWidget(self.label_7, 0, 0, 1, 2)
+        self.y_lineedit = QtWidgets.QLineEdit(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.y_lineedit.sizePolicy().hasHeightForWidth())
+        self.y_lineedit.setSizePolicy(sizePolicy)
+        self.y_lineedit.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhFormattedNumbersOnly|QtCore.Qt.InputMethodHint.ImhPreferNumbers)
+        self.y_lineedit.setObjectName("y_lineedit")
+        self.gridLayout_2.addWidget(self.y_lineedit, 2, 1, 1, 1)
+        self.y_label = QtWidgets.QLabel(parent=self.groupBox)
+        self.y_label.setObjectName("y_label")
+        self.gridLayout_2.addWidget(self.y_label, 2, 0, 1, 1)
+        self.x_lineedit = QtWidgets.QLineEdit(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.x_lineedit.sizePolicy().hasHeightForWidth())
+        self.x_lineedit.setSizePolicy(sizePolicy)
+        self.x_lineedit.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhFormattedNumbersOnly|QtCore.Qt.InputMethodHint.ImhPreferNumbers)
+        self.x_lineedit.setObjectName("x_lineedit")
+        self.gridLayout_2.addWidget(self.x_lineedit, 1, 1, 1, 1)
+        self.label_5 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_5.setObjectName("label_5")
+        self.gridLayout_2.addWidget(self.label_5, 3, 0, 1, 1)
+        self.x_label = QtWidgets.QLabel(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.x_label.sizePolicy().hasHeightForWidth())
+        self.x_label.setSizePolicy(sizePolicy)
+        self.x_label.setObjectName("x_label")
+        self.gridLayout_2.addWidget(self.x_label, 1, 0, 1, 1)
+        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.gridLayout_2.addItem(spacerItem1, 4, 1, 1, 1)
+        self.horizontalLayout_4.addLayout(self.gridLayout_2)
         self.verticalLayout_3.addWidget(self.groupBox)
-        self.groupBox_2 = QtWidgets.QGroupBox(self.tabWidgetPage1)
+        self.dsdfsf = QtWidgets.QLabel(parent=self.tabWidgetPage1)
+        self.dsdfsf.setObjectName("dsdfsf")
+        self.verticalLayout_3.addWidget(self.dsdfsf)
+        self.gridLayout = QtWidgets.QGridLayout()
+        self.gridLayout.setObjectName("gridLayout")
+        self.re_match_index = QtWidgets.QSpinBox(parent=self.tabWidgetPage1)
+        self.re_match_index.setMinimum(1)
+        self.re_match_index.setObjectName("re_match_index")
+        self.gridLayout.addWidget(self.re_match_index, 1, 3, 1, 1)
+        self.label_9 = QtWidgets.QLabel(parent=self.tabWidgetPage1)
+        self.label_9.setObjectName("label_9")
+        self.gridLayout.addWidget(self.label_9, 1, 2, 1, 1)
+        self.regex_input = QtWidgets.QLineEdit(parent=self.tabWidgetPage1)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.regex_input.sizePolicy().hasHeightForWidth())
+        self.regex_input.setSizePolicy(sizePolicy)
+        self.regex_input.setObjectName("regex_input")
+        self.gridLayout.addWidget(self.regex_input, 1, 1, 1, 1)
+        self.re_button = QtWidgets.QRadioButton(parent=self.tabWidgetPage1)
+        self.re_button.setChecked(True)
+        self.re_button.setObjectName("re_button")
+        self.buttonGroup_2 = QtWidgets.QButtonGroup(ascii_reader)
+        self.buttonGroup_2.setObjectName("buttonGroup_2")
+        self.buttonGroup_2.addButton(self.re_button)
+        self.gridLayout.addWidget(self.re_button, 1, 0, 1, 1)
+        self.custom_input = QtWidgets.QLineEdit(parent=self.tabWidgetPage1)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.custom_input.sizePolicy().hasHeightForWidth())
+        self.custom_input.setSizePolicy(sizePolicy)
+        self.custom_input.setObjectName("custom_input")
+        self.gridLayout.addWidget(self.custom_input, 2, 1, 1, 1)
+        self.custom_button = QtWidgets.QRadioButton(parent=self.tabWidgetPage1)
+        self.custom_button.setObjectName("custom_button")
+        self.buttonGroup_2.addButton(self.custom_button)
+        self.gridLayout.addWidget(self.custom_button, 2, 0, 1, 1)
+        self.label_8 = QtWidgets.QLabel(parent=self.tabWidgetPage1)
+        self.label_8.setWordWrap(True)
+        self.label_8.setObjectName("label_8")
+        self.gridLayout.addWidget(self.label_8, 0, 0, 1, 4)
+        self.verticalLayout_3.addLayout(self.gridLayout)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=self.tabWidgetPage1)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth())
+        self.groupBox_2.setSizePolicy(sizePolicy)
         self.groupBox_2.setObjectName("groupBox_2")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_2)
         self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_2.setSpacing(0)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.ascii_table = QtWidgets.QTableWidget(self.groupBox_2)
+        self.ascii_table = QtWidgets.QTableWidget(parent=self.groupBox_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.ascii_table.sizePolicy().hasHeightForWidth())
         self.ascii_table.setSizePolicy(sizePolicy)
-        self.ascii_table.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+        self.ascii_table.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded)
-        self.ascii_table.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.ascii_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
         self.ascii_table.setAlternatingRowColors(True)
-        self.ascii_table.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
+        self.ascii_table.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
-        self.ascii_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectColumns)
+        self.ascii_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectColumns)
         self.ascii_table.setObjectName("ascii_table")
         self.ascii_table.setColumnCount(0)
         self.ascii_table.setRowCount(0)
@@ -161,81 +233,76 @@ class Ui_ascii_reader(object):
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.tabWidgetPage2)
         self.horizontalLayout_3.setContentsMargins(6, 6, 6, 6)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.delay_textfield = QtWidgets.QPlainTextEdit(self.tabWidgetPage2)
+        self.delay_textfield = QtWidgets.QPlainTextEdit(parent=self.tabWidgetPage2)
         self.delay_textfield.setObjectName("delay_textfield")
         self.horizontalLayout_3.addWidget(self.delay_textfield)
         self.formLayout = QtWidgets.QFormLayout()
-        self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow)
+        self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.FieldGrowthPolicy.ExpandingFieldsGrow)
         self.formLayout.setContentsMargins(0, -1, -1, -1)
         self.formLayout.setObjectName("formLayout")
-        self.label_2 = QtWidgets.QLabel(self.tabWidgetPage2)
+        self.label_2 = QtWidgets.QLabel(parent=self.tabWidgetPage2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
         self.label_2.setSizePolicy(sizePolicy)
         self.label_2.setObjectName("label_2")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_2)
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_2)
-        self.delay_lineedit = QtWidgets.QLineEdit(self.tabWidgetPage2)
+        self.delay_lineedit = QtWidgets.QLineEdit(parent=self.tabWidgetPage2)
         self.delay_lineedit.setObjectName("delay_lineedit")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.delay_lineedit)
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.delay_lineedit)
-        self.label_3 = QtWidgets.QLabel(self.tabWidgetPage2)
+        self.label_3 = QtWidgets.QLabel(parent=self.tabWidgetPage2)
         self.label_3.setObjectName("label_3")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_3)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
-        self.start_lineedit = QtWidgets.QLineEdit(self.tabWidgetPage2)
+        self.start_lineedit = QtWidgets.QLineEdit(parent=self.tabWidgetPage2)
         self.start_lineedit.setObjectName("start_lineedit")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.start_lineedit)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.start_lineedit)
-        self.label_4 = QtWidgets.QLabel(self.tabWidgetPage2)
+        self.label_4 = QtWidgets.QLabel(parent=self.tabWidgetPage2)
         self.label_4.setObjectName("label_4")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_4)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_4)
-        self.end_lineedit = QtWidgets.QLineEdit(self.tabWidgetPage2)
+        self.end_lineedit = QtWidgets.QLineEdit(parent=self.tabWidgetPage2)
         self.end_lineedit.setObjectName("end_lineedit")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.end_lineedit)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.end_lineedit)
-        self.log_checkBox = QtWidgets.QCheckBox(self.tabWidgetPage2)
+        self.log_checkBox = QtWidgets.QCheckBox(parent=self.tabWidgetPage2)
-        self.log_checkBox.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.log_checkBox.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.log_checkBox.setObjectName("log_checkBox")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.SpanningRole, self.log_checkBox)
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.SpanningRole, self.log_checkBox)
-        self.staggered_checkBox = QtWidgets.QCheckBox(self.tabWidgetPage2)
+        self.staggered_checkBox = QtWidgets.QCheckBox(parent=self.tabWidgetPage2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.staggered_checkBox.sizePolicy().hasHeightForWidth())
         self.staggered_checkBox.setSizePolicy(sizePolicy)
         self.staggered_checkBox.setObjectName("staggered_checkBox")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.staggered_checkBox)
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.LabelRole, self.staggered_checkBox)
-        self.stag_lineEdit = QtWidgets.QLineEdit(self.tabWidgetPage2)
+        self.stag_lineEdit = QtWidgets.QLineEdit(parent=self.tabWidgetPage2)
         self.stag_lineEdit.setEnabled(True)
         self.stag_lineEdit.setObjectName("stag_lineEdit")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.stag_lineEdit)
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.FieldRole, self.stag_lineEdit)
-        self.pushButton = QtWidgets.QPushButton(self.tabWidgetPage2)
+        self.pushButton = QtWidgets.QPushButton(parent=self.tabWidgetPage2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.pushButton.sizePolicy().hasHeightForWidth())
         self.pushButton.setSizePolicy(sizePolicy)
         self.pushButton.setObjectName("pushButton")
-        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.pushButton)
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.ItemRole.FieldRole, self.pushButton)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.formLayout.setItem(6, QtWidgets.QFormLayout.FieldRole, spacerItem)
+        self.formLayout.setItem(6, QtWidgets.QFormLayout.ItemRole.FieldRole, spacerItem2)
         self.horizontalLayout_3.addLayout(self.formLayout)
         self.tabWidget.addTab(self.tabWidgetPage2, "")
         self.verticalLayout.addWidget(self.tabWidget)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem1)
-        self.verticalLayout.addLayout(self.horizontalLayout)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.skippy_checkbox = QtWidgets.QCheckBox(ascii_reader)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem3)
+        self.skippy_checkbox = QtWidgets.QCheckBox(parent=ascii_reader)
         self.skippy_checkbox.setObjectName("skippy_checkbox")
         self.horizontalLayout_2.addWidget(self.skippy_checkbox)
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem2)
         self.verticalLayout.addLayout(self.horizontalLayout_2)
-        self.buttonbox = QtWidgets.QDialogButtonBox(ascii_reader)
+        self.buttonbox = QtWidgets.QDialogButtonBox(parent=ascii_reader)
-        self.buttonbox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonbox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonbox.setObjectName("buttonbox")
         self.verticalLayout.addWidget(self.buttonbox)
 
@@ -247,14 +314,20 @@ class Ui_ascii_reader(object):
         ascii_reader.setTabOrder(self.column_checkBox, self.line_spinBox)
         ascii_reader.setTabOrder(self.line_spinBox, self.preview_spinBox)
         ascii_reader.setTabOrder(self.preview_spinBox, self.pts_radioButton)
-        ascii_reader.setTabOrder(self.pts_radioButton, self.FID_radioButton)
+        ascii_reader.setTabOrder(self.pts_radioButton, self.dsc_radioButton)
+        ascii_reader.setTabOrder(self.dsc_radioButton, self.FID_radioButton)
         ascii_reader.setTabOrder(self.FID_radioButton, self.spectrum_radioButton)
-        ascii_reader.setTabOrder(self.spectrum_radioButton, self.x_lineedit)
+        ascii_reader.setTabOrder(self.spectrum_radioButton, self.bds_radioButton)
+        ascii_reader.setTabOrder(self.bds_radioButton, self.x_lineedit)
         ascii_reader.setTabOrder(self.x_lineedit, self.y_lineedit)
         ascii_reader.setTabOrder(self.y_lineedit, self.deltay_lineEdit)
-        ascii_reader.setTabOrder(self.deltay_lineEdit, self.ascii_table)
+        ascii_reader.setTabOrder(self.deltay_lineEdit, self.re_button)
-        ascii_reader.setTabOrder(self.ascii_table, self.skippy_checkbox)
+        ascii_reader.setTabOrder(self.re_button, self.regex_input)
-        ascii_reader.setTabOrder(self.skippy_checkbox, self.delay_textfield)
+        ascii_reader.setTabOrder(self.regex_input, self.re_match_index)
+        ascii_reader.setTabOrder(self.re_match_index, self.custom_button)
+        ascii_reader.setTabOrder(self.custom_button, self.custom_input)
+        ascii_reader.setTabOrder(self.custom_input, self.ascii_table)
+        ascii_reader.setTabOrder(self.ascii_table, self.delay_textfield)
         ascii_reader.setTabOrder(self.delay_textfield, self.delay_lineedit)
         ascii_reader.setTabOrder(self.delay_lineedit, self.start_lineedit)
         ascii_reader.setTabOrder(self.start_lineedit, self.end_lineedit)
@@ -262,24 +335,33 @@ class Ui_ascii_reader(object):
         ascii_reader.setTabOrder(self.log_checkBox, self.staggered_checkBox)
         ascii_reader.setTabOrder(self.staggered_checkBox, self.stag_lineEdit)
         ascii_reader.setTabOrder(self.stag_lineEdit, self.pushButton)
+        ascii_reader.setTabOrder(self.pushButton, self.skippy_checkbox)
 
     def retranslateUi(self, ascii_reader):
         _translate = QtCore.QCoreApplication.translate
         ascii_reader.setWindowTitle(_translate("ascii_reader", "Read text file"))
         self.groupBox.setTitle(_translate("ascii_reader", "Options"))
-        self.FID_radioButton.setText(_translate("ascii_reader", "FID"))
-        self.x_lineedit.setToolTip(_translate("ascii_reader", "<html><head/><body><p>Specify which column is used as x-value.</p></body></html>"))
-        self.y_label.setText(_translate("ascii_reader", "y"))
-        self.pts_radioButton.setText(_translate("ascii_reader", "Points"))
-        self.label_5.setText(_translate("ascii_reader", "<html><head/><body><p>Δy</p></body></html>"))
         self.column_checkBox.setText(_translate("ascii_reader", "Column name"))
-        self.label.setText(_translate("ascii_reader", "Import as"))
-        self.label_7.setText(_translate("ascii_reader", "Use columns as"))
-        self.y_lineedit.setToolTip(_translate("ascii_reader", "<html><head/><body><p>Specify which columns are read for y-values. (\'Points\': Every number creates a new data set;\'FID\'/\'Spectrum\': Numbers at even positions are used for real parts, at odd positions for imaginary parts.)</p></body></html>"))
-        self.spectrum_radioButton.setText(_translate("ascii_reader", "Spectrum"))
-        self.x_label.setText(_translate("ascii_reader", "x"))
         self.line_spinBox.setPrefix(_translate("ascii_reader", "header line "))
         self.label_6.setText(_translate("ascii_reader", "Preview length"))
+        self.label.setText(_translate("ascii_reader", "Import as"))
+        self.pts_radioButton.setText(_translate("ascii_reader", "Points"))
+        self.dsc_radioButton.setText(_translate("ascii_reader", "DSC"))
+        self.FID_radioButton.setText(_translate("ascii_reader", "FID"))
+        self.spectrum_radioButton.setText(_translate("ascii_reader", "Spectrum"))
+        self.bds_radioButton.setText(_translate("ascii_reader", "BDS"))
+        self.label_7.setText(_translate("ascii_reader", "Use columns as"))
+        self.y_lineedit.setToolTip(_translate("ascii_reader", "<html><head/><body><p>Specify which columns are used for y values.</p><p>- \'Points\': Every number creates a new data set;<br/>- \'FID\'/\'Spectrum\': Numbers at even positions are used for real parts, at odd positions for imaginary parts.</p></body></html>"))
+        self.y_label.setText(_translate("ascii_reader", "y"))
+        self.x_lineedit.setToolTip(_translate("ascii_reader", "<html><head/><body><p>Specify which column is used for x values, write <span style=\" font-style:italic;\">index</span> to use row numbers (starting with 0). </p></body></html>"))
+        self.label_5.setText(_translate("ascii_reader", "<html><head/><body><p>Δy</p></body></html>"))
+        self.x_label.setText(_translate("ascii_reader", "x"))
+        self.dsdfsf.setText(_translate("ascii_reader", "Numerical value"))
+        self.label_9.setText(_translate("ascii_reader", "Match index"))
+        self.regex_input.setToolTip(_translate("ascii_reader", "<html><head/><body><p>Token:<br/>[abc]: Matches any of a, b, or c<br/>[a-z]: Matches any digit in the range a-z<br/>\\d: Matches any digit in the range 0-9 (equal to [0-9}</p><p>Quantifiers:<br/>a*: 0 or more of a<br/>a*: 1 or more of a<br/>a?: 0 or 1 of a</p></body></html>"))
+        self.re_button.setText(_translate("ascii_reader", "Regex"))
+        self.custom_button.setText(_translate("ascii_reader", "Custom value"))
+        self.label_8.setText(_translate("ascii_reader", "Filename"))
         self.groupBox_2.setTitle(_translate("ascii_reader", "Preview"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabWidgetPage1), _translate("ascii_reader", "Data"))
         self.label_2.setText(_translate("ascii_reader", "Number of delays"))

src/gui_qt/_py/axisConfigTemplate.py

@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file '_ui/axisConfigTemplate.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(186, 154)
-        Form.setMaximumSize(QtCore.QSize(200, 16777215))
-        self.gridLayout = QtWidgets.QGridLayout(Form)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setSpacing(0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.label = QtWidgets.QLabel(Form)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 7, 0, 1, 2)
-        self.linkCombo = QtWidgets.QComboBox(Form)
-        self.linkCombo.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
-        self.linkCombo.setObjectName("linkCombo")
-        self.gridLayout.addWidget(self.linkCombo, 7, 2, 1, 2)
-        self.autoPercentSpin = QtWidgets.QSpinBox(Form)
-        self.autoPercentSpin.setEnabled(True)
-        self.autoPercentSpin.setMinimum(1)
-        self.autoPercentSpin.setMaximum(100)
-        self.autoPercentSpin.setSingleStep(1)
-        self.autoPercentSpin.setProperty("value", 100)
-        self.autoPercentSpin.setObjectName("autoPercentSpin")
-        self.gridLayout.addWidget(self.autoPercentSpin, 2, 2, 1, 2)
-        self.autoRadio = QtWidgets.QRadioButton(Form)
-        self.autoRadio.setChecked(True)
-        self.autoRadio.setObjectName("autoRadio")
-        self.gridLayout.addWidget(self.autoRadio, 2, 0, 1, 2)
-        self.manualRadio = QtWidgets.QRadioButton(Form)
-        self.manualRadio.setObjectName("manualRadio")
-        self.gridLayout.addWidget(self.manualRadio, 1, 0, 1, 2)
-        self.minText = QtWidgets.QLineEdit(Form)
-        self.minText.setObjectName("minText")
-        self.gridLayout.addWidget(self.minText, 1, 2, 1, 1)
-        self.maxText = QtWidgets.QLineEdit(Form)
-        self.maxText.setObjectName("maxText")
-        self.gridLayout.addWidget(self.maxText, 1, 3, 1, 1)
-        self.invertCheck = QtWidgets.QCheckBox(Form)
-        self.invertCheck.setObjectName("invertCheck")
-        self.gridLayout.addWidget(self.invertCheck, 5, 0, 1, 4)
-        self.mouseCheck = QtWidgets.QCheckBox(Form)
-        self.mouseCheck.setChecked(True)
-        self.mouseCheck.setObjectName("mouseCheck")
-        self.gridLayout.addWidget(self.mouseCheck, 6, 0, 1, 4)
-        self.visibleOnlyCheck = QtWidgets.QCheckBox(Form)
-        self.visibleOnlyCheck.setObjectName("visibleOnlyCheck")
-        self.gridLayout.addWidget(self.visibleOnlyCheck, 3, 2, 1, 2)
-        self.autoPanCheck = QtWidgets.QCheckBox(Form)
-        self.autoPanCheck.setObjectName("autoPanCheck")
-        self.gridLayout.addWidget(self.autoPanCheck, 4, 2, 1, 2)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "PyQtGraph"))
-        self.label.setText(_translate("Form", "Link Axis:"))
-        self.linkCombo.setToolTip(_translate("Form", "<html><head/><body><p>Links this axis with another view. When linked, both views will display the same data range.</p></body></html>"))
-        self.autoPercentSpin.setToolTip(_translate("Form", "<html><head/><body><p>Percent of data to be visible when auto-scaling. It may be useful to decrease this value for data with spiky noise.</p></body></html>"))
-        self.autoPercentSpin.setSuffix(_translate("Form", "%"))
-        self.autoRadio.setToolTip(_translate("Form", "<html><head/><body><p>Automatically resize this axis whenever the displayed data is changed.</p></body></html>"))
-        self.autoRadio.setText(_translate("Form", "Auto"))
-        self.manualRadio.setToolTip(_translate("Form", "<html><head/><body><p>Set the range for this axis manually. This disables automatic scaling. </p></body></html>"))
-        self.manualRadio.setText(_translate("Form", "Manual"))
-        self.minText.setToolTip(_translate("Form", "<html><head/><body><p>Minimum value to display for this axis.</p></body></html>"))
-        self.minText.setText(_translate("Form", "0"))
-        self.maxText.setToolTip(_translate("Form", "<html><head/><body><p>Maximum value to display for this axis.</p></body></html>"))
-        self.maxText.setText(_translate("Form", "0"))
-        self.invertCheck.setToolTip(_translate("Form", "<html><head/><body><p>Inverts the display of this axis. (+y points downward instead of upward)</p></body></html>"))
-        self.invertCheck.setText(_translate("Form", "Invert Axis"))
-        self.mouseCheck.setToolTip(_translate("Form", "<html><head/><body><p>Enables mouse interaction (panning, scaling) for this axis.</p></body></html>"))
-        self.mouseCheck.setText(_translate("Form", "Mouse Enabled"))
-        self.visibleOnlyCheck.setToolTip(_translate("Form", "<html><head/><body><p>When checked, the axis will only auto-scale to data that is visible along the orthogonal axis.</p></body></html>"))
-        self.visibleOnlyCheck.setText(_translate("Form", "Visible Data Only"))
-        self.autoPanCheck.setToolTip(_translate("Form", "<html><head/><body><p>When checked, the axis will automatically pan to center on the current data, but the scale along this axis will not change.</p></body></html>"))
-        self.autoPanCheck.setText(_translate("Form", "Auto Pan Only"))

src/gui_qt/_py/baseline_dialog.py

@@ -1,28 +1,27 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/baseline_dialog.ui'
-
-# Form implementation generated from reading ui file '_ui/baseline_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_SignalEdit(object):
     def setupUi(self, SignalEdit):
         SignalEdit.setObjectName("SignalEdit")
         SignalEdit.resize(919, 595)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(SignalEdit.sizePolicy().hasHeightForWidth())
         SignalEdit.setSizePolicy(sizePolicy)
         self.gridLayout = QtWidgets.QGridLayout(SignalEdit)
         self.gridLayout.setObjectName("gridLayout")
-        self.groupBox = QtWidgets.QWidget(SignalEdit)
+        self.groupBox = QtWidgets.QWidget(parent=SignalEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth())
@@ -30,8 +29,8 @@ class Ui_SignalEdit(object):
         self.groupBox.setObjectName("groupBox")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.listWidget = QtWidgets.QListWidget(self.groupBox)
+        self.listWidget = QtWidgets.QListWidget(parent=self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
@@ -39,13 +38,13 @@ class Ui_SignalEdit(object):
         self.listWidget.setObjectName("listWidget")
         self.verticalLayout.addWidget(self.listWidget)
         self.gridLayout.addWidget(self.groupBox, 0, 0, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(SignalEdit)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=SignalEdit)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 1, 0, 1, 3)
-        self.graphicsView = PlotWidget(SignalEdit)
+        self.graphicsView = NMRPlotWidget(parent=SignalEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.graphicsView.sizePolicy().hasHeightForWidth())
@@ -54,11 +53,11 @@ class Ui_SignalEdit(object):
         self.gridLayout.addWidget(self.graphicsView, 0, 2, 1, 1)
 
         self.retranslateUi(SignalEdit)
-        self.buttonBox.accepted.connect(SignalEdit.accept)
+        self.buttonBox.accepted.connect(SignalEdit.accept) # type: ignore
-        self.buttonBox.rejected.connect(SignalEdit.close)
+        self.buttonBox.rejected.connect(SignalEdit.close) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(SignalEdit)
 
     def retranslateUi(self, SignalEdit):
         _translate = QtCore.QCoreApplication.translate
         SignalEdit.setWindowTitle(_translate("SignalEdit", "Dialog"))
-from pyqtgraph import PlotWidget
+from ..lib.graph_items import NMRPlotWidget

src/gui_qt/_py/basewindow.py

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/basewindow.ui'
-
-# Form implementation generated from reading ui file 'src/resources/_ui/basewindow.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.7
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_BaseWindow(object):
@@ -16,22 +14,22 @@ class Ui_BaseWindow(object):
         BaseWindow.setObjectName("BaseWindow")
         BaseWindow.resize(1386, 827)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/logo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/logo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         BaseWindow.setWindowIcon(icon)
-        BaseWindow.setDockOptions(QtWidgets.QMainWindow.AllowTabbedDocks|QtWidgets.QMainWindow.AnimatedDocks|QtWidgets.QMainWindow.ForceTabbedDocks|QtWidgets.QMainWindow.VerticalTabs)
+        BaseWindow.setDockOptions(QtWidgets.QMainWindow.DockOption.AllowTabbedDocks|QtWidgets.QMainWindow.DockOption.AnimatedDocks|QtWidgets.QMainWindow.DockOption.ForceTabbedDocks|QtWidgets.QMainWindow.DockOption.VerticalTabs)
-        self.centralwidget = QtWidgets.QWidget(BaseWindow)
+        self.centralwidget = QtWidgets.QWidget(parent=BaseWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.centralwidget)
         self.horizontalLayout.setContentsMargins(3, 3, 3, 3)
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.splitter = QtWidgets.QSplitter(self.centralwidget)
+        self.splitter = QtWidgets.QSplitter(parent=self.centralwidget)
-        self.splitter.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Horizontal)
         self.splitter.setObjectName("splitter")
-        self.tabWidget = QtWidgets.QTabWidget(self.splitter)
+        self.tabWidget = QtWidgets.QTabWidget(parent=self.splitter)
-        self.tabWidget.setTabPosition(QtWidgets.QTabWidget.West)
+        self.tabWidget.setTabPosition(QtWidgets.QTabWidget.TabPosition.West)
-        self.tabWidget.setTabShape(QtWidgets.QTabWidget.Rounded)
+        self.tabWidget.setTabShape(QtWidgets.QTabWidget.TabShape.Rounded)
-        self.tabWidget.setElideMode(QtCore.Qt.ElideRight)
+        self.tabWidget.setElideMode(QtCore.Qt.TextElideMode.ElideRight)
         self.tabWidget.setTabsClosable(True)
         self.tabWidget.setMovable(False)
         self.tabWidget.setTabBarAutoHide(True)
@@ -42,27 +40,27 @@ class Ui_BaseWindow(object):
         self.valuewidget = ValueEditWidget()
         self.valuewidget.setObjectName("valuewidget")
         icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(":/value_dock"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addPixmap(QtGui.QPixmap(":/value_dock"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.tabWidget.addTab(self.valuewidget, icon1, "")
         self.fit_dialog = QFitDialog()
         self.fit_dialog.setObjectName("fit_dialog")
         icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(":/fit_dock"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addPixmap(QtGui.QPixmap(":/fit_dock"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.tabWidget.addTab(self.fit_dialog, icon2, "")
         self.editsignalwidget = EditSignalWidget()
         self.editsignalwidget.setObjectName("editsignalwidget")
         icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(":/signal_dock"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon3.addPixmap(QtGui.QPixmap(":/signal_dock"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.tabWidget.addTab(self.editsignalwidget, icon3, "")
         self.ptsselectwidget = PointSelectWidget()
         self.ptsselectwidget.setObjectName("ptsselectwidget")
         icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(":/peakpick_dock"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon4.addPixmap(QtGui.QPixmap(":/peakpick_dock"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.tabWidget.addTab(self.ptsselectwidget, icon4, "")
         self.t1tauwidget = QT1Widget()
         self.t1tauwidget.setObjectName("t1tauwidget")
         icon5 = QtGui.QIcon()
-        icon5.addPixmap(QtGui.QPixmap(":/eval_t1_dock"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon5.addPixmap(QtGui.QPixmap(":/eval_t1_dock"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.tabWidget.addTab(self.t1tauwidget, icon5, "")
         self.drawingswidget = DrawingsWidget()
         self.drawingswidget.setObjectName("drawingswidget")
@@ -70,294 +68,310 @@ class Ui_BaseWindow(object):
         self.integralwidget = IntegralWidget()
         self.integralwidget.setObjectName("integralwidget")
         self.tabWidget.addTab(self.integralwidget, "")
-        self.area = QtWidgets.QMdiArea(self.splitter)
+        self.area = MdiAreaTile(parent=self.splitter)
         self.area.setObjectName("area")
         self.horizontalLayout.addWidget(self.splitter)
         BaseWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtWidgets.QMenuBar(BaseWindow)
+        self.menubar = QtWidgets.QMenuBar(parent=BaseWindow)
         self.menubar.setGeometry(QtCore.QRect(0, 0, 1386, 20))
         self.menubar.setObjectName("menubar")
-        self.menuFile = QtWidgets.QMenu(self.menubar)
+        self.menuFile = QtWidgets.QMenu(parent=self.menubar)
         self.menuFile.setObjectName("menuFile")
-        self.menuSave = QtWidgets.QMenu(self.menuFile)
+        self.menuSave = QtWidgets.QMenu(parent=self.menuFile)
         icon6 = QtGui.QIcon()
-        icon6.addPixmap(QtGui.QPixmap(":/Daleks.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon6.addPixmap(QtGui.QPixmap(":/Daleks.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.menuSave.setIcon(icon6)
         self.menuSave.setSeparatorsCollapsible(True)
         self.menuSave.setObjectName("menuSave")
-        self.menuData = QtWidgets.QMenu(self.menubar)
+        self.menuData = QtWidgets.QMenu(parent=self.menubar)
         self.menuData.setObjectName("menuData")
-        self.menuHelp = QtWidgets.QMenu(self.menubar)
+        self.menuCut_to_visible_range = QtWidgets.QMenu(parent=self.menuData)
+        self.menuCut_to_visible_range.setObjectName("menuCut_to_visible_range")
+        self.menuHelp = QtWidgets.QMenu(parent=self.menubar)
         self.menuHelp.setObjectName("menuHelp")
-        self.menuExtra = QtWidgets.QMenu(self.menubar)
+        self.menuExtra = QtWidgets.QMenu(parent=self.menubar)
         self.menuExtra.setObjectName("menuExtra")
-        self.menuNormalize = QtWidgets.QMenu(self.menuExtra)
+        self.menuNormalize = QtWidgets.QMenu(parent=self.menuExtra)
         icon7 = QtGui.QIcon()
-        icon7.addPixmap(QtGui.QPixmap(":/normal.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon7.addPixmap(QtGui.QPixmap(":/normal.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.menuNormalize.setIcon(icon7)
         self.menuNormalize.setObjectName("menuNormalize")
-        self.menuFit = QtWidgets.QMenu(self.menubar)
+        self.menuFit = QtWidgets.QMenu(parent=self.menubar)
         self.menuFit.setObjectName("menuFit")
-        self.menuMethod = QtWidgets.QMenu(self.menuFit)
+        self.menuMethod = QtWidgets.QMenu(parent=self.menuFit)
         self.menuMethod.setObjectName("menuMethod")
-        self.menuLimits = QtWidgets.QMenu(self.menuFit)
+        self.menuLimits = QtWidgets.QMenu(parent=self.menuFit)
         self.menuLimits.setObjectName("menuLimits")
-        self.menuOptions = QtWidgets.QMenu(self.menubar)
+        self.menuOptions = QtWidgets.QMenu(parent=self.menubar)
         self.menuOptions.setObjectName("menuOptions")
-        self.menuWindow = QtWidgets.QMenu(self.menubar)
+        self.menuWindow = QtWidgets.QMenu(parent=self.menubar)
         self.menuWindow.setObjectName("menuWindow")
-        self.menuView = QtWidgets.QMenu(self.menuWindow)
+        self.menuView = QtWidgets.QMenu(parent=self.menuWindow)
         self.menuView.setObjectName("menuView")
-        self.menuNMR = QtWidgets.QMenu(self.menubar)
+        self.menuNMR = QtWidgets.QMenu(parent=self.menubar)
         self.menuNMR.setObjectName("menuNMR")
-        self.menuBDS = QtWidgets.QMenu(self.menubar)
+        self.menuBDS = QtWidgets.QMenu(parent=self.menubar)
         self.menuBDS.setObjectName("menuBDS")
-        self.menuSpectrum = QtWidgets.QMenu(self.menubar)
+        self.menuSpectrum = QtWidgets.QMenu(parent=self.menubar)
         self.menuSpectrum.setObjectName("menuSpectrum")
-        self.menuStuff = QtWidgets.QMenu(self.menubar)
+        self.menuStuff = QtWidgets.QMenu(parent=self.menubar)
         self.menuStuff.setTitle("")
         self.menuStuff.setObjectName("menuStuff")
+        self.menuDSC = QtWidgets.QMenu(parent=self.menubar)
+        self.menuDSC.setObjectName("menuDSC")
         BaseWindow.setMenuBar(self.menubar)
-        self.toolBar = QtWidgets.QToolBar(BaseWindow)
+        self.toolBar = QtWidgets.QToolBar(parent=BaseWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.toolBar.sizePolicy().hasHeightForWidth())
         self.toolBar.setSizePolicy(sizePolicy)
-        self.toolBar.setAllowedAreas(QtCore.Qt.AllToolBarAreas)
+        self.toolBar.setAllowedAreas(QtCore.Qt.ToolBarArea.AllToolBarAreas)
         self.toolBar.setIconSize(QtCore.QSize(24, 24))
-        self.toolBar.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+        self.toolBar.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.toolBar.setObjectName("toolBar")
-        BaseWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar)
+        BaseWindow.addToolBar(QtCore.Qt.ToolBarArea.TopToolBarArea, self.toolBar)
-        self.toolbar_edit = QtWidgets.QToolBar(BaseWindow)
+        self.toolbar_edit = QtWidgets.QToolBar(parent=BaseWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.toolbar_edit.sizePolicy().hasHeightForWidth())
         self.toolbar_edit.setSizePolicy(sizePolicy)
         self.toolbar_edit.setIconSize(QtCore.QSize(24, 24))
-        self.toolbar_edit.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+        self.toolbar_edit.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.toolbar_edit.setObjectName("toolbar_edit")
-        BaseWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolbar_edit)
+        BaseWindow.addToolBar(QtCore.Qt.ToolBarArea.TopToolBarArea, self.toolbar_edit)
-        self.statusBar = QtWidgets.QStatusBar(BaseWindow)
+        self.statusBar = QtWidgets.QStatusBar(parent=BaseWindow)
         self.statusBar.setObjectName("statusBar")
         BaseWindow.setStatusBar(self.statusBar)
-        self.toolBar_nmr = QtWidgets.QToolBar(BaseWindow)
+        self.toolBar_nmr = QtWidgets.QToolBar(parent=BaseWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.toolBar_nmr.sizePolicy().hasHeightForWidth())
         self.toolBar_nmr.setSizePolicy(sizePolicy)
         self.toolBar_nmr.setIconSize(QtCore.QSize(24, 24))
         self.toolBar_nmr.setObjectName("toolBar_nmr")
-        BaseWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar_nmr)
+        BaseWindow.addToolBar(QtCore.Qt.ToolBarArea.TopToolBarArea, self.toolBar_nmr)
-        self.toolBar_fit = QtWidgets.QToolBar(BaseWindow)
+        self.toolBar_spectrum = QtWidgets.QToolBar(parent=BaseWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.toolBar_fit.sizePolicy().hasHeightForWidth())
-        self.toolBar_fit.setSizePolicy(sizePolicy)
-        self.toolBar_fit.setIconSize(QtCore.QSize(24, 24))
-        self.toolBar_fit.setObjectName("toolBar_fit")
-        BaseWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar_fit)
-        self.toolBar_spectrum = QtWidgets.QToolBar(BaseWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.toolBar_spectrum.sizePolicy().hasHeightForWidth())
         self.toolBar_spectrum.setSizePolicy(sizePolicy)
         self.toolBar_spectrum.setIconSize(QtCore.QSize(24, 24))
         self.toolBar_spectrum.setObjectName("toolBar_spectrum")
-        BaseWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar_spectrum)
+        BaseWindow.addToolBar(QtCore.Qt.ToolBarArea.TopToolBarArea, self.toolBar_spectrum)
-        self.toolBar_data = QtWidgets.QToolBar(BaseWindow)
+        self.toolBar_data = QtWidgets.QToolBar(parent=BaseWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.toolBar_data.sizePolicy().hasHeightForWidth())
         self.toolBar_data.setSizePolicy(sizePolicy)
         self.toolBar_data.setIconSize(QtCore.QSize(24, 24))
         self.toolBar_data.setObjectName("toolBar_data")
-        BaseWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar_data)
+        BaseWindow.addToolBar(QtCore.Qt.ToolBarArea.TopToolBarArea, self.toolBar_data)
-        self.action_close = QtWidgets.QAction(BaseWindow)
+        self.action_close = QtGui.QAction(parent=BaseWindow)
         self.action_close.setObjectName("action_close")
-        self.actionExportGraphic = QtWidgets.QAction(BaseWindow)
+        self.actionExportGraphic = QtGui.QAction(parent=BaseWindow)
         self.actionExportGraphic.setObjectName("actionExportGraphic")
-        self.action_open = QtWidgets.QAction(BaseWindow)
+        self.action_open = QtGui.QAction(parent=BaseWindow)
         self.action_open.setObjectName("action_open")
-        self.actionExportData = QtWidgets.QAction(BaseWindow)
+        self.actionExportData = QtGui.QAction(parent=BaseWindow)
         self.actionExportData.setObjectName("actionExportData")
-        self.action_calc = QtWidgets.QAction(BaseWindow)
+        self.action_calc = QtGui.QAction(parent=BaseWindow)
         self.action_calc.setObjectName("action_calc")
-        self.action_delete_sets = QtWidgets.QAction(BaseWindow)
+        self.action_delete_sets = QtGui.QAction(parent=BaseWindow)
         self.action_delete_sets.setObjectName("action_delete_sets")
-        self.action_save_fit_parameter = QtWidgets.QAction(BaseWindow)
+        self.action_save_fit_parameter = QtGui.QAction(parent=BaseWindow)
         self.action_save_fit_parameter.setObjectName("action_save_fit_parameter")
-        self.action_sort_pts = QtWidgets.QAction(BaseWindow)
+        self.action_sort_pts = QtGui.QAction(parent=BaseWindow)
         self.action_sort_pts.setObjectName("action_sort_pts")
-        self.action_reset = QtWidgets.QAction(BaseWindow)
+        self.action_reset = QtGui.QAction(parent=BaseWindow)
         self.action_reset.setObjectName("action_reset")
-        self.actionDocumentation = QtWidgets.QAction(BaseWindow)
+        self.actionDocumentation = QtGui.QAction(parent=BaseWindow)
         self.actionDocumentation.setObjectName("actionDocumentation")
-        self.action_FitWidget = QtWidgets.QAction(BaseWindow)
+        self.action_FitWidget = QtGui.QAction(parent=BaseWindow)
         self.action_FitWidget.setObjectName("action_FitWidget")
-        self.action_norm_max = QtWidgets.QAction(BaseWindow)
+        self.action_norm_max = QtGui.QAction(parent=BaseWindow)
         self.action_norm_max.setObjectName("action_norm_max")
-        self.action_norm_first = QtWidgets.QAction(BaseWindow)
+        self.action_norm_first = QtGui.QAction(parent=BaseWindow)
         self.action_norm_first.setObjectName("action_norm_first")
-        self.action_norm_area = QtWidgets.QAction(BaseWindow)
+        self.action_norm_area = QtGui.QAction(parent=BaseWindow)
         self.action_norm_area.setObjectName("action_norm_area")
-        self.action_norm_max_abs = QtWidgets.QAction(BaseWindow)
+        self.action_norm_max_abs = QtGui.QAction(parent=BaseWindow)
         self.action_norm_max_abs.setObjectName("action_norm_max_abs")
-        self.action_norm_last = QtWidgets.QAction(BaseWindow)
+        self.action_norm_last = QtGui.QAction(parent=BaseWindow)
         self.action_norm_last.setObjectName("action_norm_last")
-        self.actionSave = QtWidgets.QAction(BaseWindow)
+        self.actionSave = QtGui.QAction(parent=BaseWindow)
         self.actionSave.setObjectName("actionSave")
-        self.actiontoolbar_display = QtWidgets.QAction(BaseWindow)
+        self.actiontoolbar_display = QtGui.QAction(parent=BaseWindow)
         self.actiontoolbar_display.setCheckable(True)
         self.actiontoolbar_display.setObjectName("actiontoolbar_display")
-        self.actionEdit_toolbars = QtWidgets.QAction(BaseWindow)
+        self.actionEdit_toolbars = QtGui.QAction(parent=BaseWindow)
         self.actionEdit_toolbars.setCheckable(True)
         self.actionEdit_toolbars.setObjectName("actionEdit_toolbars")
-        self.actionAddlines = QtWidgets.QAction(BaseWindow)
+        self.actionAddlines = QtGui.QAction(parent=BaseWindow)
         self.actionAddlines.setObjectName("actionAddlines")
-        self.actionColors = QtWidgets.QAction(BaseWindow)
+        self.actionColors = QtGui.QAction(parent=BaseWindow)
         self.actionColors.setObjectName("actionColors")
-        self.actionConcatenate_sets = QtWidgets.QAction(BaseWindow)
+        self.actionConcatenate_sets = QtGui.QAction(parent=BaseWindow)
         self.actionConcatenate_sets.setObjectName("actionConcatenate_sets")
-        self.actionShift = QtWidgets.QAction(BaseWindow)
+        self.actionShift = QtGui.QAction(parent=BaseWindow)
         self.actionShift.setObjectName("actionShift")
-        self.actionShow_log = QtWidgets.QAction(BaseWindow)
+        self.actionShow_log = QtGui.QAction(parent=BaseWindow)
         icon = QtGui.QIcon.fromTheme("dialog-information")
         self.actionShow_log.setIcon(icon)
         self.actionShow_log.setObjectName("actionShow_log")
-        self.action_create_fit_function = QtWidgets.QAction(BaseWindow)
+        self.action_create_fit_function = QtGui.QAction(parent=BaseWindow)
         self.action_create_fit_function.setObjectName("action_create_fit_function")
-        self.action_colorcycle = QtWidgets.QAction(BaseWindow)
+        self.action_colorcycle = QtGui.QAction(parent=BaseWindow)
         self.action_colorcycle.setObjectName("action_colorcycle")
-        self.actionSave_session = QtWidgets.QAction(BaseWindow)
+        self.actionSave_session = QtGui.QAction(parent=BaseWindow)
         self.actionSave_session.setObjectName("actionSave_session")
-        self.actionMouse_behaviour = QtWidgets.QAction(BaseWindow)
+        self.actionMouse_behaviour = QtGui.QAction(parent=BaseWindow)
         self.actionMouse_behaviour.setCheckable(True)
         self.actionMouse_behaviour.setObjectName("actionMouse_behaviour")
-        self.actionConfiguration = QtWidgets.QAction(BaseWindow)
+        self.actionConfiguration = QtGui.QAction(parent=BaseWindow)
         self.actionConfiguration.setObjectName("actionConfiguration")
-        self.actionRefresh = QtWidgets.QAction(BaseWindow)
+        self.actionRefresh = QtGui.QAction(parent=BaseWindow)
         self.actionRefresh.setObjectName("actionRefresh")
-        self.actionInterpolation = QtWidgets.QAction(BaseWindow)
+        self.actionInterpolation = QtGui.QAction(parent=BaseWindow)
         self.actionInterpolation.setObjectName("actionInterpolation")
-        self.actionRunning_values = QtWidgets.QAction(BaseWindow)
+        self.actionRunning_values = QtGui.QAction(parent=BaseWindow)
         self.actionRunning_values.setObjectName("actionRunning_values")
-        self.actionFit_parameter_saving = QtWidgets.QAction(BaseWindow)
+        self.actionFit_parameter_saving = QtGui.QAction(parent=BaseWindow)
         self.actionFit_parameter_saving.setObjectName("actionFit_parameter_saving")
-        self.actionShow_fit_parameter = QtWidgets.QAction(BaseWindow)
+        self.actionShow_fit_parameter = QtGui.QAction(parent=BaseWindow)
         self.actionShow_fit_parameter.setObjectName("actionShow_fit_parameter")
-        self.actionSkip_points = QtWidgets.QAction(BaseWindow)
+        self.actionSkip_points = QtGui.QAction(parent=BaseWindow)
         self.actionSkip_points.setObjectName("actionSkip_points")
-        self.actionGuide_lines = QtWidgets.QAction(BaseWindow)
+        self.actionGuide_lines = QtGui.QAction(parent=BaseWindow)
         self.actionGuide_lines.setObjectName("actionGuide_lines")
-        self.actionMaximize = QtWidgets.QAction(BaseWindow)
+        self.actionMaximize = QtGui.QAction(parent=BaseWindow)
         self.actionMaximize.setCheckable(True)
         self.actionMaximize.setVisible(False)
         self.actionMaximize.setObjectName("actionMaximize")
-        self.actionTile = QtWidgets.QAction(BaseWindow)
+        self.actionTile = QtGui.QAction(parent=BaseWindow)
         self.actionTile.setObjectName("actionTile")
-        self.actionMinimize = QtWidgets.QAction(BaseWindow)
+        self.actionTileVertical = QtGui.QAction(parent=BaseWindow)
+        self.actionTileVertical.setObjectName("actionTileVertical")
+        self.actionTileHorizontal = QtGui.QAction(parent=BaseWindow)
+        self.actionTileHorizontal.setObjectName("actionTileHorizontal")
+        self.actionMinimize = QtGui.QAction(parent=BaseWindow)
         self.actionMinimize.setCheckable(True)
         self.actionMinimize.setVisible(False)
         self.actionMinimize.setObjectName("actionMinimize")
-        self.actionNew_window = QtWidgets.QAction(BaseWindow)
+        self.actionNew_window = QtGui.QAction(parent=BaseWindow)
         self.actionNew_window.setObjectName("actionNew_window")
-        self.actionDelete_window = QtWidgets.QAction(BaseWindow)
+        self.actionDelete_window = QtGui.QAction(parent=BaseWindow)
         self.actionDelete_window.setObjectName("actionDelete_window")
-        self.actionCascade_windows = QtWidgets.QAction(BaseWindow)
+        self.actionCascade_windows = QtGui.QAction(parent=BaseWindow)
         self.actionCascade_windows.setObjectName("actionCascade_windows")
-        self.actionNext_window = QtWidgets.QAction(BaseWindow)
+        self.actionNext_window = QtGui.QAction(parent=BaseWindow)
         self.actionNext_window.setObjectName("actionNext_window")
-        self.actionPrevious = QtWidgets.QAction(BaseWindow)
+        self.actionPrevious = QtGui.QAction(parent=BaseWindow)
         self.actionPrevious.setObjectName("actionPrevious")
-        self.t1action = QtWidgets.QAction(BaseWindow)
+        self.t1action = QtGui.QAction(parent=BaseWindow)
         self.t1action.setObjectName("t1action")
-        self.t1tau = QtWidgets.QAction(BaseWindow)
+        self.t1tau = QtGui.QAction(parent=BaseWindow)
         self.t1tau.setObjectName("t1tau")
-        self.action_coup_calc = QtWidgets.QAction(BaseWindow)
+        self.action_coup_calc = QtGui.QAction(parent=BaseWindow)
         self.action_coup_calc.setObjectName("action_coup_calc")
-        self.action_calc_eps_derivative = QtWidgets.QAction(BaseWindow)
+        self.action_calc_eps_derivative = QtGui.QAction(parent=BaseWindow)
         self.action_calc_eps_derivative.setObjectName("action_calc_eps_derivative")
-        self.actionOpen_FC = QtWidgets.QAction(BaseWindow)
+        self.actionOpen_FC = QtGui.QAction(parent=BaseWindow)
         self.actionOpen_FC.setObjectName("actionOpen_FC")
-        self.action_mean_t1 = QtWidgets.QAction(BaseWindow)
+        self.action_mean_t1 = QtGui.QAction(parent=BaseWindow)
         self.action_mean_t1.setObjectName("action_mean_t1")
-        self.actionFilon = QtWidgets.QAction(BaseWindow)
+        self.actionFilon = QtGui.QAction(parent=BaseWindow)
         self.actionFilon.setObjectName("actionFilon")
-        self.action_new_set = QtWidgets.QAction(BaseWindow)
+        self.action_new_set = QtGui.QAction(parent=BaseWindow)
         self.action_new_set.setObjectName("action_new_set")
-        self.action_magnitude = QtWidgets.QAction(BaseWindow)
+        self.action_magnitude = QtGui.QAction(parent=BaseWindow)
         self.action_magnitude.setObjectName("action_magnitude")
-        self.actionCenterMax = QtWidgets.QAction(BaseWindow)
+        self.actionCenterMax = QtGui.QAction(parent=BaseWindow)
         self.actionCenterMax.setObjectName("actionCenterMax")
-        self.action_depake = QtWidgets.QAction(BaseWindow)
+        self.action_depake = QtGui.QAction(parent=BaseWindow)
         self.action_depake.setObjectName("action_depake")
-        self.action_edit = QtWidgets.QAction(BaseWindow)
+        self.action_edit = QtGui.QAction(parent=BaseWindow)
         self.action_edit.setObjectName("action_edit")
-        self.actionPick_position = QtWidgets.QAction(BaseWindow)
+        self.actionPick_position = QtGui.QAction(parent=BaseWindow)
         self.actionPick_position.setObjectName("actionPick_position")
-        self.actionIntegrate = QtWidgets.QAction(BaseWindow)
+        self.actionIntegrate = QtGui.QAction(parent=BaseWindow)
         self.actionIntegrate.setObjectName("actionIntegrate")
-        self.actionDerivation = QtWidgets.QAction(BaseWindow)
+        self.actionDerivation = QtGui.QAction(parent=BaseWindow)
         self.actionDerivation.setObjectName("actionDerivation")
-        self.actionIntegration = QtWidgets.QAction(BaseWindow)
+        self.actionIntegration = QtGui.QAction(parent=BaseWindow)
         self.actionIntegration.setObjectName("actionIntegration")
-        self.action_cut = QtWidgets.QAction(BaseWindow)
+        self.actionMove_between_plots = QtGui.QAction(parent=BaseWindow)
-        self.action_cut.setObjectName("action_cut")
-        self.actionMove_between_plots = QtWidgets.QAction(BaseWindow)
         self.actionMove_between_plots.setObjectName("actionMove_between_plots")
-        self.actionBaseline = QtWidgets.QAction(BaseWindow)
+        self.actionBaseline = QtGui.QAction(parent=BaseWindow)
         self.actionBaseline.setObjectName("actionBaseline")
-        self.actionCalculateT1 = QtWidgets.QAction(BaseWindow)
+        self.actionCalculateT1 = QtGui.QAction(parent=BaseWindow)
         self.actionCalculateT1.setObjectName("actionCalculateT1")
-        self.actionChange_datatypes = QtWidgets.QAction(BaseWindow)
+        self.actionChange_datatypes = QtGui.QAction(parent=BaseWindow)
         self.actionChange_datatypes.setObjectName("actionChange_datatypes")
-        self.actionPrint = QtWidgets.QAction(BaseWindow)
+        self.actionPrint = QtGui.QAction(parent=BaseWindow)
         self.actionPrint.setObjectName("actionPrint")
-        self.action_lm_fit = QtWidgets.QAction(BaseWindow)
+        self.action_lm_fit = QtGui.QAction(parent=BaseWindow)
         self.action_lm_fit.setCheckable(True)
         self.action_lm_fit.setChecked(True)
         self.action_lm_fit.setObjectName("action_lm_fit")
-        self.action_nm_fit = QtWidgets.QAction(BaseWindow)
+        self.action_nm_fit = QtGui.QAction(parent=BaseWindow)
         self.action_nm_fit.setCheckable(True)
         self.action_nm_fit.setObjectName("action_nm_fit")
-        self.action_odr_fit = QtWidgets.QAction(BaseWindow)
+        self.action_odr_fit = QtGui.QAction(parent=BaseWindow)
         self.action_odr_fit.setCheckable(True)
         self.action_odr_fit.setObjectName("action_odr_fit")
-        self.action_no_range = QtWidgets.QAction(BaseWindow)
+        self.action_no_range = QtGui.QAction(parent=BaseWindow)
         self.action_no_range.setCheckable(True)
         self.action_no_range.setChecked(False)
         self.action_no_range.setObjectName("action_no_range")
-        self.action_x_range = QtWidgets.QAction(BaseWindow)
+        self.action_x_range = QtGui.QAction(parent=BaseWindow)
         self.action_x_range.setCheckable(True)
         self.action_x_range.setChecked(True)
         self.action_x_range.setObjectName("action_x_range")
-        self.action_custom_range = QtWidgets.QAction(BaseWindow)
+        self.action_custom_range = QtGui.QAction(parent=BaseWindow)
         self.action_custom_range.setCheckable(True)
         self.action_custom_range.setObjectName("action_custom_range")
-        self.actionSnake = QtWidgets.QAction(BaseWindow)
+        self.actionSnake = QtGui.QAction(parent=BaseWindow)
         self.actionSnake.setObjectName("actionSnake")
-        self.actionFunction_editor = QtWidgets.QAction(BaseWindow)
+        self.actionFunction_editor = QtGui.QAction(parent=BaseWindow)
         self.actionFunction_editor.setObjectName("actionFunction_editor")
-        self.actionLife = QtWidgets.QAction(BaseWindow)
+        self.actionLife = QtGui.QAction(parent=BaseWindow)
         self.actionLife.setObjectName("actionLife")
-        self.actionTetris = QtWidgets.QAction(BaseWindow)
+        self.actionTetris = QtGui.QAction(parent=BaseWindow)
         self.actionTetris.setObjectName("actionTetris")
-        self.actionUpdate = QtWidgets.QAction(BaseWindow)
+        self.actionUpdate = QtGui.QAction(parent=BaseWindow)
         self.actionUpdate.setObjectName("actionUpdate")
-        self.actionMine = QtWidgets.QAction(BaseWindow)
+        self.actionMine = QtGui.QAction(parent=BaseWindow)
         self.actionMine.setObjectName("actionMine")
-        self.action_draw_object = QtWidgets.QAction(BaseWindow)
+        self.action_draw_object = QtGui.QAction(parent=BaseWindow)
         self.action_draw_object.setObjectName("action_draw_object")
-        self.actionBugs = QtWidgets.QAction(BaseWindow)
+        self.actionBugs = QtGui.QAction(parent=BaseWindow)
         self.actionBugs.setObjectName("actionBugs")
-        self.actionShow_error_log = QtWidgets.QAction(BaseWindow)
+        self.actionShow_error_log = QtGui.QAction(parent=BaseWindow)
         self.actionShow_error_log.setObjectName("actionShow_error_log")
+        self.actionCreate_starter = QtGui.QAction(parent=BaseWindow)
+        self.actionCreate_starter.setObjectName("actionCreate_starter")
+        self.actionAbout = QtGui.QAction(parent=BaseWindow)
+        self.actionAbout.setObjectName("actionAbout")
+        self.actionTNMH_model = QtGui.QAction(parent=BaseWindow)
+        self.actionTNMH_model.setObjectName("actionTNMH_model")
+        self.actionBinning = QtGui.QAction(parent=BaseWindow)
+        self.actionBinning.setObjectName("actionBinning")
+        self.actionTNMH = QtGui.QAction(parent=BaseWindow)
+        self.actionTNMH.setObjectName("actionTNMH")
+        self.actionExclude_region = QtGui.QAction(parent=BaseWindow)
+        self.actionExclude_region.setCheckable(True)
+        self.actionExclude_region.setObjectName("actionExclude_region")
+        self.action_cut_xaxis = QtGui.QAction(parent=BaseWindow)
+        self.action_cut_xaxis.setObjectName("action_cut_xaxis")
+        self.action_cut_yaxis = QtGui.QAction(parent=BaseWindow)
+        self.action_cut_yaxis.setObjectName("action_cut_yaxis")
+        self.actionUse_script = QtGui.QAction(parent=BaseWindow)
+        self.actionUse_script.setObjectName("actionUse_script")
         self.menuSave.addAction(self.actionSave)
         self.menuSave.addAction(self.actionExportGraphic)
         self.menuSave.addAction(self.action_save_fit_parameter)
@@ -370,6 +384,9 @@ class Ui_BaseWindow(object):
         self.menuFile.addSeparator()
         self.menuFile.addAction(self.action_close)
         self.menuFile.addSeparator()
+        self.menuCut_to_visible_range.addSeparator()
+        self.menuCut_to_visible_range.addAction(self.action_cut_xaxis)
+        self.menuCut_to_visible_range.addAction(self.action_cut_yaxis)
         self.menuData.addAction(self.action_new_set)
         self.menuData.addAction(self.action_delete_sets)
         self.menuData.addAction(self.actionMove_between_plots)
@@ -379,13 +396,14 @@ class Ui_BaseWindow(object):
         self.menuData.addAction(self.action_sort_pts)
         self.menuData.addAction(self.actionSkip_points)
         self.menuData.addSeparator()
-        self.menuData.addAction(self.action_cut)
+        self.menuData.addAction(self.menuCut_to_visible_range.menuAction())
         self.menuData.addSeparator()
         self.menuData.addAction(self.actionChange_datatypes)
+        self.menuData.addAction(self.actionUse_script)
         self.menuHelp.addAction(self.actionShow_error_log)
-        self.menuHelp.addAction(self.actionDocumentation)
         self.menuHelp.addAction(self.actionUpdate)
         self.menuHelp.addAction(self.actionBugs)
+        self.menuHelp.addAction(self.actionAbout)
         self.menuNormalize.addAction(self.action_norm_max)
         self.menuNormalize.addAction(self.action_norm_max_abs)
         self.menuNormalize.addSeparator()
@@ -401,6 +419,7 @@ class Ui_BaseWindow(object):
         self.menuExtra.addSeparator()
         self.menuExtra.addAction(self.menuNormalize.menuAction())
         self.menuExtra.addAction(self.actionInterpolation)
+        self.menuExtra.addAction(self.actionBinning)
         self.menuExtra.addAction(self.actionRunning_values)
         self.menuExtra.addAction(self.actionShift)
         self.menuExtra.addSeparator()
@@ -411,6 +430,7 @@ class Ui_BaseWindow(object):
         self.menuLimits.addAction(self.action_no_range)
         self.menuLimits.addAction(self.action_x_range)
         self.menuLimits.addAction(self.action_custom_range)
+        self.menuLimits.addAction(self.actionExclude_region)
         self.menuFit.addAction(self.action_FitWidget)
         self.menuFit.addSeparator()
         self.menuFit.addAction(self.action_create_fit_function)
@@ -422,7 +442,10 @@ class Ui_BaseWindow(object):
         self.menuOptions.addSeparator()
         self.menuOptions.addAction(self.action_colorcycle)
         self.menuOptions.addAction(self.actionConfiguration)
+        self.menuOptions.addAction(self.actionCreate_starter)
         self.menuView.addAction(self.actionTile)
+        self.menuView.addAction(self.actionTileVertical)
+        self.menuView.addAction(self.actionTileHorizontal)
         self.menuView.addAction(self.actionCascade_windows)
         self.menuWindow.addAction(self.actionNew_window)
         self.menuWindow.addAction(self.actionDelete_window)
@@ -451,6 +474,7 @@ class Ui_BaseWindow(object):
         self.menuStuff.addAction(self.actionLife)
         self.menuStuff.addAction(self.actionTetris)
         self.menuStuff.addAction(self.actionMine)
+        self.menuDSC.addAction(self.actionTNMH_model)
         self.menubar.addAction(self.menuFile.menuAction())
         self.menubar.addAction(self.menuWindow.menuAction())
         self.menubar.addAction(self.menuData.menuAction())
@@ -459,6 +483,7 @@ class Ui_BaseWindow(object):
         self.menubar.addAction(self.menuFit.menuAction())
         self.menubar.addAction(self.menuNMR.menuAction())
         self.menubar.addAction(self.menuBDS.menuAction())
+        self.menubar.addAction(self.menuDSC.menuAction())
         self.menubar.addAction(self.menuOptions.menuAction())
         self.menubar.addAction(self.menuHelp.menuAction())
         self.menubar.addAction(self.menuStuff.menuAction())
@@ -474,7 +499,6 @@ class Ui_BaseWindow(object):
         self.toolbar_edit.addAction(self.actionShift)
         self.toolBar_nmr.addAction(self.t1action)
         self.toolBar_nmr.addAction(self.actionCalculateT1)
-        self.toolBar_fit.addAction(self.action_FitWidget)
         self.toolBar_spectrum.addAction(self.action_edit)
         self.toolBar_spectrum.addAction(self.actionPick_position)
         self.toolBar_data.addAction(self.actionConcatenate_sets)
@@ -499,6 +523,7 @@ class Ui_BaseWindow(object):
         self.menuFile.setTitle(_translate("BaseWindow", "&File"))
         self.menuSave.setTitle(_translate("BaseWindow", "&Save..."))
         self.menuData.setTitle(_translate("BaseWindow", "&Data"))
+        self.menuCut_to_visible_range.setTitle(_translate("BaseWindow", "Cut to visible range"))
         self.menuHelp.setTitle(_translate("BaseWindow", "&Help"))
         self.menuExtra.setTitle(_translate("BaseWindow", "Math"))
         self.menuNormalize.setTitle(_translate("BaseWindow", "&Normalize"))
@@ -511,10 +536,10 @@ class Ui_BaseWindow(object):
         self.menuNMR.setTitle(_translate("BaseWindow", "NMR"))
         self.menuBDS.setTitle(_translate("BaseWindow", "BDS"))
         self.menuSpectrum.setTitle(_translate("BaseWindow", "Spectrum"))
+        self.menuDSC.setTitle(_translate("BaseWindow", "DSC"))
         self.toolBar.setWindowTitle(_translate("BaseWindow", "Main"))
         self.toolbar_edit.setWindowTitle(_translate("BaseWindow", "Math"))
         self.toolBar_nmr.setWindowTitle(_translate("BaseWindow", "NMR"))
-        self.toolBar_fit.setWindowTitle(_translate("BaseWindow", "Fit"))
         self.toolBar_spectrum.setWindowTitle(_translate("BaseWindow", "Spectrum"))
         self.toolBar_data.setWindowTitle(_translate("BaseWindow", "Data"))
         self.action_close.setText(_translate("BaseWindow", "&Quit"))
@@ -566,6 +591,8 @@ class Ui_BaseWindow(object):
         self.actionGuide_lines.setText(_translate("BaseWindow", "Draw lines..."))
         self.actionMaximize.setText(_translate("BaseWindow", "Maximize"))
         self.actionTile.setText(_translate("BaseWindow", "Tile windows"))
+        self.actionTileVertical.setText(_translate("BaseWindow", "Tile windows vertically"))
+        self.actionTileHorizontal.setText(_translate("BaseWindow", "Tile windows horizontally"))
         self.actionMinimize.setText(_translate("BaseWindow", "Minimize"))
         self.actionNew_window.setText(_translate("BaseWindow", "New graph"))
         self.actionDelete_window.setText(_translate("BaseWindow", "Delete graph"))
@@ -590,7 +617,6 @@ class Ui_BaseWindow(object):
         self.actionIntegrate.setText(_translate("BaseWindow", "Integrate"))
         self.actionDerivation.setText(_translate("BaseWindow", "Differentiation..."))
         self.actionIntegration.setText(_translate("BaseWindow", "Integration..."))
-        self.action_cut.setText(_translate("BaseWindow", "Cut to visible range"))
         self.actionMove_between_plots.setText(_translate("BaseWindow", "Move sets..."))
         self.actionBaseline.setText(_translate("BaseWindow", "Baseline..."))
         self.actionCalculateT1.setText(_translate("BaseWindow", "Calculate relaxation..."))
@@ -612,6 +638,17 @@ class Ui_BaseWindow(object):
         self.action_draw_object.setText(_translate("BaseWindow", "Draw objects..."))
         self.actionBugs.setText(_translate("BaseWindow", "Bugs! Problems! Wishes!"))
         self.actionShow_error_log.setText(_translate("BaseWindow", "Show error log"))
+        self.actionCreate_starter.setText(_translate("BaseWindow", "Create starter.."))
+        self.actionAbout.setText(_translate("BaseWindow", "About..."))
+        self.actionTNMH_model.setText(_translate("BaseWindow", "Tg , Hodge, TNMH,,,"))
+        self.actionBinning.setText(_translate("BaseWindow", "Binning..."))
+        self.actionTNMH.setText(_translate("BaseWindow", "TNMH..."))
+        self.actionExclude_region.setText(_translate("BaseWindow", "Exclude region"))
+        self.action_cut_xaxis.setText(_translate("BaseWindow", "x axis"))
+        self.action_cut_xaxis.setToolTip(_translate("BaseWindow", "Remove data points outside visible x range."))
+        self.action_cut_yaxis.setText(_translate("BaseWindow", "y axis"))
+        self.action_cut_yaxis.setToolTip(_translate("BaseWindow", "Remove data points outside visible y range. Uses real part of points."))
+        self.actionUse_script.setText(_translate("BaseWindow", "Use script..."))
 from ..data.datawidget.datawidget import DataWidget
 from ..data.integral_widget import IntegralWidget
 from ..data.point_select import PointSelectWidget
@@ -619,4 +656,5 @@ from ..data.signaledit.editsignalwidget import EditSignalWidget
 from ..data.valueeditwidget import ValueEditWidget
 from ..fit.fitwindow import QFitDialog
 from ..graphs.drawings import DrawingsWidget
+from ..lib.mdiarea import MdiAreaTile
 from ..nmr.t1widget import QT1Widget

src/gui_qt/_py/bdsdialog.py

@@ -1,12 +1,13 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/bdsdialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/bdsdialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.9.2
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
 
-from PyQt5 import QtCore, QtGui, QtWidgets
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
@@ -16,75 +17,76 @@ class Ui_Dialog(object):
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        self.listWidget = QtWidgets.QListWidget(Dialog)
+        self.listWidget = QListWidgetSelect(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
         self.listWidget.setSizePolicy(sizePolicy)
+        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
         self.listWidget.setObjectName("listWidget")
         self.gridLayout.addWidget(self.listWidget, 1, 0, 2, 1)
-        self.groupBox_2 = QtWidgets.QGroupBox(Dialog)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=Dialog)
         self.groupBox_2.setObjectName("groupBox_2")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.groupBox_2)
         self.verticalLayout_3.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_3.setSpacing(3)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.freq_button = QtWidgets.QRadioButton(self.groupBox_2)
+        self.freq_button = QtWidgets.QRadioButton(parent=self.groupBox_2)
         self.freq_button.setChecked(True)
         self.freq_button.setObjectName("freq_button")
         self.buttonGroup = QtWidgets.QButtonGroup(Dialog)
         self.buttonGroup.setObjectName("buttonGroup")
         self.buttonGroup.addButton(self.freq_button)
         self.verticalLayout_3.addWidget(self.freq_button)
-        self.temp_button = QtWidgets.QRadioButton(self.groupBox_2)
+        self.temp_button = QtWidgets.QRadioButton(parent=self.groupBox_2)
         self.temp_button.setObjectName("temp_button")
         self.buttonGroup.addButton(self.temp_button)
         self.verticalLayout_3.addWidget(self.temp_button)
         self.gridLayout.addWidget(self.groupBox_2, 1, 1, 1, 1)
-        self.groupBox = QtWidgets.QGroupBox(Dialog)
+        self.groupBox = QtWidgets.QGroupBox(parent=Dialog)
         self.groupBox.setObjectName("groupBox")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
         self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_2.setSpacing(3)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.eps_checkBox = QtWidgets.QCheckBox(self.groupBox)
+        self.eps_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
         self.eps_checkBox.setChecked(True)
         self.eps_checkBox.setObjectName("eps_checkBox")
         self.verticalLayout_2.addWidget(self.eps_checkBox)
-        self.modul_checkBox = QtWidgets.QCheckBox(self.groupBox)
+        self.modul_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
         self.modul_checkBox.setObjectName("modul_checkBox")
         self.verticalLayout_2.addWidget(self.modul_checkBox)
-        self.cond_checkBox = QtWidgets.QCheckBox(self.groupBox)
+        self.cond_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
         self.cond_checkBox.setObjectName("cond_checkBox")
         self.verticalLayout_2.addWidget(self.cond_checkBox)
-        self.loss_checkBox = QtWidgets.QCheckBox(self.groupBox)
+        self.loss_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
         self.loss_checkBox.setObjectName("loss_checkBox")
         self.verticalLayout_2.addWidget(self.loss_checkBox)
-        self.line = QtWidgets.QFrame(self.groupBox)
+        self.line = QtWidgets.QFrame(parent=self.groupBox)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.verticalLayout_2.addWidget(self.line)
-        self.cap_checkBox = QtWidgets.QCheckBox(self.groupBox)
+        self.cap_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
         self.cap_checkBox.setObjectName("cap_checkBox")
         self.verticalLayout_2.addWidget(self.cap_checkBox)
-        self.temp_checkBox = QtWidgets.QCheckBox(self.groupBox)
+        self.temp_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
         self.temp_checkBox.setObjectName("temp_checkBox")
         self.verticalLayout_2.addWidget(self.temp_checkBox)
-        self.time_checkBox = QtWidgets.QCheckBox(self.groupBox)
+        self.time_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
         self.time_checkBox.setObjectName("time_checkBox")
         self.verticalLayout_2.addWidget(self.time_checkBox)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_2.addItem(spacerItem)
         self.gridLayout.addWidget(self.groupBox, 2, 1, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 3, 0, 1, 2)
-        self.label = QtWidgets.QLabel(Dialog)
+        self.label = QtWidgets.QLabel(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
@@ -93,8 +95,8 @@ class Ui_Dialog(object):
         self.gridLayout.addWidget(self.label, 0, 0, 1, 2)
 
         self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
         Dialog.setTabOrder(self.freq_button, self.temp_button)
         Dialog.setTabOrder(self.temp_button, self.eps_checkBox)
@@ -117,4 +119,4 @@ class Ui_Dialog(object):
         self.temp_checkBox.setText(_translate("Dialog", "Meas. temperature"))
         self.time_checkBox.setText(_translate("Dialog", "Meas. time"))
         self.label.setText(_translate("Dialog", "Found entries"))
-
+from ..lib.listwidget import QListWidgetSelect

src/gui_qt/_py/color_palette.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/color_palette.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/color_palette.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
@@ -18,78 +17,78 @@ class Ui_Dialog(object):
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        self.palette_combobox = QtWidgets.QComboBox(Dialog)
+        self.palette_combobox = QtWidgets.QComboBox(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.palette_combobox.sizePolicy().hasHeightForWidth())
         self.palette_combobox.setSizePolicy(sizePolicy)
         self.palette_combobox.setObjectName("palette_combobox")
         self.gridLayout.addWidget(self.palette_combobox, 0, 1, 1, 2)
-        self.add_color_button = QtWidgets.QPushButton(Dialog)
+        self.add_color_button = QtWidgets.QPushButton(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.add_color_button.sizePolicy().hasHeightForWidth())
         self.add_color_button.setSizePolicy(sizePolicy)
         self.add_color_button.setObjectName("add_color_button")
         self.gridLayout.addWidget(self.add_color_button, 3, 2, 1, 1)
-        self.colorlist = QtWidgets.QListWidget(Dialog)
+        self.colorlist = QtWidgets.QListWidget(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.colorlist.sizePolicy().hasHeightForWidth())
         self.colorlist.setSizePolicy(sizePolicy)
-        self.colorlist.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
+        self.colorlist.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.InternalMove)
         self.colorlist.setObjectName("colorlist")
         self.gridLayout.addWidget(self.colorlist, 4, 1, 1, 2)
-        self.add_palette_button = QtWidgets.QPushButton(Dialog)
+        self.add_palette_button = QtWidgets.QPushButton(parent=Dialog)
         self.add_palette_button.setObjectName("add_palette_button")
         self.gridLayout.addWidget(self.add_palette_button, 1, 1, 1, 1)
-        self.new_name_edit = QtWidgets.QLineEdit(Dialog)
+        self.new_name_edit = QtWidgets.QLineEdit(parent=Dialog)
         self.new_name_edit.setObjectName("new_name_edit")
         self.gridLayout.addWidget(self.new_name_edit, 6, 1, 1, 2)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 7, 0, 1, 3)
-        self.color_combobox = ColorListEditor(Dialog)
+        self.color_combobox = ColorListEditor(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.color_combobox.sizePolicy().hasHeightForWidth())
         self.color_combobox.setSizePolicy(sizePolicy)
         self.color_combobox.setObjectName("color_combobox")
         self.gridLayout.addWidget(self.color_combobox, 3, 1, 1, 1)
-        self.line = QtWidgets.QFrame(Dialog)
+        self.line = QtWidgets.QFrame(parent=Dialog)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.gridLayout.addWidget(self.line, 2, 0, 1, 3)
-        self.save_button = QtWidgets.QPushButton(Dialog)
+        self.save_button = QtWidgets.QPushButton(parent=Dialog)
         self.save_button.setObjectName("save_button")
         self.gridLayout.addWidget(self.save_button, 6, 0, 1, 1)
-        self.label = QtWidgets.QLabel(Dialog)
+        self.label = QtWidgets.QLabel(parent=Dialog)
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.append_palette_button = QtWidgets.QPushButton(Dialog)
+        self.append_palette_button = QtWidgets.QPushButton(parent=Dialog)
         self.append_palette_button.setObjectName("append_palette_button")
         self.gridLayout.addWidget(self.append_palette_button, 1, 2, 1, 1)
-        self.label_2 = QtWidgets.QLabel(Dialog)
+        self.label_2 = QtWidgets.QLabel(parent=Dialog)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 3, 0, 1, 1)
-        self.line_2 = QtWidgets.QFrame(Dialog)
+        self.line_2 = QtWidgets.QFrame(parent=Dialog)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.gridLayout.addWidget(self.line_2, 5, 0, 1, 3)
         self.label.setBuddy(self.palette_combobox)
         self.label_2.setBuddy(self.color_combobox)
 
         self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):

src/gui_qt/_py/coupling_calculator.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/coupling_calculator.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/coupling_calculator.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_coupling_calc_dialog(object):
@@ -16,20 +15,20 @@ class Ui_coupling_calc_dialog(object):
         coupling_calc_dialog.resize(400, 280)
         self.verticalLayout = QtWidgets.QVBoxLayout(coupling_calc_dialog)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.comboBox = QtWidgets.QComboBox(coupling_calc_dialog)
+        self.comboBox = QtWidgets.QComboBox(parent=coupling_calc_dialog)
         self.comboBox.setObjectName("comboBox")
         self.verticalLayout.addWidget(self.comboBox)
-        self.label_2 = QtWidgets.QLabel(coupling_calc_dialog)
+        self.label_2 = QtWidgets.QLabel(parent=coupling_calc_dialog)
         self.label_2.setObjectName("label_2")
         self.verticalLayout.addWidget(self.label_2)
-        self.verticalFrame = QtWidgets.QFrame(coupling_calc_dialog)
+        self.verticalFrame = QtWidgets.QFrame(parent=coupling_calc_dialog)
-        self.verticalFrame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.verticalFrame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
         self.verticalFrame.setObjectName("verticalFrame")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.verticalFrame)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.verticalLayout.addWidget(self.verticalFrame)
-        self.label = QtWidgets.QLabel(coupling_calc_dialog)
+        self.label = QtWidgets.QLabel(parent=coupling_calc_dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
@@ -37,17 +36,17 @@ class Ui_coupling_calc_dialog(object):
         self.label.setStyleSheet("font-weight: bold")
         self.label.setObjectName("label")
         self.verticalLayout.addWidget(self.label)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout.addItem(spacerItem)
-        self.buttonBox = QtWidgets.QDialogButtonBox(coupling_calc_dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=coupling_calc_dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Close)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(coupling_calc_dialog)
-        self.buttonBox.accepted.connect(coupling_calc_dialog.accept)
+        self.buttonBox.accepted.connect(coupling_calc_dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(coupling_calc_dialog.reject)
+        self.buttonBox.rejected.connect(coupling_calc_dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(coupling_calc_dialog)
 
     def retranslateUi(self, coupling_calc_dialog):

src/gui_qt/_py/coupling_t1_from_tau.py

@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/coupling_t1_from_tau.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_couplingForm(object):
-    def setupUi(self, couplingForm):
-        couplingForm.setObjectName("couplingForm")
-        couplingForm.resize(400, 300)
-        self.horizontalLayout = QtWidgets.QHBoxLayout(couplingForm)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(couplingForm)
-        self.label.setObjectName("label")
-        self.horizontalLayout.addWidget(self.label)
-        self.lineEdit = LineEdit(couplingForm)
-        self.lineEdit.setObjectName("lineEdit")
-        self.horizontalLayout.addWidget(self.lineEdit)
-        self.radioButton_2 = QtWidgets.QRadioButton(couplingForm)
-        self.radioButton_2.setChecked(True)
-        self.radioButton_2.setObjectName("radioButton_2")
-        self.buttonGroup = QtWidgets.QButtonGroup(couplingForm)
-        self.buttonGroup.setObjectName("buttonGroup")
-        self.buttonGroup.addButton(self.radioButton_2)
-        self.horizontalLayout.addWidget(self.radioButton_2)
-        self.radioButton = QtWidgets.QRadioButton(couplingForm)
-        self.radioButton.setObjectName("radioButton")
-        self.buttonGroup.addButton(self.radioButton)
-        self.horizontalLayout.addWidget(self.radioButton)
-
-        self.retranslateUi(couplingForm)
-        QtCore.QMetaObject.connectSlotsByName(couplingForm)
-
-    def retranslateUi(self, couplingForm):
-        _translate = QtCore.QCoreApplication.translate
-        couplingForm.setWindowTitle(_translate("couplingForm", "Form"))
-        self.label.setText(_translate("couplingForm", "parameter_name"))
-        self.radioButton_2.setText(_translate("couplingForm", "Value"))
-        self.radioButton.setText(_translate("couplingForm", "Index"))
-from nmrevalgui.lib.forms import LineEdit

src/gui_qt/_py/datawidget.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/datawidget.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/datawidget.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_DataWidget(object):
@@ -21,34 +20,40 @@ class Ui_DataWidget(object):
         self.verticalLayout = QtWidgets.QVBoxLayout()
         self.verticalLayout.setObjectName("verticalLayout")
         self.verticalLayout_2.addLayout(self.verticalLayout)
-        self.propwidget = ExpandableWidget(DataWidget)
+        self.propwidget = ExpandableWidget(parent=DataWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.propwidget.sizePolicy().hasHeightForWidth())
         self.propwidget.setSizePolicy(sizePolicy)
         self.propwidget.setObjectName("propwidget")
         self.verticalLayout_2.addWidget(self.propwidget)
-        self.frame = QtWidgets.QFrame(DataWidget)
+        self.frame = QtWidgets.QFrame(parent=DataWidget)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
         self.frame.setObjectName("frame")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setSpacing(0)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.graph_toolButton = QtWidgets.QToolButton(self.frame)
+        self.graph_toolButton = QtWidgets.QToolButton(parent=self.frame)
         self.graph_toolButton.setObjectName("graph_toolButton")
         self.horizontalLayout.addWidget(self.graph_toolButton)
-        self.empty_toolButton = QtWidgets.QToolButton(self.frame)
+        self.empty_toolButton = QtWidgets.QToolButton(parent=self.frame)
         self.empty_toolButton.setObjectName("empty_toolButton")
         self.horizontalLayout.addWidget(self.empty_toolButton)
-        self.func_toolButton = QtWidgets.QToolButton(self.frame)
+        self.func_toolButton = QtWidgets.QToolButton(parent=self.frame)
         self.func_toolButton.setText("")
         self.func_toolButton.setObjectName("func_toolButton")
         self.horizontalLayout.addWidget(self.func_toolButton)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
+        self.pokemon_toolbutton = QtWidgets.QToolButton(parent=self.frame)
+        self.pokemon_toolbutton.setText("")
+        self.pokemon_toolbutton.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextOnly)
+        self.pokemon_toolbutton.setAutoRaise(True)
+        self.pokemon_toolbutton.setObjectName("pokemon_toolbutton")
+        self.horizontalLayout.addWidget(self.pokemon_toolbutton)
         self.verticalLayout_2.addWidget(self.frame)
 
         self.retranslateUi(DataWidget)

src/gui_qt/_py/dscfile_dialog.py

@@ -1,157 +1,171 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/dscfile_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/dscfile_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.9.2
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
 
-from PyQt5 import QtCore, QtGui, QtWidgets
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(962, 662)
+        Dialog.resize(1341, 799)
-        self.gridLayout_2 = QtWidgets.QGridLayout(Dialog)
+        self.verticalLayout_5 = QtWidgets.QVBoxLayout(Dialog)
-        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.splitter = QtWidgets.QSplitter(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok|QtWidgets.QDialogButtonBox.Save)
+        self.splitter.setObjectName("splitter")
-        self.buttonBox.setObjectName("buttonBox")
+        self.verticalLayoutWidget = QtWidgets.QWidget(parent=self.splitter)
-        self.gridLayout_2.addWidget(self.buttonBox, 1, 1, 1, 1)
+        self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
-        self.gridLayout_4 = QtWidgets.QGridLayout()
+        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
-        self.gridLayout_4.setContentsMargins(-1, 0, 0, -1)
+        self.verticalLayout_4.setContentsMargins(6, 6, 6, 6)
-        self.gridLayout_4.setSpacing(3)
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.groupBox = QtWidgets.QGroupBox(parent=self.verticalLayoutWidget)
-        self.cp_checkBox = QtWidgets.QCheckBox(Dialog)
+        self.groupBox.setFlat(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.MinimumExpanding)
+        self.groupBox.setObjectName("groupBox")
-        sizePolicy.setHorizontalStretch(0)
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox)
-        sizePolicy.setVerticalStretch(0)
+        self.verticalLayout.setContentsMargins(6, 6, 6, 6)
-        sizePolicy.setHeightForWidth(self.cp_checkBox.sizePolicy().hasHeightForWidth())
+        self.verticalLayout.setObjectName("verticalLayout")
-        self.cp_checkBox.setSizePolicy(sizePolicy)
+        self.step_listWidget = QtWidgets.QListWidget(parent=self.groupBox)
-        self.cp_checkBox.setChecked(True)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.cp_checkBox.setObjectName("cp_checkBox")
-        self.gridLayout_4.addWidget(self.cp_checkBox, 11, 0, 1, 4)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setSpacing(3)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.loadempty_button = QtWidgets.QPushButton(Dialog)
-        self.loadempty_button.setObjectName("loadempty_button")
-        self.horizontalLayout_2.addWidget(self.loadempty_button)
-        self.delempty_button = QtWidgets.QPushButton(Dialog)
-        self.delempty_button.setObjectName("delempty_button")
-        self.horizontalLayout_2.addWidget(self.delempty_button)
-        self.gridLayout_4.addLayout(self.horizontalLayout_2, 5, 0, 1, 4)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_4.addItem(spacerItem, 12, 0, 1, 1)
-        self.isotherm_radioButton = QtWidgets.QRadioButton(Dialog)
-        self.isotherm_radioButton.setChecked(True)
-        self.isotherm_radioButton.setObjectName("isotherm_radioButton")
-        self.buttonGroup = QtWidgets.QButtonGroup(Dialog)
-        self.buttonGroup.setObjectName("buttonGroup")
-        self.buttonGroup.addButton(self.isotherm_radioButton)
-        self.gridLayout_4.addWidget(self.isotherm_radioButton, 6, 1, 1, 1)
-        self.label_4 = QtWidgets.QLabel(Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
-        self.label_4.setSizePolicy(sizePolicy)
-        self.label_4.setStyleSheet("font-weight: bold")
-        self.label_4.setObjectName("label_4")
-        self.gridLayout_4.addWidget(self.label_4, 0, 0, 1, 4)
-        self.reference_tableWidget = QtWidgets.QTableWidget(Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.reference_tableWidget.sizePolicy().hasHeightForWidth())
-        self.reference_tableWidget.setSizePolicy(sizePolicy)
-        self.reference_tableWidget.setMinimumSize(QtCore.QSize(0, 0))
-        self.reference_tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
-        self.reference_tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
-        self.reference_tableWidget.setColumnCount(2)
-        self.reference_tableWidget.setObjectName("reference_tableWidget")
-        self.reference_tableWidget.setRowCount(0)
-        self.reference_tableWidget.horizontalHeader().setVisible(False)
-        self.reference_tableWidget.horizontalHeader().setStretchLastSection(True)
-        self.reference_tableWidget.verticalHeader().setVisible(False)
-        self.gridLayout_4.addWidget(self.reference_tableWidget, 9, 0, 1, 4)
-        self.step_listWidget = QtWidgets.QListWidget(Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.step_listWidget.sizePolicy().hasHeightForWidth())
         self.step_listWidget.setSizePolicy(sizePolicy)
         self.step_listWidget.setMinimumSize(QtCore.QSize(0, 0))
         self.step_listWidget.setObjectName("step_listWidget")
-        self.gridLayout_4.addWidget(self.step_listWidget, 1, 0, 1, 4)
+        self.verticalLayout.addWidget(self.step_listWidget)
-        self.label = QtWidgets.QLabel(Dialog)
+        self.verticalLayout_4.addWidget(self.groupBox)
-        self.label.setObjectName("label")
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=self.verticalLayoutWidget)
-        self.gridLayout_4.addWidget(self.label, 6, 0, 1, 1)
+        self.groupBox_2.setObjectName("groupBox_2")
-        self.slope_radioButton = QtWidgets.QRadioButton(Dialog)
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_2)
+        self.verticalLayout_2.setContentsMargins(6, 6, 6, 6)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.groupBox_4 = QtWidgets.QGroupBox(parent=self.groupBox_2)
+        self.groupBox_4.setObjectName("groupBox_4")
+        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.groupBox_4)
+        self.verticalLayout_6.setContentsMargins(6, 6, 6, 6)
+        self.verticalLayout_6.setObjectName("verticalLayout_6")
+        self.empty_label = QtWidgets.QLabel(parent=self.groupBox_4)
+        self.empty_label.setObjectName("empty_label")
+        self.verticalLayout_6.addWidget(self.empty_label)
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setSpacing(3)
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.loadempty_button = QtWidgets.QPushButton(parent=self.groupBox_4)
+        self.loadempty_button.setObjectName("loadempty_button")
+        self.horizontalLayout_2.addWidget(self.loadempty_button)
+        self.delempty_button = QtWidgets.QPushButton(parent=self.groupBox_4)
+        self.delempty_button.setObjectName("delempty_button")
+        self.horizontalLayout_2.addWidget(self.delempty_button)
+        self.verticalLayout_6.addLayout(self.horizontalLayout_2)
+        self.verticalLayout_2.addWidget(self.groupBox_4)
+        self.groupBox_5 = QtWidgets.QGroupBox(parent=self.groupBox_2)
+        self.groupBox_5.setObjectName("groupBox_5")
+        self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.groupBox_5)
+        self.verticalLayout_7.setContentsMargins(6, 6, 6, 6)
+        self.verticalLayout_7.setSpacing(3)
+        self.verticalLayout_7.setObjectName("verticalLayout_7")
+        self.none_radioButton = QtWidgets.QRadioButton(parent=self.groupBox_5)
+        self.none_radioButton.setObjectName("none_radioButton")
+        self.buttonGroup = QtWidgets.QButtonGroup(Dialog)
+        self.buttonGroup.setObjectName("buttonGroup")
+        self.buttonGroup.addButton(self.none_radioButton)
+        self.verticalLayout_7.addWidget(self.none_radioButton)
+        self.isotherm_radioButton = QtWidgets.QRadioButton(parent=self.groupBox_5)
+        self.isotherm_radioButton.setChecked(True)
+        self.isotherm_radioButton.setObjectName("isotherm_radioButton")
+        self.buttonGroup.addButton(self.isotherm_radioButton)
+        self.verticalLayout_7.addWidget(self.isotherm_radioButton)
+        self.slope_radioButton = QtWidgets.QRadioButton(parent=self.groupBox_5)
         self.slope_radioButton.setObjectName("slope_radioButton")
         self.buttonGroup.addButton(self.slope_radioButton)
-        self.gridLayout_4.addWidget(self.slope_radioButton, 6, 2, 1, 1)
+        self.verticalLayout_7.addWidget(self.slope_radioButton)
-        self.empty_label = QtWidgets.QLabel(Dialog)
+        self.widget = QtWidgets.QWidget(parent=self.groupBox_5)
-        self.empty_label.setObjectName("empty_label")
+        self.widget.setMinimumSize(QtCore.QSize(0, 33))
-        self.gridLayout_4.addWidget(self.empty_label, 4, 0, 1, 4)
+        self.widget.setObjectName("widget")
-        self.label_3 = QtWidgets.QLabel(Dialog)
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        self.horizontalLayout_3.setContentsMargins(3, 3, 3, 3)
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.limit1_lineedit = QtWidgets.QLineEdit(parent=self.widget)
+        self.limit1_lineedit.setObjectName("limit1_lineedit")
+        self.horizontalLayout_3.addWidget(self.limit1_lineedit)
+        self.limit2_lineedit = QtWidgets.QLineEdit(parent=self.widget)
+        self.limit2_lineedit.setText("")
+        self.limit2_lineedit.setObjectName("limit2_lineedit")
+        self.horizontalLayout_3.addWidget(self.limit2_lineedit)
+        self.verticalLayout_7.addWidget(self.widget)
+        self.verticalLayout_2.addWidget(self.groupBox_5)
+        self.verticalLayout_4.addWidget(self.groupBox_2)
+        self.groupBox_3 = QtWidgets.QGroupBox(parent=self.verticalLayoutWidget)
+        self.groupBox_3.setObjectName("groupBox_3")
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.groupBox_3)
+        self.verticalLayout_3.setContentsMargins(6, 6, 6, 6)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.cp_checkBox = QtWidgets.QCheckBox(parent=self.groupBox_3)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.cp_checkBox.sizePolicy().hasHeightForWidth())
-        self.label_3.setSizePolicy(sizePolicy)
+        self.cp_checkBox.setSizePolicy(sizePolicy)
-        self.label_3.setStyleSheet("font-weight: bold")
+        self.cp_checkBox.setChecked(True)
-        self.label_3.setObjectName("label_3")
+        self.cp_checkBox.setObjectName("cp_checkBox")
-        self.gridLayout_4.addWidget(self.label_3, 8, 0, 1, 4)
+        self.verticalLayout_3.addWidget(self.cp_checkBox)
-        self.label_2 = QtWidgets.QLabel(Dialog)
+        self.reference_tableWidget = QtWidgets.QTableWidget(parent=self.groupBox_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.reference_tableWidget.sizePolicy().hasHeightForWidth())
-        self.label_2.setSizePolicy(sizePolicy)
+        self.reference_tableWidget.setSizePolicy(sizePolicy)
-        self.label_2.setStyleSheet("font-weight: bold")
+        self.reference_tableWidget.setMinimumSize(QtCore.QSize(0, 0))
-        self.label_2.setObjectName("label_2")
+        self.reference_tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection)
-        self.gridLayout_4.addWidget(self.label_2, 3, 0, 1, 4)
+        self.reference_tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
-        self.line = QtWidgets.QFrame(Dialog)
+        self.reference_tableWidget.setColumnCount(2)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.reference_tableWidget.setObjectName("reference_tableWidget")
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.reference_tableWidget.setRowCount(0)
-        self.line.setObjectName("line")
+        self.reference_tableWidget.horizontalHeader().setVisible(False)
-        self.gridLayout_4.addWidget(self.line, 7, 0, 1, 4)
+        self.reference_tableWidget.horizontalHeader().setStretchLastSection(True)
-        self.none_radioButton = QtWidgets.QRadioButton(Dialog)
+        self.reference_tableWidget.verticalHeader().setVisible(False)
-        self.none_radioButton.setObjectName("none_radioButton")
+        self.verticalLayout_3.addWidget(self.reference_tableWidget)
-        self.buttonGroup.addButton(self.none_radioButton)
-        self.gridLayout_4.addWidget(self.none_radioButton, 6, 3, 1, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.ref_add_pushButton = QtWidgets.QPushButton(Dialog)
+        self.ref_add_pushButton = QtWidgets.QPushButton(parent=self.groupBox_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.ref_add_pushButton.sizePolicy().hasHeightForWidth())
         self.ref_add_pushButton.setSizePolicy(sizePolicy)
         self.ref_add_pushButton.setObjectName("ref_add_pushButton")
         self.horizontalLayout.addWidget(self.ref_add_pushButton)
-        self.ref_remove_pushButton = QtWidgets.QPushButton(Dialog)
+        self.ref_remove_pushButton = QtWidgets.QPushButton(parent=self.groupBox_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.ref_remove_pushButton.sizePolicy().hasHeightForWidth())
         self.ref_remove_pushButton.setSizePolicy(sizePolicy)
         self.ref_remove_pushButton.setObjectName("ref_remove_pushButton")
         self.horizontalLayout.addWidget(self.ref_remove_pushButton)
-        self.gridLayout_4.addLayout(self.horizontalLayout, 10, 0, 1, 4)
+        self.verticalLayout_3.addLayout(self.horizontalLayout)
-        self.line_2 = QtWidgets.QFrame(Dialog)
+        self.verticalLayout_4.addWidget(self.groupBox_3)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.verticalLayout_4.addItem(spacerItem)
-        self.line_2.setObjectName("line_2")
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=self.verticalLayoutWidget)
-        self.gridLayout_4.addWidget(self.line_2, 2, 0, 1, 4)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.gridLayout_2.addLayout(self.gridLayout_4, 0, 0, 1, 1)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok|QtWidgets.QDialogButtonBox.StandardButton.Save)
-        self.gridLayout = QtWidgets.QGridLayout()
+        self.buttonBox.setCenterButtons(True)
+        self.buttonBox.setObjectName("buttonBox")
+        self.verticalLayout_4.addWidget(self.buttonBox)
+        self.layoutWidget = QtWidgets.QWidget(parent=self.splitter)
+        self.layoutWidget.setObjectName("layoutWidget")
+        self.gridLayout = QtWidgets.QGridLayout(self.layoutWidget)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout.setObjectName("gridLayout")
-        self.raw_graph = PlotWidget(Dialog)
+        self.raw_graph = NMRPlotWidget(parent=self.layoutWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.raw_graph.sizePolicy().hasHeightForWidth())
@@ -159,8 +173,8 @@ class Ui_Dialog(object):
         self.raw_graph.setMinimumSize(QtCore.QSize(300, 200))
         self.raw_graph.setObjectName("raw_graph")
         self.gridLayout.addWidget(self.raw_graph, 0, 0, 1, 1)
-        self.calib_graph = PlotWidget(Dialog)
+        self.calib_graph = NMRPlotWidget(parent=self.layoutWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.calib_graph.sizePolicy().hasHeightForWidth())
@@ -168,8 +182,8 @@ class Ui_Dialog(object):
         self.calib_graph.setMinimumSize(QtCore.QSize(300, 200))
         self.calib_graph.setObjectName("calib_graph")
         self.gridLayout.addWidget(self.calib_graph, 1, 0, 1, 1)
-        self.baseline_graph = PlotWidget(Dialog)
+        self.baseline_graph = NMRPlotWidget(parent=self.layoutWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.baseline_graph.sizePolicy().hasHeightForWidth())
@@ -177,8 +191,8 @@ class Ui_Dialog(object):
         self.baseline_graph.setMinimumSize(QtCore.QSize(300, 200))
         self.baseline_graph.setObjectName("baseline_graph")
         self.gridLayout.addWidget(self.baseline_graph, 0, 1, 1, 1)
-        self.end_graph = PlotWidget(Dialog)
+        self.end_graph = NMRPlotWidget(parent=self.layoutWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.end_graph.sizePolicy().hasHeightForWidth())
@@ -186,28 +200,30 @@ class Ui_Dialog(object):
         self.end_graph.setMinimumSize(QtCore.QSize(0, 0))
         self.end_graph.setObjectName("end_graph")
         self.gridLayout.addWidget(self.end_graph, 1, 1, 1, 1)
-        self.gridLayout_2.addLayout(self.gridLayout, 0, 1, 1, 1)
+        self.verticalLayout_5.addWidget(self.splitter)
 
         self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Read DSC  file"))
-        self.cp_checkBox.setText(_translate("Dialog", "Convert to heat capacity"))
+        self.groupBox.setTitle(_translate("Dialog", "Detected steps"))
+        self.groupBox_2.setTitle(_translate("Dialog", "Baseline corrections"))
+        self.groupBox_4.setTitle(_translate("Dialog", "Empty measurement"))
+        self.empty_label.setText(_translate("Dialog", "No emtpy measurement"))
         self.loadempty_button.setText(_translate("Dialog", "Load empty"))
         self.delempty_button.setText(_translate("Dialog", "Remove empty"))
-        self.isotherm_radioButton.setText(_translate("Dialog", "Isotherms"))
+        self.groupBox_5.setTitle(_translate("Dialog", "Slope correction"))
-        self.label_4.setText(_translate("Dialog", "Detected steps"))
-        self.label.setText(_translate("Dialog", "Slope"))
-        self.slope_radioButton.setText(_translate("Dialog", "Initial slope"))
-        self.empty_label.setText(_translate("Dialog", "Empty measurement"))
-        self.label_3.setText(_translate("Dialog", "Calibration"))
-        self.label_2.setText(_translate("Dialog", "Baseline"))
         self.none_radioButton.setText(_translate("Dialog", "None"))
+        self.isotherm_radioButton.setText(_translate("Dialog", "Isotherms"))
+        self.slope_radioButton.setText(_translate("Dialog", "Curve slope"))
+        self.limit1_lineedit.setPlaceholderText(_translate("Dialog", "start (in min)"))
+        self.limit2_lineedit.setPlaceholderText(_translate("Dialog", "stop (in min)"))
+        self.groupBox_3.setTitle(_translate("Dialog", "References"))
+        self.cp_checkBox.setText(_translate("Dialog", "Use reference to convert to heat capacity"))
         self.ref_add_pushButton.setText(_translate("Dialog", "Add reference"))
         self.ref_remove_pushButton.setText(_translate("Dialog", "Remove reference"))
-
+from ..lib.graph_items import NMRPlotWidget
-from pyqtgraph import PlotWidget

src/gui_qt/_py/editsignalwidget.py

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/editsignalwidget.ui'
-
-# Form implementation generated from reading ui file 'src/resources/_ui/editsignalwidget.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
@@ -19,24 +17,24 @@ class Ui_Form(object):
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.baseline_box = QtWidgets.QGroupBox(Form)
+        self.baseline_box = QtWidgets.QGroupBox(parent=Form)
         self.baseline_box.setObjectName("baseline_box")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.baseline_box)
         self.horizontalLayout_3.setContentsMargins(3, 3, 3, 3)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.baselinebutton = QtWidgets.QPushButton(self.baseline_box)
+        self.baselinebutton = QtWidgets.QPushButton(parent=self.baseline_box)
         self.baselinebutton.setObjectName("baselinebutton")
         self.horizontalLayout_3.addWidget(self.baselinebutton)
         self.verticalLayout.addWidget(self.baseline_box)
-        self.leftshift_box = QtWidgets.QGroupBox(Form)
+        self.leftshift_box = QtWidgets.QGroupBox(parent=Form)
         self.leftshift_box.setObjectName("leftshift_box")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.leftshift_box)
         self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.leftshiftbutton = QtWidgets.QPushButton(self.leftshift_box)
+        self.leftshiftbutton = QtWidgets.QPushButton(parent=self.leftshift_box)
         self.leftshiftbutton.setObjectName("leftshiftbutton")
         self.gridLayout_3.addWidget(self.leftshiftbutton, 1, 0, 1, 2)
-        self.leftshift_comboBox = QtWidgets.QComboBox(self.leftshift_box)
+        self.leftshift_comboBox = QtWidgets.QComboBox(parent=self.leftshift_box)
         self.leftshift_comboBox.setObjectName("leftshift_comboBox")
         self.leftshift_comboBox.addItem("")
         self.leftshift_comboBox.addItem("")
@@ -45,40 +43,40 @@ class Ui_Form(object):
         self.verticalLayout_2.setContentsMargins(-1, 0, -1, -1)
         self.verticalLayout_2.setSpacing(0)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.ls_spinBox = QtWidgets.QSpinBox(self.leftshift_box)
+        self.ls_spinBox = QtWidgets.QSpinBox(parent=self.leftshift_box)
         self.ls_spinBox.setMaximum(9999)
         self.ls_spinBox.setObjectName("ls_spinBox")
         self.verticalLayout_2.addWidget(self.ls_spinBox)
-        self.ls_lineEdit = QtWidgets.QLineEdit(self.leftshift_box)
+        self.ls_lineEdit = QtWidgets.QLineEdit(parent=self.leftshift_box)
         self.ls_lineEdit.setObjectName("ls_lineEdit")
         self.verticalLayout_2.addWidget(self.ls_lineEdit)
         self.gridLayout_3.addLayout(self.verticalLayout_2, 0, 1, 1, 1)
         self.verticalLayout.addWidget(self.leftshift_box)
-        self.zerofill_box = QtWidgets.QGroupBox(Form)
+        self.zerofill_box = QtWidgets.QGroupBox(parent=Form)
         self.zerofill_box.setFlat(False)
         self.zerofill_box.setObjectName("zerofill_box")
         self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.zerofill_box)
         self.horizontalLayout_4.setContentsMargins(3, 3, 3, 3)
         self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.zfbutton = QtWidgets.QPushButton(self.zerofill_box)
+        self.zfbutton = QtWidgets.QPushButton(parent=self.zerofill_box)
         self.zfbutton.setObjectName("zfbutton")
         self.horizontalLayout_4.addWidget(self.zfbutton)
         self.verticalLayout.addWidget(self.zerofill_box)
-        self.phase_box = QtWidgets.QGroupBox(Form)
+        self.phase_box = QtWidgets.QGroupBox(parent=Form)
         self.phase_box.setFlat(False)
         self.phase_box.setObjectName("phase_box")
         self.gridLayout_4 = QtWidgets.QGridLayout(self.phase_box)
         self.gridLayout_4.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_4.setVerticalSpacing(0)
         self.gridLayout_4.setObjectName("gridLayout_4")
-        self.label_8 = QtWidgets.QLabel(self.phase_box)
+        self.label_8 = QtWidgets.QLabel(parent=self.phase_box)
         self.label_8.setObjectName("label_8")
         self.gridLayout_4.addWidget(self.label_8, 7, 0, 1, 1)
-        self.phase_prev_button = QtWidgets.QPushButton(self.phase_box)
+        self.phase_prev_button = QtWidgets.QPushButton(parent=self.phase_box)
         self.phase_prev_button.setObjectName("phase_prev_button")
         self.gridLayout_4.addWidget(self.phase_prev_button, 9, 0, 1, 1)
-        self.ph0slider = QtWidgets.QDoubleSpinBox(self.phase_box)
+        self.ph0slider = QtWidgets.QDoubleSpinBox(parent=self.phase_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.ph0slider.sizePolicy().hasHeightForWidth())
@@ -88,36 +86,36 @@ class Ui_Form(object):
         self.ph0slider.setMaximum(180.0)
         self.ph0slider.setObjectName("ph0slider")
         self.gridLayout_4.addWidget(self.ph0slider, 2, 1, 1, 1)
-        self.ph1slider = QtWidgets.QDoubleSpinBox(self.phase_box)
+        self.ph1slider = QtWidgets.QDoubleSpinBox(parent=self.phase_box)
         self.ph1slider.setWrapping(True)
         self.ph1slider.setMinimum(-360.0)
         self.ph1slider.setMaximum(360.0)
         self.ph1slider.setObjectName("ph1slider")
         self.gridLayout_4.addWidget(self.ph1slider, 5, 1, 1, 1)
-        self.phasebutton = QtWidgets.QPushButton(self.phase_box)
+        self.phasebutton = QtWidgets.QPushButton(parent=self.phase_box)
         self.phasebutton.setObjectName("phasebutton")
         self.gridLayout_4.addWidget(self.phasebutton, 9, 1, 1, 1)
-        self.label_6 = QtWidgets.QLabel(self.phase_box)
+        self.label_6 = QtWidgets.QLabel(parent=self.phase_box)
         self.label_6.setObjectName("label_6")
         self.gridLayout_4.addWidget(self.label_6, 4, 0, 3, 1)
-        self.label = QtWidgets.QLabel(self.phase_box)
+        self.label = QtWidgets.QLabel(parent=self.phase_box)
         self.label.setObjectName("label")
         self.gridLayout_4.addWidget(self.label, 1, 0, 3, 1)
-        self.pivot_lineedit = QtWidgets.QLineEdit(self.phase_box)
+        self.pivot_lineedit = QtWidgets.QLineEdit(parent=self.phase_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.pivot_lineedit.sizePolicy().hasHeightForWidth())
         self.pivot_lineedit.setSizePolicy(sizePolicy)
-        self.pivot_lineedit.setInputMethodHints(QtCore.Qt.ImhDigitsOnly)
+        self.pivot_lineedit.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhDigitsOnly)
         self.pivot_lineedit.setObjectName("pivot_lineedit")
         self.gridLayout_4.addWidget(self.pivot_lineedit, 7, 1, 1, 1)
-        self.autophase_check = QtWidgets.QCheckBox(self.phase_box)
+        self.autophase_check = QtWidgets.QCheckBox(parent=self.phase_box)
         self.autophase_check.setObjectName("autophase_check")
         self.gridLayout_4.addWidget(self.autophase_check, 8, 0, 1, 2)
         self.verticalLayout.addWidget(self.phase_box)
-        self.apod_box = QtWidgets.QGroupBox(Form)
+        self.apod_box = QtWidgets.QGroupBox(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.apod_box.sizePolicy().hasHeightForWidth())
@@ -126,10 +124,10 @@ class Ui_Form(object):
         self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.apod_box)
         self.verticalLayout_7.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_7.setObjectName("verticalLayout_7")
-        self.apodcombobox = QtWidgets.QComboBox(self.apod_box)
+        self.apodcombobox = QtWidgets.QComboBox(parent=self.apod_box)
         self.apodcombobox.setObjectName("apodcombobox")
         self.verticalLayout_7.addWidget(self.apodcombobox)
-        self.apod_name_label = QtWidgets.QLabel(self.apod_box)
+        self.apod_name_label = QtWidgets.QLabel(parent=self.apod_box)
         self.apod_name_label.setIndent(3)
         self.apod_name_label.setObjectName("apod_name_label")
         self.verticalLayout_7.addWidget(self.apod_name_label)
@@ -139,24 +137,24 @@ class Ui_Form(object):
         self.verticalLayout_7.addLayout(self.apod_layout)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.apod_prev_button = QtWidgets.QPushButton(self.apod_box)
+        self.apod_prev_button = QtWidgets.QPushButton(parent=self.apod_box)
         self.apod_prev_button.setObjectName("apod_prev_button")
         self.horizontalLayout.addWidget(self.apod_prev_button)
-        self.apodbutton = QtWidgets.QPushButton(self.apod_box)
+        self.apodbutton = QtWidgets.QPushButton(parent=self.apod_box)
         self.apodbutton.setObjectName("apodbutton")
         self.horizontalLayout.addWidget(self.apodbutton)
         self.verticalLayout_7.addLayout(self.horizontalLayout)
         self.verticalLayout.addWidget(self.apod_box)
-        self.fft_box = QtWidgets.QGroupBox(Form)
+        self.fft_box = QtWidgets.QGroupBox(parent=Form)
         self.fft_box.setObjectName("fft_box")
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout(self.fft_box)
         self.horizontalLayout_5.setContentsMargins(3, 3, 3, 3)
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
-        self.fourierutton = QtWidgets.QPushButton(self.fft_box)
+        self.fourierutton = QtWidgets.QPushButton(parent=self.fft_box)
         self.fourierutton.setObjectName("fourierutton")
         self.horizontalLayout_5.addWidget(self.fourierutton)
         self.verticalLayout.addWidget(self.fft_box)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout.addItem(spacerItem)
 
         self.retranslateUi(Form)

src/gui_qt/_py/eval_expr_dialog.py

@@ -1,31 +1,30 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/eval_expr_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/eval_expr_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_CalcDialog(object):
     def setupUi(self, CalcDialog):
         CalcDialog.setObjectName("CalcDialog")
-        CalcDialog.setWindowModality(QtCore.Qt.WindowModal)
+        CalcDialog.setWindowModality(QtCore.Qt.WindowModality.WindowModal)
         CalcDialog.resize(804, 627)
         self.verticalLayout_5 = QtWidgets.QVBoxLayout(CalcDialog)
         self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.splitter_2 = QtWidgets.QSplitter(CalcDialog)
+        self.splitter_2 = QtWidgets.QSplitter(parent=CalcDialog)
-        self.splitter_2.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter_2.setOrientation(QtCore.Qt.Orientation.Horizontal)
         self.splitter_2.setObjectName("splitter_2")
-        self.verticalLayoutWidget = QtWidgets.QWidget(self.splitter_2)
+        self.verticalLayoutWidget = QtWidgets.QWidget(parent=self.splitter_2)
         self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.stackedWidget = QtWidgets.QStackedWidget(self.verticalLayoutWidget)
+        self.stackedWidget = QtWidgets.QStackedWidget(parent=self.verticalLayoutWidget)
         self.stackedWidget.setObjectName("stackedWidget")
         self.page = QtWidgets.QWidget()
         self.page.setObjectName("page")
@@ -33,21 +32,21 @@ class Ui_CalcDialog(object):
         self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_2.setSpacing(0)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.label_2 = QtWidgets.QLabel(self.page)
+        self.label_2 = QtWidgets.QLabel(parent=self.page)
         self.label_2.setObjectName("label_2")
         self.verticalLayout_2.addWidget(self.label_2)
-        self.listWidget = QtWidgets.QListWidget(self.page)
+        self.listWidget = QListWidgetSelect(parent=self.page)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
         self.listWidget.setSizePolicy(sizePolicy)
-        self.listWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.listWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
-        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
+        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
         self.listWidget.setObjectName("listWidget")
         self.verticalLayout_2.addWidget(self.listWidget)
-        self.overwrite_checkbox = QtWidgets.QCheckBox(self.page)
+        self.overwrite_checkbox = QtWidgets.QCheckBox(parent=self.page)
-        self.overwrite_checkbox.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.overwrite_checkbox.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.overwrite_checkbox.setObjectName("overwrite_checkbox")
         self.verticalLayout_2.addWidget(self.overwrite_checkbox)
         self.stackedWidget.addWidget(self.page)
@@ -55,90 +54,90 @@ class Ui_CalcDialog(object):
         self.page_2.setObjectName("page_2")
         self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.page_2)
         self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.groupBox_2 = QtWidgets.QGroupBox(self.page_2)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=self.page_2)
         self.groupBox_2.setObjectName("groupBox_2")
         self.formLayout_3 = QtWidgets.QFormLayout(self.groupBox_2)
         self.formLayout_3.setContentsMargins(3, 3, 3, 3)
         self.formLayout_3.setHorizontalSpacing(3)
         self.formLayout_3.setObjectName("formLayout_3")
-        self.label_3 = QtWidgets.QLabel(self.groupBox_2)
+        self.label_3 = QtWidgets.QLabel(parent=self.groupBox_2)
         self.label_3.setObjectName("label_3")
-        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_3)
+        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
-        self.label_lineEdit = QtWidgets.QLineEdit(self.groupBox_2)
+        self.label_lineEdit = QtWidgets.QLineEdit(parent=self.groupBox_2)
         self.label_lineEdit.setObjectName("label_lineEdit")
-        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.label_lineEdit)
+        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.label_lineEdit)
-        self.label_9 = QtWidgets.QLabel(self.groupBox_2)
+        self.label_9 = QtWidgets.QLabel(parent=self.groupBox_2)
         self.label_9.setObjectName("label_9")
-        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_9)
+        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_9)
-        self.value_lineEdit = QtWidgets.QLineEdit(self.groupBox_2)
+        self.value_lineEdit = QtWidgets.QLineEdit(parent=self.groupBox_2)
         self.value_lineEdit.setObjectName("value_lineEdit")
-        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.value_lineEdit)
+        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.value_lineEdit)
-        self.label_6 = QtWidgets.QLabel(self.groupBox_2)
+        self.label_6 = QtWidgets.QLabel(parent=self.groupBox_2)
         self.label_6.setObjectName("label_6")
-        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_6)
+        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_6)
-        self.dtype_comboBox = QtWidgets.QComboBox(self.groupBox_2)
+        self.dtype_comboBox = QtWidgets.QComboBox(parent=self.groupBox_2)
         self.dtype_comboBox.setObjectName("dtype_comboBox")
         self.dtype_comboBox.addItem("")
         self.dtype_comboBox.addItem("")
         self.dtype_comboBox.addItem("")
         self.dtype_comboBox.addItem("")
-        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.dtype_comboBox)
+        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.dtype_comboBox)
         self.verticalLayout_4.addWidget(self.groupBox_2)
-        self.groupBox = QtWidgets.QGroupBox(self.page_2)
+        self.groupBox = QtWidgets.QGroupBox(parent=self.page_2)
         self.groupBox.setObjectName("groupBox")
         self.formLayout_2 = QtWidgets.QFormLayout(self.groupBox)
         self.formLayout_2.setContentsMargins(3, 3, 3, 3)
         self.formLayout_2.setSpacing(3)
         self.formLayout_2.setObjectName("formLayout_2")
-        self.label_4 = QtWidgets.QLabel(self.groupBox)
+        self.label_4 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_4.setObjectName("label_4")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_4)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_4)
-        self.symcolor_comboBox = ColorListEditor(self.groupBox)
+        self.symcolor_comboBox = ColorListEditor(parent=self.groupBox)
         self.symcolor_comboBox.setObjectName("symcolor_comboBox")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.symcolor_comboBox)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.symcolor_comboBox)
-        self.label_5 = QtWidgets.QLabel(self.groupBox)
+        self.label_5 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_5.setObjectName("label_5")
-        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_5)
-        self.symbol_spinBox = QtWidgets.QSpinBox(self.groupBox)
+        self.symbol_spinBox = QtWidgets.QSpinBox(parent=self.groupBox)
         self.symbol_spinBox.setProperty("value", 10)
         self.symbol_spinBox.setObjectName("symbol_spinBox")
-        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.symbol_spinBox)
+        self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.symbol_spinBox)
-        self.symbol_comboBox = SymbolStyleEditor(self.groupBox)
+        self.symbol_comboBox = SymbolStyleEditor(parent=self.groupBox)
         self.symbol_comboBox.setObjectName("symbol_comboBox")
-        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.symbol_comboBox)
+        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.symbol_comboBox)
-        self.label_10 = QtWidgets.QLabel(self.groupBox)
+        self.label_10 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_10.setObjectName("label_10")
-        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_10)
+        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_10)
         self.verticalLayout_4.addWidget(self.groupBox)
-        self.groupBox_3 = QtWidgets.QGroupBox(self.page_2)
+        self.groupBox_3 = QtWidgets.QGroupBox(parent=self.page_2)
         self.groupBox_3.setObjectName("groupBox_3")
         self.formLayout = QtWidgets.QFormLayout(self.groupBox_3)
         self.formLayout.setContentsMargins(3, 3, 3, 3)
         self.formLayout.setSpacing(3)
         self.formLayout.setObjectName("formLayout")
-        self.label_7 = QtWidgets.QLabel(self.groupBox_3)
+        self.label_7 = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label_7.setObjectName("label_7")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_7)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_7)
-        self.linecolor_comboBox = ColorListEditor(self.groupBox_3)
+        self.linecolor_comboBox = ColorListEditor(parent=self.groupBox_3)
         self.linecolor_comboBox.setObjectName("linecolor_comboBox")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.linecolor_comboBox)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.linecolor_comboBox)
-        self.label_8 = QtWidgets.QLabel(self.groupBox_3)
+        self.label_8 = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label_8.setObjectName("label_8")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_8)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_8)
-        self.line_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.groupBox_3)
+        self.line_doubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.groupBox_3)
         self.line_doubleSpinBox.setProperty("value", 1.0)
         self.line_doubleSpinBox.setObjectName("line_doubleSpinBox")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.line_doubleSpinBox)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.line_doubleSpinBox)
-        self.linestyle_comboBox = LineStyleEditor(self.groupBox_3)
+        self.linestyle_comboBox = LineStyleEditor(parent=self.groupBox_3)
         self.linestyle_comboBox.setObjectName("linestyle_comboBox")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.linestyle_comboBox)
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.linestyle_comboBox)
-        self.label_11 = QtWidgets.QLabel(self.groupBox_3)
+        self.label_11 = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label_11.setObjectName("label_11")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_11)
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_11)
         self.verticalLayout_4.addWidget(self.groupBox_3)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_4.addItem(spacerItem)
-        self.graph_comboBox = QtWidgets.QComboBox(self.page_2)
+        self.graph_comboBox = QtWidgets.QComboBox(parent=self.page_2)
         self.graph_comboBox.setObjectName("graph_comboBox")
         self.verticalLayout_4.addWidget(self.graph_comboBox)
         self.groupBox.raise_()
@@ -150,37 +149,37 @@ class Ui_CalcDialog(object):
         self.page_3.setObjectName("page_3")
         self.stackedWidget.addWidget(self.page_3)
         self.verticalLayout.addWidget(self.stackedWidget)
-        self.splitter = QtWidgets.QSplitter(self.splitter_2)
+        self.splitter = QtWidgets.QSplitter(parent=self.splitter_2)
-        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Vertical)
         self.splitter.setChildrenCollapsible(False)
         self.splitter.setObjectName("splitter")
-        self.verticalLayoutWidget_2 = QtWidgets.QWidget(self.splitter)
+        self.verticalLayoutWidget_2 = QtWidgets.QWidget(parent=self.splitter)
         self.verticalLayoutWidget_2.setObjectName("verticalLayoutWidget_2")
         self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_2)
         self.verticalLayout_6.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.namespace_widget = QNamespaceWidget(self.verticalLayoutWidget_2)
+        self.namespace_widget = QNamespaceWidget(parent=self.verticalLayoutWidget_2)
         self.namespace_widget.setObjectName("namespace_widget")
         self.verticalLayout_6.addWidget(self.namespace_widget)
-        self.verticalLayoutWidget_3 = QtWidgets.QWidget(self.splitter)
+        self.verticalLayoutWidget_3 = QtWidgets.QWidget(parent=self.splitter)
         self.verticalLayoutWidget_3.setObjectName("verticalLayoutWidget_3")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_3)
         self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.line_2 = QtWidgets.QFrame(self.verticalLayoutWidget_3)
+        self.line_2 = QtWidgets.QFrame(parent=self.verticalLayoutWidget_3)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.verticalLayout_3.addWidget(self.line_2)
-        self.label = QtWidgets.QLabel(self.verticalLayoutWidget_3)
+        self.label = QtWidgets.QLabel(parent=self.verticalLayoutWidget_3)
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
         self.label.setFont(font)
         self.label.setObjectName("label")
         self.verticalLayout_3.addWidget(self.label)
-        self.calc_edit = QtWidgets.QPlainTextEdit(self.verticalLayoutWidget_3)
+        self.calc_edit = QtWidgets.QPlainTextEdit(parent=self.verticalLayoutWidget_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.calc_edit.sizePolicy().hasHeightForWidth())
@@ -188,9 +187,9 @@ class Ui_CalcDialog(object):
         self.calc_edit.setObjectName("calc_edit")
         self.verticalLayout_3.addWidget(self.calc_edit)
         self.verticalLayout_5.addWidget(self.splitter_2)
-        self.buttonBox = QtWidgets.QDialogButtonBox(CalcDialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=CalcDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout_5.addWidget(self.buttonBox)
         self.label_3.setBuddy(self.label_lineEdit)
@@ -202,7 +201,7 @@ class Ui_CalcDialog(object):
         self.label_8.setBuddy(self.line_doubleSpinBox)
 
         self.retranslateUi(CalcDialog)
-        self.stackedWidget.setCurrentIndex(2)
+        self.stackedWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(CalcDialog)
         CalcDialog.setTabOrder(self.calc_edit, self.listWidget)
         CalcDialog.setTabOrder(self.listWidget, self.overwrite_checkbox)
@@ -237,4 +236,5 @@ class Ui_CalcDialog(object):
         self.label_11.setText(_translate("CalcDialog", "Style"))
         self.label.setText(_translate("CalcDialog", "Expressions are evaluated line by line and change previous values"))
 from ..lib.delegates import ColorListEditor, LineStyleEditor, SymbolStyleEditor
+from ..lib.listwidget import QListWidgetSelect
 from ..lib.namespace import QNamespaceWidget

src/gui_qt/_py/evalexpression.py

@@ -1,217 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/evalexpression.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_CalcDialog(object):
-    def setupUi(self, CalcDialog):
-        CalcDialog.setObjectName("CalcDialog")
-        CalcDialog.resize(895, 547)
-        self.gridLayout = QtWidgets.QGridLayout(CalcDialog)
-        self.gridLayout.setObjectName("gridLayout")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_2.setContentsMargins(-1, 0, -1, -1)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.tabWidget = QtWidgets.QTabWidget(CalcDialog)
-        self.tabWidget.setObjectName("tabWidget")
-        self.tab = QtWidgets.QWidget()
-        self.tab.setObjectName("tab")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.tab)
-        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout.setSpacing(0)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
-        self.horizontalLayout_2.setSpacing(0)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.textEdit = QtWidgets.QTextEdit(self.tab)
-        self.textEdit.setEnabled(True)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.textEdit.sizePolicy().hasHeightForWidth())
-        self.textEdit.setSizePolicy(sizePolicy)
-        self.textEdit.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.textEdit.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.textEdit.setAutoFormatting(QtWidgets.QTextEdit.AutoNone)
-        self.textEdit.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
-        self.textEdit.setObjectName("textEdit")
-        self.horizontalLayout_2.addWidget(self.textEdit)
-        self.textEdit_3 = QtWidgets.QTextEdit(self.tab)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.textEdit_3.sizePolicy().hasHeightForWidth())
-        self.textEdit_3.setSizePolicy(sizePolicy)
-        self.textEdit_3.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.textEdit_3.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.textEdit_3.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
-        self.textEdit_3.setObjectName("textEdit_3")
-        self.horizontalLayout_2.addWidget(self.textEdit_3)
-        self.verticalLayout.addLayout(self.horizontalLayout_2)
-        self.tabWidget.addTab(self.tab, "")
-        self.tab_2 = QtWidgets.QWidget()
-        self.tab_2.setObjectName("tab_2")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.tab_2)
-        self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_3.setSpacing(0)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_3.setContentsMargins(-1, 0, -1, -1)
-        self.horizontalLayout_3.setSpacing(0)
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.textEdit_2 = QtWidgets.QTextEdit(self.tab_2)
-        self.textEdit_2.setEnabled(True)
-        self.textEdit_2.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.textEdit_2.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.textEdit_2.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
-        self.textEdit_2.setObjectName("textEdit_2")
-        self.horizontalLayout_3.addWidget(self.textEdit_2)
-        self.textEdit_4 = QtWidgets.QTextEdit(self.tab_2)
-        self.textEdit_4.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.textEdit_4.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.textEdit_4.setReadOnly(True)
-        self.textEdit_4.setObjectName("textEdit_4")
-        self.horizontalLayout_3.addWidget(self.textEdit_4)
-        self.verticalLayout_3.addLayout(self.horizontalLayout_3)
-        self.tabWidget.addTab(self.tab_2, "")
-        self.tab_3 = QtWidgets.QWidget()
-        self.tab_3.setObjectName("tab_3")
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.tab_3)
-        self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_4.setSpacing(0)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.treeWidget = QtWidgets.QTreeWidget(self.tab_3)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.treeWidget.sizePolicy().hasHeightForWidth())
-        self.treeWidget.setSizePolicy(sizePolicy)
-        self.treeWidget.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.treeWidget.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.treeWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
-        self.treeWidget.setObjectName("treeWidget")
-        self.treeWidget.header().setVisible(False)
-        self.verticalLayout_4.addWidget(self.treeWidget)
-        self.tabWidget.addTab(self.tab_3, "")
-        self.verticalLayout_2.addWidget(self.tabWidget)
-        self.label = QtWidgets.QLabel(CalcDialog)
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.label.setFont(font)
-        self.label.setObjectName("label")
-        self.verticalLayout_2.addWidget(self.label)
-        self.calc_edit = QtWidgets.QPlainTextEdit(CalcDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.calc_edit.sizePolicy().hasHeightForWidth())
-        self.calc_edit.setSizePolicy(sizePolicy)
-        self.calc_edit.setObjectName("calc_edit")
-        self.verticalLayout_2.addWidget(self.calc_edit)
-        self.gridLayout.addLayout(self.verticalLayout_2, 0, 3, 1, 1)
-        self.verticalLayout_5 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_5.setSpacing(0)
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.label_2 = QtWidgets.QLabel(CalcDialog)
-        self.label_2.setObjectName("label_2")
-        self.verticalLayout_5.addWidget(self.label_2)
-        self.listWidget = QtWidgets.QListWidget(CalcDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
-        self.listWidget.setSizePolicy(sizePolicy)
-        self.listWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
-        self.listWidget.setObjectName("listWidget")
-        self.verticalLayout_5.addWidget(self.listWidget)
-        self.overwrite_checkbox = QtWidgets.QCheckBox(CalcDialog)
-        self.overwrite_checkbox.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.overwrite_checkbox.setObjectName("overwrite_checkbox")
-        self.verticalLayout_5.addWidget(self.overwrite_checkbox)
-        self.gridLayout.addLayout(self.verticalLayout_5, 0, 1, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(CalcDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 1, 3, 1, 1)
-        self.line = QtWidgets.QFrame(CalcDialog)
-        self.line.setFrameShape(QtWidgets.QFrame.VLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.gridLayout.addWidget(self.line, 0, 2, 1, 1)
-
-        self.retranslateUi(CalcDialog)
-        self.tabWidget.setCurrentIndex(0)
-        self.buttonBox.accepted.connect(CalcDialog.accept)
-        self.buttonBox.rejected.connect(CalcDialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(CalcDialog)
-
-    def retranslateUi(self, CalcDialog):
-        _translate = QtCore.QCoreApplication.translate
-        CalcDialog.setWindowTitle(_translate("CalcDialog", "Evaluate stuff"))
-        self.textEdit.setHtml(_translate("CalcDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Noto Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- X, y, and Δy values </p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- Values of dataset on position <span style=\" font-style:italic;\">i</span> in list</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">  (<span style=\" font-style:italic;\">s[i].x</span> and <span style=\" font-style:italic;\">x</span> return the same values)</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- Numpy functions</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- If available, fit parameters</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">  (see namespace for available parameters)</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- Fit functions:</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">  (meaning of p and extra arguments </p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">  depend on function)</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">- Constants:</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">  (nuclei are accessed by <span style=\" font-style:italic;\">const[\'gamma\'][\'1H\']</span>)</p></body></html>"))
-        self.textEdit_3.setHtml(_translate("CalcDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Noto Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">x y y_err</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">s[i].x s[i+2].y</span> <span style=\" font-style:italic;\">s[i-1].y_err</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">np.function</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">fit[\'NAME\']</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;\"><br /></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">Name.func(p, x, *args) </span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;\"><br /></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">const[\'NAME\']</span></p></body></html>"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("CalcDialog", "Parameter"))
-        self.textEdit_2.setHtml(_translate("CalcDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Noto Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Substract neighbouring datasets: </p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Normalize on fit value M<span style=\" vertical-align:sub;\">∞</span>:</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Logscale x:</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Division by exponential decay:</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>"))
-        self.textEdit_4.setHtml(_translate("CalcDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Noto Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">y = y-s[i+1].y</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">y = y/fit[\'M_infty\']</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">x = np.log10(x)</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">y = y/np.exp(-x/10)</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-style:italic;\">y = y/Exponential_Decay.func([0, 1, 10, 1], x)</span></p></body></html>"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("CalcDialog", "Example"))
-        self.treeWidget.headerItem().setText(0, _translate("CalcDialog", "Namespace"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("CalcDialog", "Namespace"))
-        self.label.setText(_translate("CalcDialog", "Expressions are evaluated line by line and change previous values"))
-        self.label_2.setText(_translate("CalcDialog", "<html><head/><body><p>Select sets for evaluation<br>(no selection = all visible):</p></body></html>"))
-        self.overwrite_checkbox.setText(_translate("CalcDialog", "Overwrite values?"))

src/gui_qt/_py/expandablewidget.py

@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/expandablewidget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_ExpandableForm(object):
-    def setupUi(self, ExpandableForm):
-        ExpandableForm.setObjectName("ExpandableForm")
-        ExpandableForm.resize(400, 300)
-        self.verticalLayout = QtWidgets.QVBoxLayout(ExpandableForm)
-        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout.setSpacing(0)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setSpacing(0)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.toolButton = QtWidgets.QToolButton(ExpandableForm)
-        self.toolButton.setStyleSheet("border: 0")
-        self.toolButton.setText("")
-        self.toolButton.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
-        self.toolButton.setArrowType(QtCore.Qt.RightArrow)
-        self.toolButton.setObjectName("toolButton")
-        self.horizontalLayout.addWidget(self.toolButton)
-        self.label = QtWidgets.QLabel(ExpandableForm)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setText("")
-        self.label.setObjectName("label")
-        self.horizontalLayout.addWidget(self.label)
-        self.line = QtWidgets.QFrame(ExpandableForm)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.horizontalLayout.addWidget(self.line)
-        self.verticalLayout.addLayout(self.horizontalLayout)
-
-        self.retranslateUi(ExpandableForm)
-        QtCore.QMetaObject.connectSlotsByName(ExpandableForm)
-
-    def retranslateUi(self, ExpandableForm):
-        _translate = QtCore.QCoreApplication.translate
-        ExpandableForm.setWindowTitle(_translate("ExpandableForm", "Form"))

src/gui_qt/_py/exportConfigTemplate.py

@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/exportConfigTemplate.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(241, 367)
-        self.gridLayout = QtWidgets.QGridLayout(Form)
-        self.gridLayout.setSpacing(0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.label = QtWidgets.QLabel(Form)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 0, 0, 1, 3)
-        self.itemTree = QtWidgets.QTreeWidget(Form)
-        self.itemTree.setObjectName("itemTree")
-        self.itemTree.headerItem().setText(0, "1")
-        self.itemTree.header().setVisible(False)
-        self.gridLayout.addWidget(self.itemTree, 1, 0, 1, 3)
-        self.label_2 = QtWidgets.QLabel(Form)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout.addWidget(self.label_2, 2, 0, 1, 3)
-        self.formatList = QtWidgets.QListWidget(Form)
-        self.formatList.setObjectName("formatList")
-        self.gridLayout.addWidget(self.formatList, 3, 0, 1, 3)
-        self.exportBtn = QtWidgets.QPushButton(Form)
-        self.exportBtn.setObjectName("exportBtn")
-        self.gridLayout.addWidget(self.exportBtn, 6, 1, 1, 1)
-        self.closeBtn = QtWidgets.QPushButton(Form)
-        self.closeBtn.setObjectName("closeBtn")
-        self.gridLayout.addWidget(self.closeBtn, 6, 2, 1, 1)
-        self.paramTree = ParameterTree(Form)
-        self.paramTree.setColumnCount(2)
-        self.paramTree.setObjectName("paramTree")
-        self.paramTree.headerItem().setText(0, "1")
-        self.paramTree.header().setVisible(False)
-        self.gridLayout.addWidget(self.paramTree, 5, 0, 1, 3)
-        self.label_3 = QtWidgets.QLabel(Form)
-        self.label_3.setObjectName("label_3")
-        self.gridLayout.addWidget(self.label_3, 4, 0, 1, 3)
-        self.copyBtn = QtWidgets.QPushButton(Form)
-        self.copyBtn.setObjectName("copyBtn")
-        self.gridLayout.addWidget(self.copyBtn, 6, 0, 1, 1)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "Export"))
-        self.label.setText(_translate("Form", "Item to export:"))
-        self.label_2.setText(_translate("Form", "Export format"))
-        self.exportBtn.setText(_translate("Form", "Export"))
-        self.closeBtn.setText(_translate("Form", "Close"))
-        self.label_3.setText(_translate("Form", "Export options"))
-        self.copyBtn.setText(_translate("Form", "Copy"))
-from ..parametertree import ParameterTree

src/gui_qt/_py/fcreader.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/fcreader.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/fcreader.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_FCEval_dialog(object):
@@ -18,68 +17,69 @@ class Ui_FCEval_dialog(object):
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.input_box = QtWidgets.QGroupBox(FCEval_dialog)
+        self.input_box = QtWidgets.QGroupBox(parent=FCEval_dialog)
         self.input_box.setObjectName("input_box")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.input_box)
         self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_2.setSpacing(3)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.file_pushbutton = QtWidgets.QPushButton(self.input_box)
+        self.file_pushbutton = QtWidgets.QPushButton(parent=self.input_box)
         self.file_pushbutton.setChecked(False)
         self.file_pushbutton.setObjectName("file_pushbutton")
         self.gridLayout_2.addWidget(self.file_pushbutton, 0, 0, 1, 1)
-        self.dir_pushbutton = QtWidgets.QPushButton(self.input_box)
+        self.dir_pushbutton = QtWidgets.QPushButton(parent=self.input_box)
         self.dir_pushbutton.setObjectName("dir_pushbutton")
         self.gridLayout_2.addWidget(self.dir_pushbutton, 0, 1, 1, 1)
-        self.listWidget = QtWidgets.QListWidget(self.input_box)
+        self.listWidget = QtWidgets.QListWidget(parent=self.input_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
         self.listWidget.setSizePolicy(sizePolicy)
-        self.listWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.listWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
-        self.listWidget.setTextElideMode(QtCore.Qt.ElideLeft)
+        self.listWidget.setTextElideMode(QtCore.Qt.TextElideMode.ElideLeft)
         self.listWidget.setObjectName("listWidget")
         self.gridLayout_2.addWidget(self.listWidget, 1, 0, 1, 3)
-        self.overwrite_cb = QtWidgets.QCheckBox(self.input_box)
+        self.overwrite_cb = QtWidgets.QCheckBox(parent=self.input_box)
         self.overwrite_cb.setObjectName("overwrite_cb")
         self.gridLayout_2.addWidget(self.overwrite_cb, 0, 2, 1, 1)
         self.verticalLayout.addWidget(self.input_box)
-        self.region_box = QtWidgets.QGroupBox(FCEval_dialog)
+        self.region_box = QtWidgets.QGroupBox(parent=FCEval_dialog)
         self.region_box.setCheckable(True)
+        self.region_box.setChecked(False)
         self.region_box.setObjectName("region_box")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.region_box)
         self.horizontalLayout.setContentsMargins(3, 3, 3, 3)
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.start_lineedit = QtWidgets.QLineEdit(self.region_box)
+        self.start_lineedit = QtWidgets.QLineEdit(parent=self.region_box)
         self.start_lineedit.setObjectName("start_lineedit")
         self.horizontalLayout.addWidget(self.start_lineedit)
-        self.stop_lineedit = QtWidgets.QLineEdit(self.region_box)
+        self.stop_lineedit = QtWidgets.QLineEdit(parent=self.region_box)
         self.stop_lineedit.setObjectName("stop_lineedit")
         self.horizontalLayout.addWidget(self.stop_lineedit)
         self.verticalLayout.addWidget(self.region_box)
-        self.fit_box = QtWidgets.QGroupBox(FCEval_dialog)
+        self.fit_box = QtWidgets.QGroupBox(parent=FCEval_dialog)
         self.fit_box.setObjectName("fit_box")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.fit_box)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.label_12 = QtWidgets.QLabel(self.fit_box)
+        self.label_12 = QtWidgets.QLabel(parent=self.fit_box)
         self.label_12.setObjectName("label_12")
         self.gridLayout_3.addWidget(self.label_12, 0, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.gridLayout_3.addItem(spacerItem, 0, 1, 1, 1)
-        self.kww_checkbox = QtWidgets.QCheckBox(self.fit_box)
+        self.kww_checkbox = QtWidgets.QCheckBox(parent=self.fit_box)
         self.kww_checkbox.setChecked(True)
         self.kww_checkbox.setObjectName("kww_checkbox")
         self.gridLayout_3.addWidget(self.kww_checkbox, 0, 2, 1, 1)
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_3.setSpacing(2)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.label_3 = QtWidgets.QLabel(self.fit_box)
+        self.label_3 = QtWidgets.QLabel(parent=self.fit_box)
         self.label_3.setObjectName("label_3")
         self.horizontalLayout_3.addWidget(self.label_3)
-        self.t1_cb = QtWidgets.QCheckBox(self.fit_box)
+        self.t1_cb = QtWidgets.QCheckBox(parent=self.fit_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.t1_cb.sizePolicy().hasHeightForWidth())
@@ -88,11 +88,11 @@ class Ui_FCEval_dialog(object):
         self.t1_cb.setChecked(True)
         self.t1_cb.setObjectName("t1_cb")
         self.horizontalLayout_3.addWidget(self.t1_cb)
-        self.label_4 = QtWidgets.QLabel(self.fit_box)
+        self.label_4 = QtWidgets.QLabel(parent=self.fit_box)
         self.label_4.setObjectName("label_4")
         self.horizontalLayout_3.addWidget(self.label_4)
-        self.beta_cb = QtWidgets.QCheckBox(self.fit_box)
+        self.beta_cb = QtWidgets.QCheckBox(parent=self.fit_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.beta_cb.sizePolicy().hasHeightForWidth())
@@ -100,11 +100,11 @@ class Ui_FCEval_dialog(object):
         self.beta_cb.setChecked(True)
         self.beta_cb.setObjectName("beta_cb")
         self.horizontalLayout_3.addWidget(self.beta_cb)
-        self.label_5 = QtWidgets.QLabel(self.fit_box)
+        self.label_5 = QtWidgets.QLabel(parent=self.fit_box)
         self.label_5.setObjectName("label_5")
         self.horizontalLayout_3.addWidget(self.label_5)
-        self.m0_cb = QtWidgets.QCheckBox(self.fit_box)
+        self.m0_cb = QtWidgets.QCheckBox(parent=self.fit_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.m0_cb.sizePolicy().hasHeightForWidth())
@@ -112,53 +112,54 @@ class Ui_FCEval_dialog(object):
         self.m0_cb.setText("")
         self.m0_cb.setObjectName("m0_cb")
         self.horizontalLayout_3.addWidget(self.m0_cb)
-        self.label_6 = QtWidgets.QLabel(self.fit_box)
+        self.label_6 = QtWidgets.QLabel(parent=self.fit_box)
         self.label_6.setObjectName("label_6")
         self.horizontalLayout_3.addWidget(self.label_6)
-        self.off_cb = QtWidgets.QCheckBox(self.fit_box)
+        self.off_cb = QtWidgets.QCheckBox(parent=self.fit_box)
         self.off_cb.setObjectName("off_cb")
         self.horizontalLayout_3.addWidget(self.off_cb)
         self.gridLayout_3.addLayout(self.horizontalLayout_3, 1, 0, 1, 3)
         self.verticalLayout.addWidget(self.fit_box)
-        self.out_box = QtWidgets.QGroupBox(FCEval_dialog)
+        self.out_box = QtWidgets.QGroupBox(parent=FCEval_dialog)
         self.out_box.setObjectName("out_box")
         self.gridLayout = QtWidgets.QGridLayout(self.out_box)
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
         self.gridLayout.setObjectName("gridLayout")
-        self.savebutton = QtWidgets.QPushButton(self.out_box)
+        self.savebutton = QtWidgets.QPushButton(parent=self.out_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.savebutton.sizePolicy().hasHeightForWidth())
         self.savebutton.setSizePolicy(sizePolicy)
         self.savebutton.setObjectName("savebutton")
         self.gridLayout.addWidget(self.savebutton, 0, 1, 1, 1)
-        self.line = QtWidgets.QFrame(self.out_box)
+        self.line = QtWidgets.QFrame(parent=self.out_box)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.gridLayout.addWidget(self.line, 2, 0, 1, 2)
-        self.graph_comboBox = QtWidgets.QComboBox(self.out_box)
+        self.graph_comboBox = QtWidgets.QComboBox(parent=self.out_box)
+        self.graph_comboBox.setEnabled(False)
         self.graph_comboBox.setObjectName("graph_comboBox")
         self.gridLayout.addWidget(self.graph_comboBox, 3, 1, 1, 1)
-        self.graph_checkbox = QtWidgets.QCheckBox(self.out_box)
+        self.graph_checkbox = QtWidgets.QCheckBox(parent=self.out_box)
         self.graph_checkbox.setChecked(True)
         self.graph_checkbox.setObjectName("graph_checkbox")
         self.gridLayout.addWidget(self.graph_checkbox, 3, 0, 1, 1)
-        self.label = QtWidgets.QLabel(self.out_box)
+        self.label = QtWidgets.QLabel(parent=self.out_box)
         self.label.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.label.setText("")
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 1, 0, 1, 2)
-        self.label_2 = QtWidgets.QLabel(self.out_box)
+        self.label_2 = QtWidgets.QLabel(parent=self.out_box)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1)
         self.verticalLayout.addWidget(self.out_box)
-        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout.addItem(spacerItem1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(FCEval_dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=FCEval_dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
         self.label_12.setBuddy(self.kww_checkbox)
@@ -167,8 +168,8 @@ class Ui_FCEval_dialog(object):
         self.label_6.setBuddy(self.m0_cb)
 
         self.retranslateUi(FCEval_dialog)
-        self.buttonBox.accepted.connect(FCEval_dialog.accept)
+        self.buttonBox.accepted.connect(FCEval_dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(FCEval_dialog.reject)
+        self.buttonBox.rejected.connect(FCEval_dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(FCEval_dialog)
 
     def retranslateUi(self, FCEval_dialog):
@@ -178,7 +179,7 @@ class Ui_FCEval_dialog(object):
         self.file_pushbutton.setText(_translate("FCEval_dialog", "Add HDF files..."))
         self.dir_pushbutton.setText(_translate("FCEval_dialog", "Add directory..."))
         self.overwrite_cb.setText(_translate("FCEval_dialog", "Overwrite prev. data"))
-        self.region_box.setTitle(_translate("FCEval_dialog", "Evaluate region (empty values default to start/end)"))
+        self.region_box.setTitle(_translate("FCEval_dialog", "Evaluate region (empty values default to values of the script)"))
         self.start_lineedit.setPlaceholderText(_translate("FCEval_dialog", "start pos in µs"))
         self.stop_lineedit.setPlaceholderText(_translate("FCEval_dialog", "end pos in µs"))
         self.fit_box.setTitle(_translate("FCEval_dialog", "Fit equation"))

src/gui_qt/_py/filedialog.py

@@ -1,181 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/filedialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_QFileDialog(object):
-    def setupUi(self, QFileDialog):
-        QFileDialog.setObjectName("QFileDialog")
-        QFileDialog.resize(521, 316)
-        QFileDialog.setSizeGripEnabled(True)
-        self.gridlayout = QtWidgets.QGridLayout(QFileDialog)
-        self.gridlayout.setObjectName("gridlayout")
-        self.lookInLabel = QtWidgets.QLabel(QFileDialog)
-        self.lookInLabel.setObjectName("lookInLabel")
-        self.gridlayout.addWidget(self.lookInLabel, 0, 0, 1, 1)
-        self.hboxlayout = QtWidgets.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.lookInCombo = QFileDialogComboBox(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.lookInCombo.sizePolicy().hasHeightForWidth())
-        self.lookInCombo.setSizePolicy(sizePolicy)
-        self.lookInCombo.setMinimumSize(QtCore.QSize(50, 0))
-        self.lookInCombo.setObjectName("lookInCombo")
-        self.hboxlayout.addWidget(self.lookInCombo)
-        self.backButton = QtWidgets.QToolButton(QFileDialog)
-        self.backButton.setObjectName("backButton")
-        self.hboxlayout.addWidget(self.backButton)
-        self.forwardButton = QtWidgets.QToolButton(QFileDialog)
-        self.forwardButton.setObjectName("forwardButton")
-        self.hboxlayout.addWidget(self.forwardButton)
-        self.toParentButton = QtWidgets.QToolButton(QFileDialog)
-        self.toParentButton.setObjectName("toParentButton")
-        self.hboxlayout.addWidget(self.toParentButton)
-        self.newFolderButton = QtWidgets.QToolButton(QFileDialog)
-        self.newFolderButton.setObjectName("newFolderButton")
-        self.hboxlayout.addWidget(self.newFolderButton)
-        self.listModeButton = QtWidgets.QToolButton(QFileDialog)
-        self.listModeButton.setObjectName("listModeButton")
-        self.hboxlayout.addWidget(self.listModeButton)
-        self.detailModeButton = QtWidgets.QToolButton(QFileDialog)
-        self.detailModeButton.setObjectName("detailModeButton")
-        self.hboxlayout.addWidget(self.detailModeButton)
-        self.gridlayout.addLayout(self.hboxlayout, 0, 1, 1, 2)
-        self.splitter = QtWidgets.QSplitter(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.splitter.sizePolicy().hasHeightForWidth())
-        self.splitter.setSizePolicy(sizePolicy)
-        self.splitter.setOrientation(QtCore.Qt.Horizontal)
-        self.splitter.setChildrenCollapsible(False)
-        self.splitter.setObjectName("splitter")
-        self.sidebar = QSidebar(self.splitter)
-        self.sidebar.setObjectName("sidebar")
-        self.frame = QtWidgets.QFrame(self.splitter)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.frame.setObjectName("frame")
-        self.vboxlayout = QtWidgets.QVBoxLayout(self.frame)
-        self.vboxlayout.setContentsMargins(0, 0, 0, 0)
-        self.vboxlayout.setSpacing(0)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.stackedWidget = QtWidgets.QStackedWidget(self.frame)
-        self.stackedWidget.setObjectName("stackedWidget")
-        self.page = QtWidgets.QWidget()
-        self.page.setObjectName("page")
-        self.vboxlayout1 = QtWidgets.QVBoxLayout(self.page)
-        self.vboxlayout1.setContentsMargins(0, 0, 0, 0)
-        self.vboxlayout1.setSpacing(0)
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.listView = QFileDialogListView(self.page)
-        self.listView.setObjectName("listView")
-        self.vboxlayout1.addWidget(self.listView)
-        self.stackedWidget.addWidget(self.page)
-        self.page_2 = QtWidgets.QWidget()
-        self.page_2.setObjectName("page_2")
-        self.vboxlayout2 = QtWidgets.QVBoxLayout(self.page_2)
-        self.vboxlayout2.setContentsMargins(0, 0, 0, 0)
-        self.vboxlayout2.setSpacing(0)
-        self.vboxlayout2.setObjectName("vboxlayout2")
-        self.treeView = QFileDialogTreeView(self.page_2)
-        self.treeView.setObjectName("treeView")
-        self.vboxlayout2.addWidget(self.treeView)
-        self.stackedWidget.addWidget(self.page_2)
-        self.vboxlayout.addWidget(self.stackedWidget)
-        self.gridlayout.addWidget(self.splitter, 1, 0, 1, 3)
-        self.fileNameLabel = QtWidgets.QLabel(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileNameLabel.sizePolicy().hasHeightForWidth())
-        self.fileNameLabel.setSizePolicy(sizePolicy)
-        self.fileNameLabel.setMinimumSize(QtCore.QSize(0, 0))
-        self.fileNameLabel.setObjectName("fileNameLabel")
-        self.gridlayout.addWidget(self.fileNameLabel, 2, 0, 1, 1)
-        self.fileNameEdit = QFileDialogLineEdit(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileNameEdit.sizePolicy().hasHeightForWidth())
-        self.fileNameEdit.setSizePolicy(sizePolicy)
-        self.fileNameEdit.setObjectName("fileNameEdit")
-        self.gridlayout.addWidget(self.fileNameEdit, 2, 1, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(QFileDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Vertical)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridlayout.addWidget(self.buttonBox, 2, 2, 2, 1)
-        self.fileTypeLabel = QtWidgets.QLabel(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileTypeLabel.sizePolicy().hasHeightForWidth())
-        self.fileTypeLabel.setSizePolicy(sizePolicy)
-        self.fileTypeLabel.setObjectName("fileTypeLabel")
-        self.gridlayout.addWidget(self.fileTypeLabel, 3, 0, 1, 1)
-        self.fileTypeCombo = QtWidgets.QComboBox(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileTypeCombo.sizePolicy().hasHeightForWidth())
-        self.fileTypeCombo.setSizePolicy(sizePolicy)
-        self.fileTypeCombo.setObjectName("fileTypeCombo")
-        self.gridlayout.addWidget(self.fileTypeCombo, 3, 1, 1, 1)
-
-        self.retranslateUi(QFileDialog)
-        self.stackedWidget.setCurrentIndex(0)
-        QtCore.QMetaObject.connectSlotsByName(QFileDialog)
-        QFileDialog.setTabOrder(self.lookInCombo, self.backButton)
-        QFileDialog.setTabOrder(self.backButton, self.forwardButton)
-        QFileDialog.setTabOrder(self.forwardButton, self.toParentButton)
-        QFileDialog.setTabOrder(self.toParentButton, self.newFolderButton)
-        QFileDialog.setTabOrder(self.newFolderButton, self.listModeButton)
-        QFileDialog.setTabOrder(self.listModeButton, self.detailModeButton)
-        QFileDialog.setTabOrder(self.detailModeButton, self.sidebar)
-        QFileDialog.setTabOrder(self.sidebar, self.treeView)
-        QFileDialog.setTabOrder(self.treeView, self.listView)
-        QFileDialog.setTabOrder(self.listView, self.fileNameEdit)
-        QFileDialog.setTabOrder(self.fileNameEdit, self.buttonBox)
-        QFileDialog.setTabOrder(self.buttonBox, self.fileTypeCombo)
-
-    def retranslateUi(self, QFileDialog):
-        _translate = QtCore.QCoreApplication.translate
-        self.lookInLabel.setText(_translate("QFileDialog", "Look in:"))
-        self.backButton.setToolTip(_translate("QFileDialog", "Back"))
-        self.backButton.setAccessibleName(_translate("QFileDialog", "Back"))
-        self.backButton.setAccessibleDescription(_translate("QFileDialog", "Go back"))
-        self.backButton.setShortcut(_translate("QFileDialog", "Alt+Left"))
-        self.forwardButton.setToolTip(_translate("QFileDialog", "Forward"))
-        self.forwardButton.setAccessibleName(_translate("QFileDialog", "Forward"))
-        self.forwardButton.setAccessibleDescription(_translate("QFileDialog", "Go forward"))
-        self.forwardButton.setShortcut(_translate("QFileDialog", "Alt+Right"))
-        self.toParentButton.setToolTip(_translate("QFileDialog", "Parent Directory"))
-        self.toParentButton.setAccessibleName(_translate("QFileDialog", "Parent Directory"))
-        self.toParentButton.setAccessibleDescription(_translate("QFileDialog", "Go to the parent directory"))
-        self.toParentButton.setShortcut(_translate("QFileDialog", "Alt+Up"))
-        self.newFolderButton.setToolTip(_translate("QFileDialog", "Create New Folder"))
-        self.newFolderButton.setAccessibleName(_translate("QFileDialog", "Create New Folder"))
-        self.newFolderButton.setAccessibleDescription(_translate("QFileDialog", "Create a New Folder"))
-        self.listModeButton.setToolTip(_translate("QFileDialog", "List View"))
-        self.listModeButton.setAccessibleName(_translate("QFileDialog", "List View"))
-        self.listModeButton.setAccessibleDescription(_translate("QFileDialog", "Change to list view mode"))
-        self.detailModeButton.setToolTip(_translate("QFileDialog", "Detail View"))
-        self.detailModeButton.setAccessibleName(_translate("QFileDialog", "Detail View"))
-        self.detailModeButton.setAccessibleDescription(_translate("QFileDialog", "Change to detail view mode"))
-        self.sidebar.setAccessibleName(_translate("QFileDialog", "Sidebar"))
-        self.sidebar.setAccessibleDescription(_translate("QFileDialog", "List of places and bookmarks"))
-        self.listView.setAccessibleName(_translate("QFileDialog", "Files"))
-        self.treeView.setAccessibleName(_translate("QFileDialog", "Files"))
-        self.fileTypeLabel.setText(_translate("QFileDialog", "Files of type:"))
-from private.qfiledialog_p import QFileDialogComboBox, QFileDialogLineEdit, QFileDialogListView, QFileDialogTreeView
-from private.qsidebar_p import QSidebar

src/gui_qt/_py/fitcreationdialog.py

@@ -1,31 +1,29 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/fitcreationdialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/fitcreationdialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
         Dialog.resize(773, 633)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(Dialog.sizePolicy().hasHeightForWidth())
         Dialog.setSizePolicy(sizePolicy)
         self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.splitter = QtWidgets.QSplitter(Dialog)
+        self.splitter = QtWidgets.QSplitter(parent=Dialog)
-        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Vertical)
         self.splitter.setObjectName("splitter")
-        self.tabWidget = QtWidgets.QTabWidget(self.splitter)
+        self.tabWidget = QtWidgets.QTabWidget(parent=self.splitter)
         self.tabWidget.setObjectName("tabWidget")
         self.description_box = QtWidgets.QWidget()
         self.description_box.setObjectName("description_box")
@@ -51,20 +49,19 @@ class Ui_Dialog(object):
         self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.namespace_box)
         self.verticalLayout_6.setObjectName("verticalLayout_6")
         self.tabWidget.addTab(self.namespace_box, "")
-        self.plainTextEdit = CodeEditor(self.splitter)
+        self.editor = EditorWidget(parent=self.splitter)
-        self.plainTextEdit.setEnabled(True)
+        self.editor.setObjectName("editor")
-        self.plainTextEdit.setObjectName("plainTextEdit")
         self.verticalLayout.addWidget(self.splitter)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(Dialog)
         self.tabWidget.setCurrentIndex(0)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):
@@ -74,4 +71,4 @@ class Ui_Dialog(object):
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.args_box), _translate("Dialog", "Variables"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.kwargs_box), _translate("Dialog", "Multiple choice"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.namespace_box), _translate("Dialog", "Available Functions"))
-from ..lib.codeeditor import CodeEditor
+from ..editors.codeeditor import EditorWidget

src/gui_qt/_py/fitdialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/fitdialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/fitdialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_FitDialog(object):
@@ -18,10 +17,10 @@ class Ui_FitDialog(object):
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.scrollArea = QtWidgets.QScrollArea(FitDialog)
+        self.scrollArea = QtWidgets.QScrollArea(parent=FitDialog)
-        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.scrollArea.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
-        self.scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
         self.scrollArea.setWidgetResizable(True)
         self.scrollArea.setObjectName("scrollArea")
         self.scrollAreaWidgetContents_2 = QtWidgets.QWidget()
@@ -31,7 +30,7 @@ class Ui_FitDialog(object):
         self.gridLayout_2.setContentsMargins(0, 0, 0, -1)
         self.gridLayout_2.setSpacing(3)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.weight_combobox = QtWidgets.QComboBox(self.scrollAreaWidgetContents_2)
+        self.weight_combobox = QtWidgets.QComboBox(parent=self.scrollAreaWidgetContents_2)
         self.weight_combobox.setObjectName("weight_combobox")
         self.weight_combobox.addItem("")
         self.weight_combobox.addItem("")
@@ -39,24 +38,24 @@ class Ui_FitDialog(object):
         self.weight_combobox.addItem("")
         self.weight_combobox.addItem("")
         self.gridLayout_2.addWidget(self.weight_combobox, 6, 1, 1, 1)
-        self.newmodel_button = QtWidgets.QPushButton(self.scrollAreaWidgetContents_2)
+        self.newmodel_button = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents_2)
         self.newmodel_button.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.newmodel_button.sizePolicy().hasHeightForWidth())
         self.newmodel_button.setSizePolicy(sizePolicy)
         self.newmodel_button.setObjectName("newmodel_button")
         self.gridLayout_2.addWidget(self.newmodel_button, 2, 0, 1, 1)
-        self.deletemodel_button = QtWidgets.QPushButton(self.scrollAreaWidgetContents_2)
+        self.deletemodel_button = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents_2)
         self.deletemodel_button.setEnabled(False)
         self.deletemodel_button.setObjectName("deletemodel_button")
         self.gridLayout_2.addWidget(self.deletemodel_button, 2, 1, 1, 1)
-        self.label_3 = QtWidgets.QLabel(self.scrollAreaWidgetContents_2)
+        self.label_3 = QtWidgets.QLabel(parent=self.scrollAreaWidgetContents_2)
         self.label_3.setObjectName("label_3")
         self.gridLayout_2.addWidget(self.label_3, 6, 0, 1, 1)
-        self.stackedWidget = QtWidgets.QStackedWidget(self.scrollAreaWidgetContents_2)
+        self.stackedWidget = QtWidgets.QStackedWidget(parent=self.scrollAreaWidgetContents_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.stackedWidget.sizePolicy().hasHeightForWidth())
@@ -66,11 +65,11 @@ class Ui_FitDialog(object):
         self.page.setObjectName("page")
         self.stackedWidget.addWidget(self.page)
         self.gridLayout_2.addWidget(self.stackedWidget, 1, 0, 1, 2)
-        self.functionwidget = QFunctionWidget(self.scrollAreaWidgetContents_2)
+        self.functionwidget = QFunctionWidget(parent=self.scrollAreaWidgetContents_2)
         self.functionwidget.setObjectName("functionwidget")
         self.gridLayout_2.addWidget(self.functionwidget, 0, 0, 1, 2)
-        self.model_frame = QtWidgets.QFrame(self.scrollAreaWidgetContents_2)
+        self.model_frame = QtWidgets.QFrame(parent=self.scrollAreaWidgetContents_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.model_frame.sizePolicy().hasHeightForWidth())
@@ -81,19 +80,19 @@ class Ui_FitDialog(object):
         self.gridLayout.setHorizontalSpacing(0)
         self.gridLayout.setVerticalSpacing(1)
         self.gridLayout.setObjectName("gridLayout")
-        self.show_combobox = QtWidgets.QComboBox(self.model_frame)
+        self.show_combobox = QtWidgets.QComboBox(parent=self.model_frame)
         self.show_combobox.setObjectName("show_combobox")
         self.show_combobox.addItem("")
         self.gridLayout.addWidget(self.show_combobox, 1, 1, 1, 1)
-        self.default_combobox = QtWidgets.QComboBox(self.model_frame)
+        self.default_combobox = QtWidgets.QComboBox(parent=self.model_frame)
         self.default_combobox.setObjectName("default_combobox")
         self.default_combobox.addItem("")
         self.gridLayout.addWidget(self.default_combobox, 0, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.model_frame)
+        self.label_2 = QtWidgets.QLabel(parent=self.model_frame)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
-        self.label = QtWidgets.QLabel(self.model_frame)
+        self.label = QtWidgets.QLabel(parent=self.model_frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
@@ -101,7 +100,7 @@ class Ui_FitDialog(object):
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
         self.gridLayout_2.addWidget(self.model_frame, 3, 0, 1, 2)
-        self.data_widget = ExpandableWidget(self.scrollAreaWidgetContents_2)
+        self.data_widget = ExpandableWidget(parent=self.scrollAreaWidgetContents_2)
         self.data_widget.setMinimumSize(QtCore.QSize(0, 24))
         self.data_widget.setObjectName("data_widget")
         self.gridLayout_2.addWidget(self.data_widget, 5, 0, 1, 2)
@@ -111,20 +110,20 @@ class Ui_FitDialog(object):
         self.horizontalLayout.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.fit_button = QtWidgets.QPushButton(FitDialog)
+        self.fit_button = QtWidgets.QPushButton(parent=FitDialog)
         self.fit_button.setStyleSheet("font-weight: bold")
         self.fit_button.setObjectName("fit_button")
         self.horizontalLayout.addWidget(self.fit_button)
-        self.abort_button = QtWidgets.QPushButton(FitDialog)
+        self.abort_button = QtWidgets.QPushButton(parent=FitDialog)
         self.abort_button.setStyleSheet("font-weight: bold")
         self.abort_button.setObjectName("abort_button")
         self.horizontalLayout.addWidget(self.abort_button)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
-        self.preview_checkbox = QtWidgets.QCheckBox(FitDialog)
+        self.preview_checkbox = QtWidgets.QCheckBox(parent=FitDialog)
         self.preview_checkbox.setObjectName("preview_checkbox")
         self.horizontalLayout.addWidget(self.preview_checkbox)
-        self.preview_button = QtWidgets.QPushButton(FitDialog)
+        self.preview_button = QtWidgets.QPushButton(parent=FitDialog)
         self.preview_button.setCheckable(False)
         self.preview_button.setChecked(False)
         self.preview_button.setFlat(False)

src/gui_qt/_py/fitdialog_window.py

@@ -1,285 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/fitdialog_window.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_FitDialog(object):
-    def setupUi(self, FitDialog):
-        FitDialog.setObjectName("FitDialog")
-        FitDialog.setWindowModality(QtCore.Qt.ApplicationModal)
-        FitDialog.resize(828, 827)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/logo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        FitDialog.setWindowIcon(icon)
-        self.centralwidget = QtWidgets.QWidget(FitDialog)
-        self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.centralwidget)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.splitter = QtWidgets.QSplitter(self.centralwidget)
-        self.splitter.setOrientation(QtCore.Qt.Horizontal)
-        self.splitter.setObjectName("splitter")
-        self.widget_2 = QtWidgets.QWidget(self.splitter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.widget_2.sizePolicy().hasHeightForWidth())
-        self.widget_2.setSizePolicy(sizePolicy)
-        self.widget_2.setObjectName("widget_2")
-        self.gridLayout_3 = QtWidgets.QGridLayout(self.widget_2)
-        self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout_3.setSpacing(3)
-        self.gridLayout_3.setObjectName("gridLayout_3")
-        self.label_3 = QtWidgets.QLabel(self.widget_2)
-        self.label_3.setObjectName("label_3")
-        self.gridLayout_3.addWidget(self.label_3, 3, 0, 1, 1)
-        self.weight_combobox = QtWidgets.QComboBox(self.widget_2)
-        self.weight_combobox.setObjectName("weight_combobox")
-        self.weight_combobox.addItem("")
-        self.weight_combobox.addItem("")
-        self.weight_combobox.addItem("")
-        self.weight_combobox.addItem("")
-        self.weight_combobox.addItem("")
-        self.gridLayout_3.addWidget(self.weight_combobox, 3, 1, 1, 1)
-        self.line = QtWidgets.QFrame(self.widget_2)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.gridLayout_3.addWidget(self.line, 2, 0, 1, 2)
-        self.tableWidget = QtWidgets.QTableWidget(self.widget_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tableWidget.sizePolicy().hasHeightForWidth())
-        self.tableWidget.setSizePolicy(sizePolicy)
-        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
-        self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
-        self.tableWidget.setShowGrid(False)
-        self.tableWidget.setGridStyle(QtCore.Qt.NoPen)
-        self.tableWidget.setColumnCount(2)
-        self.tableWidget.setObjectName("tableWidget")
-        self.tableWidget.setRowCount(0)
-        self.tableWidget.horizontalHeader().setVisible(False)
-        self.tableWidget.horizontalHeader().setStretchLastSection(True)
-        self.tableWidget.verticalHeader().setVisible(False)
-        self.gridLayout_3.addWidget(self.tableWidget, 0, 0, 1, 2)
-        self.horizontalFrame = QtWidgets.QFrame(self.widget_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.horizontalFrame.sizePolicy().hasHeightForWidth())
-        self.horizontalFrame.setSizePolicy(sizePolicy)
-        self.horizontalFrame.setObjectName("horizontalFrame")
-        self.gridLayout = QtWidgets.QGridLayout(self.horizontalFrame)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setHorizontalSpacing(0)
-        self.gridLayout.setVerticalSpacing(1)
-        self.gridLayout.setObjectName("gridLayout")
-        self.show_combobox = QtWidgets.QComboBox(self.horizontalFrame)
-        self.show_combobox.setObjectName("show_combobox")
-        self.show_combobox.addItem("")
-        self.gridLayout.addWidget(self.show_combobox, 1, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.horizontalFrame)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
-        self.default_combobox = QtWidgets.QComboBox(self.horizontalFrame)
-        self.default_combobox.setObjectName("default_combobox")
-        self.default_combobox.addItem("")
-        self.gridLayout.addWidget(self.default_combobox, 0, 1, 1, 1)
-        self.label = QtWidgets.QLabel(self.horizontalFrame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.gridLayout_3.addWidget(self.horizontalFrame, 1, 0, 1, 2)
-        self.middle_widget = QtWidgets.QWidget(self.splitter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.middle_widget.sizePolicy().hasHeightForWidth())
-        self.middle_widget.setSizePolicy(sizePolicy)
-        self.middle_widget.setObjectName("middle_widget")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.middle_widget)
-        self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout_2.setSpacing(3)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.newmodel_button = QtWidgets.QPushButton(self.middle_widget)
-        self.newmodel_button.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.newmodel_button.sizePolicy().hasHeightForWidth())
-        self.newmodel_button.setSizePolicy(sizePolicy)
-        self.newmodel_button.setObjectName("newmodel_button")
-        self.gridLayout_2.addWidget(self.newmodel_button, 2, 0, 1, 1)
-        self.functionwidget = FunctionSelectionWidget(self.middle_widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.functionwidget.sizePolicy().hasHeightForWidth())
-        self.functionwidget.setSizePolicy(sizePolicy)
-        self.functionwidget.setObjectName("functionwidget")
-        self.gridLayout_2.addWidget(self.functionwidget, 0, 0, 1, 2)
-        self.deletemodel_button = QtWidgets.QPushButton(self.middle_widget)
-        self.deletemodel_button.setEnabled(False)
-        self.deletemodel_button.setObjectName("deletemodel_button")
-        self.gridLayout_2.addWidget(self.deletemodel_button, 2, 1, 1, 1)
-        self.stackedWidget = QtWidgets.QStackedWidget(self.middle_widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.stackedWidget.sizePolicy().hasHeightForWidth())
-        self.stackedWidget.setSizePolicy(sizePolicy)
-        self.stackedWidget.setObjectName("stackedWidget")
-        self.page = QtWidgets.QWidget()
-        self.page.setObjectName("page")
-        self.stackedWidget.addWidget(self.page)
-        self.page_2 = QtWidgets.QWidget()
-        self.page_2.setObjectName("page_2")
-        self.stackedWidget.addWidget(self.page_2)
-        self.gridLayout_2.addWidget(self.stackedWidget, 1, 0, 1, 2)
-        self.verticalLayout_2.addWidget(self.splitter)
-        self.frame_4 = QtWidgets.QFrame(self.centralwidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.frame_4.sizePolicy().hasHeightForWidth())
-        self.frame_4.setSizePolicy(sizePolicy)
-        self.frame_4.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        self.frame_4.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.frame_4.setLineWidth(2)
-        self.frame_4.setMidLineWidth(0)
-        self.frame_4.setObjectName("frame_4")
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.frame_4)
-        self.horizontalLayout_2.setContentsMargins(3, 3, 3, 3)
-        self.horizontalLayout_2.setSpacing(3)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem)
-        self.fit_button = QtWidgets.QPushButton(self.frame_4)
-        self.fit_button.setObjectName("fit_button")
-        self.horizontalLayout_2.addWidget(self.fit_button)
-        self.abort_button = QtWidgets.QPushButton(self.frame_4)
-        self.abort_button.setObjectName("abort_button")
-        self.horizontalLayout_2.addWidget(self.abort_button)
-        self.preview_button = QtWidgets.QPushButton(self.frame_4)
-        icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(":/fit_preview.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.preview_button.setIcon(icon1)
-        self.preview_button.setCheckable(True)
-        self.preview_button.setObjectName("preview_button")
-        self.horizontalLayout_2.addWidget(self.preview_button)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem1)
-        self.verticalLayout_2.addWidget(self.frame_4)
-        FitDialog.setCentralWidget(self.centralwidget)
-        self.menubar = QtWidgets.QMenuBar(FitDialog)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 828, 30))
-        self.menubar.setObjectName("menubar")
-        self.menuOptions = QtWidgets.QMenu(self.menubar)
-        self.menuOptions.setObjectName("menuOptions")
-        self.menuMethod = QtWidgets.QMenu(self.menuOptions)
-        self.menuMethod.setObjectName("menuMethod")
-        self.menuLimits = QtWidgets.QMenu(self.menuOptions)
-        self.menuLimits.setObjectName("menuLimits")
-        self.menuHelp = QtWidgets.QMenu(self.menubar)
-        self.menuHelp.setObjectName("menuHelp")
-        self.menuUser = QtWidgets.QMenu(self.menubar)
-        self.menuUser.setObjectName("menuUser")
-        FitDialog.setMenuBar(self.menubar)
-        self.statusBar = QtWidgets.QStatusBar(FitDialog)
-        self.statusBar.setObjectName("statusBar")
-        FitDialog.setStatusBar(self.statusBar)
-        self.action_nm = QtWidgets.QAction(FitDialog)
-        self.action_nm.setCheckable(True)
-        self.action_nm.setObjectName("action_nm")
-        self.action_odr = QtWidgets.QAction(FitDialog)
-        self.action_odr.setCheckable(True)
-        self.action_odr.setObjectName("action_odr")
-        self.action_lm = QtWidgets.QAction(FitDialog)
-        self.action_lm.setCheckable(True)
-        self.action_lm.setChecked(True)
-        self.action_lm.setObjectName("action_lm")
-        self.actionHelp = QtWidgets.QAction(FitDialog)
-        self.actionHelp.setObjectName("actionHelp")
-        self.actionOpen_editor = QtWidgets.QAction(FitDialog)
-        self.actionOpen_editor.setObjectName("actionOpen_editor")
-        self.actionPreview_points = QtWidgets.QAction(FitDialog)
-        self.actionPreview_points.setObjectName("actionPreview_points")
-        self.actionSave_current_model = QtWidgets.QAction(FitDialog)
-        self.actionSave_current_model.setObjectName("actionSave_current_model")
-        self.action_no_range = QtWidgets.QAction(FitDialog)
-        self.action_no_range.setCheckable(True)
-        self.action_no_range.setObjectName("action_no_range")
-        self.action_x_range = QtWidgets.QAction(FitDialog)
-        self.action_x_range.setCheckable(True)
-        self.action_x_range.setChecked(True)
-        self.action_x_range.setObjectName("action_x_range")
-        self.action_custom_range = QtWidgets.QAction(FitDialog)
-        self.action_custom_range.setCheckable(True)
-        self.action_custom_range.setObjectName("action_custom_range")
-        self.menuMethod.addAction(self.action_lm)
-        self.menuMethod.addAction(self.action_nm)
-        self.menuMethod.addAction(self.action_odr)
-        self.menuLimits.addAction(self.action_no_range)
-        self.menuLimits.addAction(self.action_x_range)
-        self.menuLimits.addAction(self.action_custom_range)
-        self.menuOptions.addAction(self.menuMethod.menuAction())
-        self.menuOptions.addAction(self.menuLimits.menuAction())
-        self.menuOptions.addSeparator()
-        self.menuOptions.addAction(self.actionPreview_points)
-        self.menuHelp.addAction(self.actionHelp)
-        self.menuUser.addAction(self.actionOpen_editor)
-        self.menuUser.addAction(self.actionSave_current_model)
-        self.menubar.addAction(self.menuOptions.menuAction())
-        self.menubar.addAction(self.menuUser.menuAction())
-        self.menubar.addAction(self.menuHelp.menuAction())
-
-        self.retranslateUi(FitDialog)
-        QtCore.QMetaObject.connectSlotsByName(FitDialog)
-
-    def retranslateUi(self, FitDialog):
-        _translate = QtCore.QCoreApplication.translate
-        FitDialog.setWindowTitle(_translate("FitDialog", "One must imagine Sisyphus happy."))
-        self.label_3.setText(_translate("FitDialog", "Weight"))
-        self.weight_combobox.setItemText(0, _translate("FitDialog", "None"))
-        self.weight_combobox.setItemText(1, _translate("FitDialog", "y"))
-        self.weight_combobox.setItemText(2, _translate("FitDialog", "y²"))
-        self.weight_combobox.setItemText(3, _translate("FitDialog", "Δy"))
-        self.weight_combobox.setItemText(4, _translate("FitDialog", "log(y)"))
-        self.show_combobox.setItemText(0, _translate("FitDialog", "Model a"))
-        self.label_2.setText(_translate("FitDialog", "Show model"))
-        self.default_combobox.setItemText(0, _translate("FitDialog", "Model a"))
-        self.label.setText(_translate("FitDialog", "Default"))
-        self.newmodel_button.setText(_translate("FitDialog", "New model"))
-        self.deletemodel_button.setText(_translate("FitDialog", "Delete model"))
-        self.fit_button.setText(_translate("FitDialog", "Run fit!!!"))
-        self.abort_button.setText(_translate("FitDialog", "Abort"))
-        self.preview_button.setText(_translate("FitDialog", "Preview"))
-        self.menuOptions.setTitle(_translate("FitDialog", "Options"))
-        self.menuMethod.setTitle(_translate("FitDialog", "Method"))
-        self.menuLimits.setTitle(_translate("FitDialog", "Limits"))
-        self.menuHelp.setTitle(_translate("FitDialog", "Help"))
-        self.menuUser.setTitle(_translate("FitDialog", "User"))
-        self.action_nm.setText(_translate("FitDialog", "Nelder-Mead"))
-        self.action_odr.setText(_translate("FitDialog", "ODR"))
-        self.action_lm.setText(_translate("FitDialog", "Default stuff"))
-        self.actionHelp.setText(_translate("FitDialog", "Help!"))
-        self.actionOpen_editor.setText(_translate("FitDialog", "Open editor..."))
-        self.actionPreview_points.setText(_translate("FitDialog", "Preview points..."))
-        self.actionSave_current_model.setText(_translate("FitDialog", "Save current model..."))
-        self.action_no_range.setText(_translate("FitDialog", "None"))
-        self.action_x_range.setText(_translate("FitDialog", "Visible x range"))
-        self.action_custom_range.setText(_translate("FitDialog", "Custom..."))
-from ..fit.function_selection import FunctionSelectionWidget
-import images_rc

src/gui_qt/_py/fitfunctionwidget.py

@@ -1,20 +1,19 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/fitfunctionwidget.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/fitfunctionwidget.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
         Form.resize(382, 375)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
@@ -23,30 +22,30 @@ class Ui_Form(object):
         self.gridLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        self.typecomboBox = QtWidgets.QComboBox(Form)
+        self.typecomboBox = QtWidgets.QComboBox(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.typecomboBox.sizePolicy().hasHeightForWidth())
         self.typecomboBox.setSizePolicy(sizePolicy)
         self.typecomboBox.setObjectName("typecomboBox")
         self.gridLayout.addWidget(self.typecomboBox, 0, 0, 1, 2)
-        self.complex_widget = QtWidgets.QWidget(Form)
+        self.complex_widget = QtWidgets.QWidget(parent=Form)
         self.complex_widget.setObjectName("complex_widget")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.complex_widget)
         self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.label_2 = QtWidgets.QLabel(self.complex_widget)
+        self.label_2 = QtWidgets.QLabel(parent=self.complex_widget)
         self.label_2.setObjectName("label_2")
         self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
-        self.complex_comboBox = QtWidgets.QComboBox(self.complex_widget)
+        self.complex_comboBox = QtWidgets.QComboBox(parent=self.complex_widget)
         self.complex_comboBox.setObjectName("complex_comboBox")
         self.complex_comboBox.addItem("")
         self.complex_comboBox.addItem("")
         self.complex_comboBox.addItem("")
         self.gridLayout_2.addWidget(self.complex_comboBox, 1, 1, 1, 1)
-        self.label = QtWidgets.QLabel(self.complex_widget)
+        self.label = QtWidgets.QLabel(parent=self.complex_widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
@@ -54,27 +53,27 @@ class Ui_Form(object):
         self.label.setObjectName("label")
         self.gridLayout_2.addWidget(self.label, 0, 0, 1, 2)
         self.gridLayout.addWidget(self.complex_widget, 6, 0, 1, 2)
-        self.fitcomboBox = QtWidgets.QComboBox(Form)
+        self.fitcomboBox = QtWidgets.QComboBox(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.fitcomboBox.sizePolicy().hasHeightForWidth())
         self.fitcomboBox.setSizePolicy(sizePolicy)
         self.fitcomboBox.setObjectName("fitcomboBox")
         self.gridLayout.addWidget(self.fitcomboBox, 1, 0, 1, 2)
-        self.use_function_button = QtWidgets.QToolButton(Form)
+        self.use_function_button = QtWidgets.QToolButton(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.use_function_button.sizePolicy().hasHeightForWidth())
         self.use_function_button.setSizePolicy(sizePolicy)
-        self.use_function_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.use_function_button.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         self.use_function_button.setAutoRaise(False)
-        self.use_function_button.setArrowType(QtCore.Qt.RightArrow)
+        self.use_function_button.setArrowType(QtCore.Qt.ArrowType.RightArrow)
         self.use_function_button.setObjectName("use_function_button")
         self.gridLayout.addWidget(self.use_function_button, 3, 1, 1, 1)
-        self.operator_combobox = QtWidgets.QComboBox(Form)
+        self.operator_combobox = QtWidgets.QComboBox(parent=Form)
-        self.operator_combobox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+        self.operator_combobox.setSizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents)
         self.operator_combobox.setFrame(True)
         self.operator_combobox.setObjectName("operator_combobox")
         self.operator_combobox.addItem("")
@@ -82,12 +81,12 @@ class Ui_Form(object):
         self.operator_combobox.addItem("")
         self.operator_combobox.addItem("")
         self.gridLayout.addWidget(self.operator_combobox, 3, 0, 1, 1)
-        self.functree = FitModelTree(Form)
+        self.functree = FitModelTree(parent=Form)
         self.functree.setObjectName("functree")
         self.functree.headerItem().setText(0, "1")
         self.gridLayout.addWidget(self.functree, 5, 0, 1, 2)
-        self.fitequation = QtWidgets.QLabel(Form)
+        self.fitequation = QtWidgets.QLabel(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.fitequation.sizePolicy().hasHeightForWidth())

src/gui_qt/_py/fitfuncwidget.py

@@ -1,21 +1,19 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/fitfuncwidget.ui'
-
-# Form implementation generated from reading ui file 'src/resources/_ui/fitfuncwidget.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.7
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_FormFit(object):
     def setupUi(self, FormFit):
         FormFit.setObjectName("FormFit")
         FormFit.resize(308, 477)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(FormFit.sizePolicy().hasHeightForWidth())
@@ -24,7 +22,7 @@ class Ui_FormFit(object):
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidget = QtWidgets.QTabWidget(FormFit)
+        self.tabWidget = QtWidgets.QTabWidget(parent=FormFit)
         self.tabWidget.setObjectName("tabWidget")
         self.general_tab = QtWidgets.QWidget()
         self.general_tab.setObjectName("general_tab")
@@ -32,10 +30,10 @@ class Ui_FormFit(object):
         self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_2.setSpacing(0)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.scrollArea = QtWidgets.QScrollArea(self.general_tab)
+        self.scrollArea = QtWidgets.QScrollArea(parent=self.general_tab)
-        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.scrollArea.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
-        self.scrollArea.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
+        self.scrollArea.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents)
         self.scrollArea.setWidgetResizable(True)
         self.scrollArea.setObjectName("scrollArea")
         self.scrollwidget = QtWidgets.QWidget()
@@ -48,8 +46,8 @@ class Ui_FormFit(object):
         self.data_tab.setObjectName("data_tab")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.data_tab)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.comboBox = QtWidgets.QComboBox(self.data_tab)
+        self.comboBox = QtWidgets.QComboBox(parent=self.data_tab)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.comboBox.sizePolicy().hasHeightForWidth())
@@ -57,10 +55,10 @@ class Ui_FormFit(object):
         self.comboBox.setMaximumSize(QtCore.QSize(288, 16777215))
         self.comboBox.setObjectName("comboBox")
         self.verticalLayout_3.addWidget(self.comboBox)
-        self.scrollArea2 = QtWidgets.QScrollArea(self.data_tab)
+        self.scrollArea2 = QtWidgets.QScrollArea(parent=self.data_tab)
-        self.scrollArea2.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.scrollArea2.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.scrollArea2.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.scrollArea2.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
-        self.scrollArea2.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
+        self.scrollArea2.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents)
         self.scrollArea2.setWidgetResizable(True)
         self.scrollArea2.setObjectName("scrollArea2")
         self.scrollwidget2 = QtWidgets.QWidget()

src/gui_qt/_py/fitfuncwidget_old.py

@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/fitfuncwidget_old.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_FormFit(object):
-    def setupUi(self, FormFit):
-        FormFit.setObjectName("FormFit")
-        FormFit.resize(402, 523)
-        self.verticalLayout = QtWidgets.QVBoxLayout(FormFit)
-        self.verticalLayout.setContentsMargins(0, 6, 0, 0)
-        self.verticalLayout.setSpacing(6)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidget = QtWidgets.QTabWidget(FormFit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tabWidget.sizePolicy().hasHeightForWidth())
-        self.tabWidget.setSizePolicy(sizePolicy)
-        self.tabWidget.setObjectName("tabWidget")
-        self.general_tab = QtWidgets.QWidget()
-        self.general_tab.setObjectName("general_tab")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.general_tab)
-        self.verticalLayout_3.setContentsMargins(2, 2, 2, 2)
-        self.verticalLayout_3.setSpacing(2)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.scrollArea = QtWidgets.QScrollArea(self.general_tab)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.scrollArea.sizePolicy().hasHeightForWidth())
-        self.scrollArea.setSizePolicy(sizePolicy)
-        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
-        self.scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.scrollArea.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
-        self.scrollArea.setWidgetResizable(False)
-        self.scrollArea.setObjectName("scrollArea")
-        self.scrollwidget = QtWidgets.QWidget()
-        self.scrollwidget.setGeometry(QtCore.QRect(0, 0, 390, 478))
-        self.scrollwidget.setObjectName("scrollwidget")
-        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.scrollwidget)
-        self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.scrollArea.setWidget(self.scrollwidget)
-        self.verticalLayout_3.addWidget(self.scrollArea)
-        self.tabWidget.addTab(self.general_tab, "")
-        self.data_tab = QtWidgets.QWidget()
-        self.data_tab.setObjectName("data_tab")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.data_tab)
-        self.verticalLayout_2.setContentsMargins(2, 2, 2, 2)
-        self.verticalLayout_2.setSpacing(2)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.comboBox = QtWidgets.QComboBox(self.data_tab)
-        self.comboBox.setObjectName("comboBox")
-        self.verticalLayout_2.addWidget(self.comboBox)
-        self.scrollArea2 = QtWidgets.QScrollArea(self.data_tab)
-        self.scrollArea2.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.scrollArea2.setWidgetResizable(True)
-        self.scrollArea2.setObjectName("scrollArea2")
-        self.scrollwidget2 = QtWidgets.QWidget()
-        self.scrollwidget2.setGeometry(QtCore.QRect(0, 0, 390, 444))
-        self.scrollwidget2.setObjectName("scrollwidget2")
-        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.scrollwidget2)
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.scrollArea2.setWidget(self.scrollwidget2)
-        self.verticalLayout_2.addWidget(self.scrollArea2)
-        self.tabWidget.addTab(self.data_tab, "")
-        self.verticalLayout.addWidget(self.tabWidget)
-
-        self.retranslateUi(FormFit)
-        self.tabWidget.setCurrentIndex(0)
-        QtCore.QMetaObject.connectSlotsByName(FormFit)
-
-    def retranslateUi(self, FormFit):
-        _translate = QtCore.QCoreApplication.translate
-        FormFit.setWindowTitle(_translate("FormFit", "Form"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.general_tab), _translate("FormFit", "General settings"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.data_tab), _translate("FormFit", "Data parameter"))

src/gui_qt/_py/fitmodelfixwidget.py

@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/fitmodelfixwidget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_FitFixParameter(object):
-    def setupUi(self, FitFixParameter):
-        FitFixParameter.setObjectName("FitFixParameter")
-        FitFixParameter.setWindowModality(QtCore.Qt.WindowModal)
-        FitFixParameter.resize(480, 267)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(FitFixParameter.sizePolicy().hasHeightForWidth())
-        FitFixParameter.setSizePolicy(sizePolicy)
-        FitFixParameter.setAutoFillBackground(True)
-        self.gridLayout = QtWidgets.QGridLayout(FitFixParameter)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setSpacing(0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.frame = QtWidgets.QFrame(FitFixParameter)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.frame.setObjectName("frame")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame)
-        self.horizontalLayout.setContentsMargins(0, 0, 3, 0)
-        self.horizontalLayout.setSpacing(3)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.parametername = QtWidgets.QLabel(self.frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(10)
-        sizePolicy.setHeightForWidth(self.parametername.sizePolicy().hasHeightForWidth())
-        self.parametername.setSizePolicy(sizePolicy)
-        self.parametername.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.parametername.setIndent(6)
-        self.parametername.setObjectName("parametername")
-        self.horizontalLayout.addWidget(self.parametername)
-        self.label = QtWidgets.QLabel(self.frame)
-        self.label.setObjectName("label")
-        self.horizontalLayout.addWidget(self.label)
-        self.gridLayout.addWidget(self.frame, 1, 0, 1, 1)
-        self.parameter_line = QtWidgets.QLineEdit(FitFixParameter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.parameter_line.sizePolicy().hasHeightForWidth())
-        self.parameter_line.setSizePolicy(sizePolicy)
-        self.parameter_line.setObjectName("parameter_line")
-        self.gridLayout.addWidget(self.parameter_line, 1, 1, 1, 1)
-
-        self.retranslateUi(FitFixParameter)
-        QtCore.QMetaObject.connectSlotsByName(FitFixParameter)
-
-    def retranslateUi(self, FitFixParameter):
-        _translate = QtCore.QCoreApplication.translate
-        FitFixParameter.setWindowTitle(_translate("FitFixParameter", "Form"))
-        self.parametername.setText(_translate("FitFixParameter", "Parameter"))
-        self.label.setText(_translate("FitFixParameter", "Unit"))
-        self.parameter_line.setText(_translate("FitFixParameter", "1"))

src/gui_qt/_py/fitmodelwidget.py

@@ -1,20 +1,19 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/fitmodelwidget.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/fitmodelwidget.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_FitParameter(object):
     def setupUi(self, FitParameter):
         FitParameter.setObjectName("FitParameter")
-        FitParameter.resize(365, 78)
+        FitParameter.resize(365, 66)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(FitParameter.sizePolicy().hasHeightForWidth())
@@ -26,8 +25,8 @@ class Ui_FitParameter(object):
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setSpacing(3)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.parametername = QtWidgets.QLabel(FitParameter)
+        self.parametername = QtWidgets.QLabel(parent=FitParameter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.parametername.sizePolicy().hasHeightForWidth())
@@ -35,86 +34,84 @@ class Ui_FitParameter(object):
         self.parametername.setMinimumSize(QtCore.QSize(28, 0))
         self.parametername.setObjectName("parametername")
         self.horizontalLayout_2.addWidget(self.parametername)
-        self.parameter_line = LineEdit(FitParameter)
+        self.parameter_line = LineEdit(parent=FitParameter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.parameter_line.sizePolicy().hasHeightForWidth())
         self.parameter_line.setSizePolicy(sizePolicy)
+        self.parameter_line.setMaximumSize(QtCore.QSize(160, 16777215))
         self.parameter_line.setText("")
         self.parameter_line.setObjectName("parameter_line")
         self.horizontalLayout_2.addWidget(self.parameter_line)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.fixed_check = QtWidgets.QCheckBox(parent=FitParameter)
-        self.horizontalLayout_2.addItem(spacerItem)
-        self.fixed_check = QtWidgets.QCheckBox(FitParameter)
         self.fixed_check.setObjectName("fixed_check")
         self.horizontalLayout_2.addWidget(self.fixed_check)
-        self.global_checkbox = QtWidgets.QCheckBox(FitParameter)
+        self.global_checkbox = QtWidgets.QCheckBox(parent=FitParameter)
         self.global_checkbox.setObjectName("global_checkbox")
         self.horizontalLayout_2.addWidget(self.global_checkbox)
-        self.toolButton = QtWidgets.QToolButton(FitParameter)
+        self.reset_button = QtWidgets.QPushButton(parent=FitParameter)
-        self.toolButton.setText("")
+        self.reset_button.setObjectName("reset_button")
-        self.toolButton.setPopupMode(QtWidgets.QToolButton.InstantPopup)
+        self.horizontalLayout_2.addWidget(self.reset_button)
-        self.toolButton.setArrowType(QtCore.Qt.RightArrow)
-        self.toolButton.setObjectName("toolButton")
-        self.horizontalLayout_2.addWidget(self.toolButton)
         self.verticalLayout.addLayout(self.horizontalLayout_2)
-        self.frame = QtWidgets.QFrame(FitParameter)
+        self.frame = QtWidgets.QFrame(parent=FitParameter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth())
         self.frame.setSizePolicy(sizePolicy)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
         self.frame.setObjectName("frame")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.checkBox = QtWidgets.QCheckBox(self.frame)
+        self.checkBox = QtWidgets.QCheckBox(parent=self.frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.checkBox.sizePolicy().hasHeightForWidth())
         self.checkBox.setSizePolicy(sizePolicy)
-        self.checkBox.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.checkBox.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft)
         self.checkBox.setText("")
         self.checkBox.setObjectName("checkBox")
         self.horizontalLayout.addWidget(self.checkBox)
-        self.lineEdit = QtWidgets.QLineEdit(self.frame)
+        self.lineEdit = QtWidgets.QLineEdit(parent=self.frame)
         self.lineEdit.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.lineEdit.sizePolicy().hasHeightForWidth())
         self.lineEdit.setSizePolicy(sizePolicy)
+        self.lineEdit.setMaximumSize(QtCore.QSize(100, 16777215))
         self.lineEdit.setText("")
         self.lineEdit.setFrame(True)
-        self.lineEdit.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.lineEdit.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.lineEdit.setObjectName("lineEdit")
         self.horizontalLayout.addWidget(self.lineEdit)
-        self.label_3 = QtWidgets.QLabel(self.frame)
+        self.label_3 = QtWidgets.QLabel(parent=self.frame)
         self.label_3.setEnabled(True)
-        self.label_3.setTextFormat(QtCore.Qt.RichText)
+        self.label_3.setTextFormat(QtCore.Qt.TextFormat.RichText)
-        self.label_3.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.label_3.setObjectName("label_3")
         self.horizontalLayout.addWidget(self.label_3)
-        self.lineEdit_2 = QtWidgets.QLineEdit(self.frame)
+        self.lineEdit_2 = QtWidgets.QLineEdit(parent=self.frame)
         self.lineEdit_2.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.lineEdit_2.sizePolicy().hasHeightForWidth())
         self.lineEdit_2.setSizePolicy(sizePolicy)
+        self.lineEdit_2.setMaximumSize(QtCore.QSize(100, 16777215))
         self.lineEdit_2.setText("")
         self.lineEdit_2.setFrame(True)
         self.lineEdit_2.setObjectName("lineEdit_2")
         self.horizontalLayout.addWidget(self.lineEdit_2)
         self.verticalLayout.addWidget(self.frame)
-        self.line = QtWidgets.QFrame(FitParameter)
+        self.line = QtWidgets.QFrame(parent=FitParameter)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.verticalLayout.addWidget(self.line)
 
@@ -129,6 +126,7 @@ class Ui_FitParameter(object):
         self.parameter_line.setPlaceholderText(_translate("FitParameter", "0"))
         self.fixed_check.setText(_translate("FitParameter", "Fix"))
         self.global_checkbox.setText(_translate("FitParameter", "Global"))
+        self.reset_button.setText(_translate("FitParameter", "Use global"))
         self.lineEdit.setToolTip(_translate("FitParameter", "<html><head/><body><p>Lower bound. Same bound is used for all data. Leave empty for no boundary condition.</p></body></html>"))
         self.label_3.setText(_translate("FitParameter", "Textlabel"))
         self.lineEdit_2.setToolTip(_translate("FitParameter", "<html><head/><body><p>Upper bound. Same bound is used for all data. Leave empty for no boundary condition.</p></body></html>"))

src/gui_qt/_py/fitparametertable.py

@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/fitparametertable.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_FitParameterDialog(object):
-    def setupUi(self, FitParameterDialog):
-        FitParameterDialog.setObjectName("FitParameterDialog")
-        FitParameterDialog.resize(898, 583)
-        self.verticalLayout = QtWidgets.QVBoxLayout(FitParameterDialog)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.verticalLayout.addLayout(self.verticalLayout_2)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
-        self.pushButton = QtWidgets.QPushButton(FitParameterDialog)
-        self.pushButton.setObjectName("pushButton")
-        self.horizontalLayout.addWidget(self.pushButton)
-        self.buttonBox = QtWidgets.QDialogButtonBox(FitParameterDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.buttonBox.sizePolicy().hasHeightForWidth())
-        self.buttonBox.setSizePolicy(sizePolicy)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close)
-        self.buttonBox.setCenterButtons(False)
-        self.buttonBox.setObjectName("buttonBox")
-        self.horizontalLayout.addWidget(self.buttonBox)
-        self.verticalLayout.addLayout(self.horizontalLayout)
-
-        self.retranslateUi(FitParameterDialog)
-        self.buttonBox.accepted.connect(FitParameterDialog.accept)
-        self.buttonBox.rejected.connect(FitParameterDialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(FitParameterDialog)
-
-    def retranslateUi(self, FitParameterDialog):
-        _translate = QtCore.QCoreApplication.translate
-        FitParameterDialog.setWindowTitle(_translate("FitParameterDialog", "Fitparameter"))
-        self.pushButton.setText(_translate("FitParameterDialog", "Copy"))

src/gui_qt/_py/fitparameterwidget.py

@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/fitparameterwidget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_FormFit(object):
-    def setupUi(self, FormFit):
-        FormFit.setObjectName("FormFit")
-        FormFit.resize(292, 477)
-        self.verticalLayout = QtWidgets.QVBoxLayout(FormFit)
-        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout.setSpacing(3)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidget = QtWidgets.QTabWidget(FormFit)
-        self.tabWidget.setObjectName("tabWidget")
-        self.general_tab = QtWidgets.QWidget()
-        self.general_tab.setObjectName("general_tab")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.general_tab)
-        self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_2.setSpacing(0)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.scrollArea = QtWidgets.QScrollArea(self.general_tab)
-        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.scrollArea.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
-        self.scrollArea.setWidgetResizable(True)
-        self.scrollArea.setObjectName("scrollArea")
-        self.scrollwidget = QtWidgets.QWidget()
-        self.scrollwidget.setGeometry(QtCore.QRect(0, 0, 284, 442))
-        self.scrollwidget.setObjectName("scrollwidget")
-        self.scrollArea.setWidget(self.scrollwidget)
-        self.verticalLayout_2.addWidget(self.scrollArea)
-        self.tabWidget.addTab(self.general_tab, "")
-        self.data_tab = QtWidgets.QWidget()
-        self.data_tab.setObjectName("data_tab")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.data_tab)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.comboBox = QtWidgets.QComboBox(self.data_tab)
-        self.comboBox.setObjectName("comboBox")
-        self.verticalLayout_3.addWidget(self.comboBox)
-        self.scrollArea2 = QtWidgets.QScrollArea(self.data_tab)
-        self.scrollArea2.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.scrollArea2.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.scrollArea2.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
-        self.scrollArea2.setWidgetResizable(True)
-        self.scrollArea2.setObjectName("scrollArea2")
-        self.scrollwidget2 = QtWidgets.QWidget()
-        self.scrollwidget2.setGeometry(QtCore.QRect(0, 0, 272, 392))
-        self.scrollwidget2.setObjectName("scrollwidget2")
-        self.scrollArea2.setWidget(self.scrollwidget2)
-        self.verticalLayout_3.addWidget(self.scrollArea2)
-        self.tabWidget.addTab(self.data_tab, "")
-        self.verticalLayout.addWidget(self.tabWidget)
-
-        self.retranslateUi(FormFit)
-        self.tabWidget.setCurrentIndex(0)
-        QtCore.QMetaObject.connectSlotsByName(FormFit)
-
-    def retranslateUi(self, FormFit):
-        _translate = QtCore.QCoreApplication.translate
-        FormFit.setWindowTitle(_translate("FormFit", "Form"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.general_tab), _translate("FormFit", "General settings"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.data_tab), _translate("FormFit", "Data parameter"))

src/gui_qt/_py/fitresult.py

@@ -1,135 +1,22 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/fitresult.ui'
-
-# Form implementation generated from reading ui file '/autohome/dominik/nmreval-gitea/src/resources/_ui/fitresult.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.7
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(864, 649)
+        Dialog.resize(969, 974)
         self.gridLayout = QtWidgets.QGridLayout(Dialog)
         self.gridLayout.setObjectName("gridLayout")
-        self.sets_comboBox = ElideComboBox(Dialog)
+        self.stack = QtWidgets.QTabWidget(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.sets_comboBox.sizePolicy().hasHeightForWidth())
-        self.sets_comboBox.setSizePolicy(sizePolicy)
-        self.sets_comboBox.setMaximumSize(QtCore.QSize(400, 16777215))
-        self.sets_comboBox.setBaseSize(QtCore.QSize(200, 0))
-        self.sets_comboBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
-        self.sets_comboBox.setObjectName("sets_comboBox")
-        self.gridLayout.addWidget(self.sets_comboBox, 0, 0, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok|QtWidgets.QDialogButtonBox.Retry)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 6, 0, 1, 2)
-        self.param_tableWidget = QtWidgets.QTableWidget(Dialog)
-        self.param_tableWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
-        self.param_tableWidget.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustIgnored)
-        self.param_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.param_tableWidget.setAlternatingRowColors(True)
-        self.param_tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
-        self.param_tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectColumns)
-        self.param_tableWidget.setShowGrid(False)
-        self.param_tableWidget.setColumnCount(0)
-        self.param_tableWidget.setObjectName("param_tableWidget")
-        self.param_tableWidget.setRowCount(0)
-        self.param_tableWidget.horizontalHeader().setStretchLastSection(False)
-        self.gridLayout.addWidget(self.param_tableWidget, 1, 0, 1, 1)
-        self.groupBox = QtWidgets.QGroupBox(Dialog)
-        self.groupBox.setObjectName("groupBox")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox)
-        self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout_2.setSpacing(3)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.extrapolate_box = QtWidgets.QCheckBox(self.groupBox)
-        self.extrapolate_box.setObjectName("extrapolate_box")
-        self.gridLayout_2.addWidget(self.extrapolate_box, 1, 0, 1, 1)
-        self.parameter_checkbox = QtWidgets.QCheckBox(self.groupBox)
-        self.parameter_checkbox.setObjectName("parameter_checkbox")
-        self.gridLayout_2.addWidget(self.parameter_checkbox, 0, 5, 1, 1)
-        self.graph_comboBox = QtWidgets.QComboBox(self.groupBox)
-        self.graph_comboBox.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.graph_comboBox.sizePolicy().hasHeightForWidth())
-        self.graph_comboBox.setSizePolicy(sizePolicy)
-        self.graph_comboBox.setObjectName("graph_comboBox")
-        self.gridLayout_2.addWidget(self.graph_comboBox, 1, 6, 1, 1)
-        self.graph_checkBox = QtWidgets.QCheckBox(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.graph_checkBox.sizePolicy().hasHeightForWidth())
-        self.graph_checkBox.setSizePolicy(sizePolicy)
-        self.graph_checkBox.setChecked(True)
-        self.graph_checkBox.setObjectName("graph_checkBox")
-        self.gridLayout_2.addWidget(self.graph_checkBox, 1, 5, 1, 1)
-        self.minx_line = QtWidgets.QLineEdit(self.groupBox)
-        self.minx_line.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.minx_line.sizePolicy().hasHeightForWidth())
-        self.minx_line.setSizePolicy(sizePolicy)
-        self.minx_line.setObjectName("minx_line")
-        self.gridLayout_2.addWidget(self.minx_line, 1, 1, 1, 1)
-        self.line_2 = QtWidgets.QFrame(self.groupBox)
-        self.line_2.setFrameShape(QtWidgets.QFrame.VLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line_2.setObjectName("line_2")
-        self.gridLayout_2.addWidget(self.line_2, 0, 4, 2, 1)
-        self.maxx_line = QtWidgets.QLineEdit(self.groupBox)
-        self.maxx_line.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.maxx_line.sizePolicy().hasHeightForWidth())
-        self.maxx_line.setSizePolicy(sizePolicy)
-        self.maxx_line.setObjectName("maxx_line")
-        self.gridLayout_2.addWidget(self.maxx_line, 1, 2, 1, 1)
-        self.numx_line = QtWidgets.QLineEdit(self.groupBox)
-        self.numx_line.setEnabled(False)
-        self.numx_line.setObjectName("numx_line")
-        self.gridLayout_2.addWidget(self.numx_line, 1, 3, 1, 1)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.curve_checkbox = QtWidgets.QCheckBox(self.groupBox)
-        self.curve_checkbox.setChecked(True)
-        self.curve_checkbox.setObjectName("curve_checkbox")
-        self.horizontalLayout.addWidget(self.curve_checkbox)
-        self.partial_checkBox = QtWidgets.QCheckBox(self.groupBox)
-        self.partial_checkBox.setObjectName("partial_checkBox")
-        self.horizontalLayout.addWidget(self.partial_checkBox)
-        self.gridLayout_2.addLayout(self.horizontalLayout, 0, 0, 1, 4)
-        self.gridLayout.addWidget(self.groupBox, 5, 0, 1, 2)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setSpacing(3)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.reject_fit_checkBox = QtWidgets.QCheckBox(Dialog)
-        self.reject_fit_checkBox.setObjectName("reject_fit_checkBox")
-        self.horizontalLayout_2.addWidget(self.reject_fit_checkBox)
-        self.del_prev_checkBox = QtWidgets.QCheckBox(Dialog)
-        self.del_prev_checkBox.setObjectName("del_prev_checkBox")
-        self.horizontalLayout_2.addWidget(self.del_prev_checkBox)
-        self.gridLayout.addLayout(self.horizontalLayout_2, 2, 0, 1, 1)
-        self.line = QtWidgets.QFrame(Dialog)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.gridLayout.addWidget(self.line, 3, 0, 1, 2)
-        self.stack = QtWidgets.QTabWidget(Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.stack.sizePolicy().hasHeightForWidth())
@@ -138,20 +25,48 @@ class Ui_Dialog(object):
         self.stackPage1 = QtWidgets.QWidget()
         self.stackPage1.setObjectName("stackPage1")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.stackPage1)
-        self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout_3.setContentsMargins(6, 3, 6, 3)
         self.gridLayout_3.setSpacing(3)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.logy_box = QtWidgets.QCheckBox(self.stackPage1)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.logy_box.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.gridLayout_3.addItem(spacerItem, 2, 3, 1, 1)
-        self.logy_box.setObjectName("logy_box")
+        self.autoscale_box = QtWidgets.QToolButton(parent=self.stackPage1)
-        self.gridLayout_3.addWidget(self.logy_box, 2, 1, 1, 1)
+        self.autoscale_box.setObjectName("autoscale_box")
-        self.logx_box = QtWidgets.QCheckBox(self.stackPage1)
+        self.gridLayout_3.addWidget(self.autoscale_box, 2, 4, 1, 1)
-        self.logx_box.setLayoutDirection(QtCore.Qt.RightToLeft)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout_3.addItem(spacerItem1, 2, 1, 1, 1)
+        self.verticalGroupBox_2 = QtWidgets.QGroupBox(parent=self.stackPage1)
+        self.verticalGroupBox_2.setObjectName("verticalGroupBox_2")
+        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.verticalGroupBox_2)
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.logx_box = QtWidgets.QCheckBox(parent=self.verticalGroupBox_2)
+        self.logx_box.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.logx_box.setObjectName("logx_box")
-        self.gridLayout_3.addWidget(self.logx_box, 2, 0, 1, 1)
+        self.verticalLayout_4.addWidget(self.logx_box)
-        self.graphicsView = GraphicsLayoutWidget(self.stackPage1)
+        self.logy_box = QtWidgets.QCheckBox(parent=self.verticalGroupBox_2)
+        self.logy_box.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
+        self.logy_box.setObjectName("logy_box")
+        self.verticalLayout_4.addWidget(self.logy_box)
+        self.gridLayout_3.addWidget(self.verticalGroupBox_2, 2, 2, 1, 1)
+        self.verticalGroupBox = QtWidgets.QGroupBox(parent=self.stackPage1)
+        self.verticalGroupBox.setObjectName("verticalGroupBox")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalGroupBox)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.rel_dev_button = QtWidgets.QRadioButton(parent=self.verticalGroupBox)
+        self.rel_dev_button.setObjectName("rel_dev_button")
+        self.buttonGroup = QtWidgets.QButtonGroup(Dialog)
+        self.buttonGroup.setObjectName("buttonGroup")
+        self.buttonGroup.addButton(self.rel_dev_button)
+        self.verticalLayout.addWidget(self.rel_dev_button)
+        self.abs_dev_button = QtWidgets.QRadioButton(parent=self.verticalGroupBox)
+        self.abs_dev_button.setChecked(True)
+        self.abs_dev_button.setObjectName("abs_dev_button")
+        self.buttonGroup.addButton(self.abs_dev_button)
+        self.verticalLayout.addWidget(self.abs_dev_button)
+        self.gridLayout_3.addWidget(self.verticalGroupBox, 2, 0, 1, 1)
+        self.graphicsView = GraphicsLayoutWidget(parent=self.stackPage1)
         self.graphicsView.setObjectName("graphicsView")
-        self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 2)
+        self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 5)
         self.stack.addTab(self.stackPage1, "")
         self.stackPage2 = QtWidgets.QWidget()
         self.stackPage2.setObjectName("stackPage2")
@@ -159,9 +74,9 @@ class Ui_Dialog(object):
         self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_2.setSpacing(3)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.stats_tableWidget = QtWidgets.QTableWidget(self.stackPage2)
+        self.stats_tableWidget = QtWidgets.QTableWidget(parent=self.stackPage2)
-        self.stats_tableWidget.setFrameShape(QtWidgets.QFrame.Box)
+        self.stats_tableWidget.setFrameShape(QtWidgets.QFrame.Shape.Box)
-        self.stats_tableWidget.setGridStyle(QtCore.Qt.NoPen)
+        self.stats_tableWidget.setGridStyle(QtCore.Qt.PenStyle.NoPen)
         self.stats_tableWidget.setColumnCount(1)
         self.stats_tableWidget.setObjectName("stats_tableWidget")
         self.stats_tableWidget.setRowCount(0)
@@ -175,10 +90,10 @@ class Ui_Dialog(object):
         self.verticalLayout_3.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_3.setSpacing(3)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.corr_tableWidget = QtWidgets.QTableWidget(self.stackPage3)
+        self.corr_tableWidget = QtWidgets.QTableWidget(parent=self.stackPage3)
-        self.corr_tableWidget.setFrameShape(QtWidgets.QFrame.Box)
+        self.corr_tableWidget.setFrameShape(QtWidgets.QFrame.Shape.Box)
-        self.corr_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.corr_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
-        self.corr_tableWidget.setGridStyle(QtCore.Qt.NoPen)
+        self.corr_tableWidget.setGridStyle(QtCore.Qt.PenStyle.NoPen)
         self.corr_tableWidget.setObjectName("corr_tableWidget")
         self.corr_tableWidget.setColumnCount(4)
         self.corr_tableWidget.setRowCount(0)
@@ -194,7 +109,142 @@ class Ui_Dialog(object):
         self.corr_tableWidget.verticalHeader().setVisible(False)
         self.verticalLayout_3.addWidget(self.corr_tableWidget)
         self.stack.addTab(self.stackPage3, "")
-        self.gridLayout.addWidget(self.stack, 0, 1, 3, 1)
+        self.gridLayout.addWidget(self.stack, 0, 1, 5, 1)
+        self.param_tableWidget = QtWidgets.QTableWidget(parent=Dialog)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.param_tableWidget.sizePolicy().hasHeightForWidth())
+        self.param_tableWidget.setSizePolicy(sizePolicy)
+        self.param_tableWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded)
+        self.param_tableWidget.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustIgnored)
+        self.param_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.param_tableWidget.setAlternatingRowColors(True)
+        self.param_tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection)
+        self.param_tableWidget.setColumnCount(1)
+        self.param_tableWidget.setObjectName("param_tableWidget")
+        self.param_tableWidget.setRowCount(0)
+        self.param_tableWidget.horizontalHeader().setVisible(False)
+        self.param_tableWidget.horizontalHeader().setStretchLastSection(True)
+        self.gridLayout.addWidget(self.param_tableWidget, 1, 0, 1, 1)
+        self.del_prev_checkBox = QtWidgets.QCheckBox(parent=Dialog)
+        self.del_prev_checkBox.setObjectName("del_prev_checkBox")
+        self.gridLayout.addWidget(self.del_prev_checkBox, 3, 0, 1, 1)
+        self.line = QtWidgets.QFrame(parent=Dialog)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
+        self.line.setObjectName("line")
+        self.gridLayout.addWidget(self.line, 5, 0, 1, 2)
+        self.sets_comboBox = ElideComboBox(parent=Dialog)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.sets_comboBox.sizePolicy().hasHeightForWidth())
+        self.sets_comboBox.setSizePolicy(sizePolicy)
+        self.sets_comboBox.setMaximumSize(QtCore.QSize(400, 16777215))
+        self.sets_comboBox.setBaseSize(QtCore.QSize(200, 0))
+        self.sets_comboBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
+        self.sets_comboBox.setObjectName("sets_comboBox")
+        self.gridLayout.addWidget(self.sets_comboBox, 0, 0, 1, 1)
+        self.reject_fit_checkBox = QtWidgets.QCheckBox(parent=Dialog)
+        self.reject_fit_checkBox.setObjectName("reject_fit_checkBox")
+        self.gridLayout.addWidget(self.reject_fit_checkBox, 2, 0, 1, 1)
+        self.groupBox = QtWidgets.QGroupBox(parent=Dialog)
+        self.groupBox.setObjectName("groupBox")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox)
+        self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout_2.setSpacing(3)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.graph_comboBox = QtWidgets.QComboBox(parent=self.groupBox)
+        self.graph_comboBox.setEnabled(False)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.graph_comboBox.sizePolicy().hasHeightForWidth())
+        self.graph_comboBox.setSizePolicy(sizePolicy)
+        self.graph_comboBox.setObjectName("graph_comboBox")
+        self.gridLayout_2.addWidget(self.graph_comboBox, 1, 7, 1, 1)
+        self.minx_line = QtWidgets.QLineEdit(parent=self.groupBox)
+        self.minx_line.setEnabled(False)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.minx_line.sizePolicy().hasHeightForWidth())
+        self.minx_line.setSizePolicy(sizePolicy)
+        self.minx_line.setObjectName("minx_line")
+        self.gridLayout_2.addWidget(self.minx_line, 1, 1, 1, 1)
+        self.extrapolate_box = QtWidgets.QCheckBox(parent=self.groupBox)
+        self.extrapolate_box.setObjectName("extrapolate_box")
+        self.gridLayout_2.addWidget(self.extrapolate_box, 1, 0, 1, 1)
+        self.numx_line = QtWidgets.QLineEdit(parent=self.groupBox)
+        self.numx_line.setEnabled(False)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.numx_line.sizePolicy().hasHeightForWidth())
+        self.numx_line.setSizePolicy(sizePolicy)
+        self.numx_line.setObjectName("numx_line")
+        self.gridLayout_2.addWidget(self.numx_line, 1, 3, 1, 1)
+        self.graph_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.graph_checkBox.sizePolicy().hasHeightForWidth())
+        self.graph_checkBox.setSizePolicy(sizePolicy)
+        self.graph_checkBox.setChecked(True)
+        self.graph_checkBox.setObjectName("graph_checkBox")
+        self.gridLayout_2.addWidget(self.graph_checkBox, 1, 6, 1, 1)
+        self.maxx_line = QtWidgets.QLineEdit(parent=self.groupBox)
+        self.maxx_line.setEnabled(False)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.maxx_line.sizePolicy().hasHeightForWidth())
+        self.maxx_line.setSizePolicy(sizePolicy)
+        self.maxx_line.setObjectName("maxx_line")
+        self.gridLayout_2.addWidget(self.maxx_line, 1, 2, 1, 1)
+        self.line_2 = QtWidgets.QFrame(parent=self.groupBox)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.VLine)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
+        self.line_2.setObjectName("line_2")
+        self.gridLayout_2.addWidget(self.line_2, 0, 5, 2, 1)
+        self.newx_log_checkbox = QtWidgets.QCheckBox(parent=self.groupBox)
+        self.newx_log_checkbox.setEnabled(False)
+        self.newx_log_checkbox.setObjectName("newx_log_checkbox")
+        self.gridLayout_2.addWidget(self.newx_log_checkbox, 1, 4, 1, 1)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.curve_checkbox = QtWidgets.QCheckBox(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.curve_checkbox.sizePolicy().hasHeightForWidth())
+        self.curve_checkbox.setSizePolicy(sizePolicy)
+        self.curve_checkbox.setChecked(True)
+        self.curve_checkbox.setObjectName("curve_checkbox")
+        self.horizontalLayout.addWidget(self.curve_checkbox)
+        self.partial_checkBox = QtWidgets.QCheckBox(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.partial_checkBox.sizePolicy().hasHeightForWidth())
+        self.partial_checkBox.setSizePolicy(sizePolicy)
+        self.partial_checkBox.setObjectName("partial_checkBox")
+        self.horizontalLayout.addWidget(self.partial_checkBox)
+        self.gridLayout_2.addLayout(self.horizontalLayout, 0, 0, 1, 5)
+        self.parameter_checkbox = QtWidgets.QCheckBox(parent=self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.parameter_checkbox.sizePolicy().hasHeightForWidth())
+        self.parameter_checkbox.setSizePolicy(sizePolicy)
+        self.parameter_checkbox.setObjectName("parameter_checkbox")
+        self.gridLayout_2.addWidget(self.parameter_checkbox, 0, 6, 1, 2)
+        self.gridLayout.addWidget(self.groupBox, 7, 0, 1, 2)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok|QtWidgets.QDialogButtonBox.StandardButton.Retry)
+        self.buttonBox.setObjectName("buttonBox")
+        self.gridLayout.addWidget(self.buttonBox, 8, 0, 1, 2)
 
         self.retranslateUi(Dialog)
         self.stack.setCurrentIndex(0)
@@ -203,22 +253,14 @@ class Ui_Dialog(object):
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Fit results"))
-        self.groupBox.setTitle(_translate("Dialog", "Output"))
+        self.autoscale_box.setToolTip(_translate("Dialog", "Auto-scale graph for all sets"))
-        self.extrapolate_box.setToolTip(_translate("Dialog", "Extrapolates only main function"))
+        self.autoscale_box.setText(_translate("Dialog", "Autoscale all sets"))
-        self.extrapolate_box.setText(_translate("Dialog", "Extrapolate curves"))
+        self.verticalGroupBox_2.setTitle(_translate("Dialog", "Logarithmic axes"))
-        self.parameter_checkbox.setText(_translate("Dialog", "Plot parameter"))
+        self.logx_box.setText(_translate("Dialog", "x axis"))
-        self.graph_checkBox.setText(_translate("Dialog", "New graph for parameter"))
+        self.logy_box.setText(_translate("Dialog", "y axis"))
-        self.minx_line.setToolTip(_translate("Dialog", "Leave empty to start at lowest point"))
+        self.verticalGroupBox.setTitle(_translate("Dialog", "Residuals"))
-        self.minx_line.setPlaceholderText(_translate("Dialog", "min x"))
+        self.rel_dev_button.setText(_translate("Dialog", "relative deviation"))
-        self.maxx_line.setToolTip(_translate("Dialog", "Leave empty to start at highest point"))
+        self.abs_dev_button.setText(_translate("Dialog", "absolute deviation"))
-        self.maxx_line.setPlaceholderText(_translate("Dialog", "max x"))
-        self.numx_line.setPlaceholderText(_translate("Dialog", "# pts"))
-        self.curve_checkbox.setText(_translate("Dialog", "Plot fit curve"))
-        self.partial_checkBox.setText(_translate("Dialog", "Plot partial functions"))
-        self.reject_fit_checkBox.setText(_translate("Dialog", "Reject this fit"))
-        self.del_prev_checkBox.setText(_translate("Dialog", "Delete previous fits"))
-        self.logy_box.setText(_translate("Dialog", "logarithmic y axis"))
-        self.logx_box.setText(_translate("Dialog", "logarithmic x axis"))
         self.stack.setTabText(self.stack.indexOf(self.stackPage1), _translate("Dialog", "Plot"))
         self.stack.setTabText(self.stack.indexOf(self.stackPage2), _translate("Dialog", "Statistics"))
         item = self.corr_tableWidget.horizontalHeaderItem(0)
@@ -230,5 +272,20 @@ class Ui_Dialog(object):
         item = self.corr_tableWidget.horizontalHeaderItem(3)
         item.setText(_translate("Dialog", "Partial Corr."))
         self.stack.setTabText(self.stack.indexOf(self.stackPage3), _translate("Dialog", "Correlations"))
+        self.del_prev_checkBox.setText(_translate("Dialog", "Delete previous fits of this set"))
+        self.reject_fit_checkBox.setText(_translate("Dialog", "Reject this fit"))
+        self.groupBox.setTitle(_translate("Dialog", "Output"))
+        self.minx_line.setToolTip(_translate("Dialog", "Leave empty to start at lowest point"))
+        self.minx_line.setPlaceholderText(_translate("Dialog", "min x"))
+        self.extrapolate_box.setToolTip(_translate("Dialog", "Extrapolates only main function"))
+        self.extrapolate_box.setText(_translate("Dialog", "Extrapolate curves"))
+        self.numx_line.setPlaceholderText(_translate("Dialog", "# pts"))
+        self.graph_checkBox.setText(_translate("Dialog", "New graph for parameter"))
+        self.maxx_line.setToolTip(_translate("Dialog", "Leave empty to start at highest point"))
+        self.maxx_line.setPlaceholderText(_translate("Dialog", "max x"))
+        self.newx_log_checkbox.setText(_translate("Dialog", "log-spaced?"))
+        self.curve_checkbox.setText(_translate("Dialog", "Plot fit curve"))
+        self.partial_checkBox.setText(_translate("Dialog", "Plot partial functions"))
+        self.parameter_checkbox.setText(_translate("Dialog", "Plot parameter"))
 from ..lib.forms import ElideComboBox
 from pyqtgraph import GraphicsLayoutWidget

src/gui_qt/_py/ftdialog.py

@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/ftdialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Dialog(object):
-    def setupUi(self, Dialog):
-        Dialog.setObjectName("Dialog")
-        Dialog.resize(400, 300)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
-        self.verticalLayout.setContentsMargins(3, 3, 3, 3)
-        self.verticalLayout.setSpacing(3)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.listWidget = QtWidgets.QListWidget(Dialog)
-        self.listWidget.setObjectName("listWidget")
-        self.verticalLayout.addWidget(self.listWidget)
-        self.mode_comboBox = QtWidgets.QComboBox(Dialog)
-        self.mode_comboBox.setObjectName("mode_comboBox")
-        self.mode_comboBox.addItem("")
-        self.mode_comboBox.addItem("")
-        self.mode_comboBox.addItem("")
-        self.verticalLayout.addWidget(self.mode_comboBox)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setContentsMargins(-1, 0, -1, -1)
-        self.horizontalLayout.setSpacing(3)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.graph_checkBox = QtWidgets.QCheckBox(Dialog)
-        self.graph_checkBox.setObjectName("graph_checkBox")
-        self.horizontalLayout.addWidget(self.graph_checkBox)
-        self.graph_comboBox = QtWidgets.QComboBox(Dialog)
-        self.graph_comboBox.setObjectName("graph_comboBox")
-        self.horizontalLayout.addWidget(self.graph_comboBox)
-        self.verticalLayout.addLayout(self.horizontalLayout)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.verticalLayout.addWidget(self.buttonBox)
-
-        self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
-        self.buttonBox.rejected.connect(Dialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(Dialog)
-
-    def retranslateUi(self, Dialog):
-        _translate = QtCore.QCoreApplication.translate
-        Dialog.setWindowTitle(_translate("Dialog", "Logarithmic Fourier"))
-        self.mode_comboBox.setItemText(0, _translate("Dialog", "Real"))
-        self.mode_comboBox.setItemText(1, _translate("Dialog", "Imag"))
-        self.mode_comboBox.setItemText(2, _translate("Dialog", "Complex"))
-        self.graph_checkBox.setText(_translate("Dialog", "New graph"))

src/gui_qt/_py/function_tree_widget.py

@@ -1,123 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/function_tree_widget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(314, 232)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
-        Form.setSizePolicy(sizePolicy)
-        self.gridLayout = QtWidgets.QGridLayout(Form)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setSpacing(3)
-        self.gridLayout.setObjectName("gridLayout")
-        self.widget_2 = ExpandableWidget(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.widget_2.sizePolicy().hasHeightForWidth())
-        self.widget_2.setSizePolicy(sizePolicy)
-        self.widget_2.setObjectName("widget_2")
-        self.gridLayout.addWidget(self.widget_2, 4, 0, 1, 2)
-        self.widget = QtWidgets.QWidget(Form)
-        self.widget.setObjectName("widget")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.widget)
-        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.label_2 = QtWidgets.QLabel(self.widget)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
-        self.complex_comboBox = QtWidgets.QComboBox(self.widget)
-        self.complex_comboBox.setObjectName("complex_comboBox")
-        self.complex_comboBox.addItem("")
-        self.complex_comboBox.addItem("")
-        self.complex_comboBox.addItem("")
-        self.gridLayout_2.addWidget(self.complex_comboBox, 1, 1, 1, 1)
-        self.label = QtWidgets.QLabel(self.widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setObjectName("label")
-        self.gridLayout_2.addWidget(self.label, 0, 0, 1, 2)
-        self.gridLayout.addWidget(self.widget, 5, 0, 1, 2)
-        self.use_function_button = QtWidgets.QToolButton(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.use_function_button.sizePolicy().hasHeightForWidth())
-        self.use_function_button.setSizePolicy(sizePolicy)
-        self.use_function_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
-        self.use_function_button.setAutoRaise(False)
-        self.use_function_button.setArrowType(QtCore.Qt.RightArrow)
-        self.use_function_button.setObjectName("use_function_button")
-        self.gridLayout.addWidget(self.use_function_button, 3, 1, 1, 1)
-        self.fitcomboBox = QtWidgets.QComboBox(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fitcomboBox.sizePolicy().hasHeightForWidth())
-        self.fitcomboBox.setSizePolicy(sizePolicy)
-        self.fitcomboBox.setObjectName("fitcomboBox")
-        self.gridLayout.addWidget(self.fitcomboBox, 1, 0, 1, 2)
-        self.typecomboBox = QtWidgets.QComboBox(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.typecomboBox.sizePolicy().hasHeightForWidth())
-        self.typecomboBox.setSizePolicy(sizePolicy)
-        self.typecomboBox.setObjectName("typecomboBox")
-        self.gridLayout.addWidget(self.typecomboBox, 0, 0, 1, 2)
-        self.fitequation = QtWidgets.QLabel(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fitequation.sizePolicy().hasHeightForWidth())
-        self.fitequation.setSizePolicy(sizePolicy)
-        self.fitequation.setWordWrap(True)
-        self.fitequation.setObjectName("fitequation")
-        self.gridLayout.addWidget(self.fitequation, 2, 0, 1, 2)
-        self.operator_combobox = QtWidgets.QComboBox(Form)
-        self.operator_combobox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
-        self.operator_combobox.setFrame(True)
-        self.operator_combobox.setObjectName("operator_combobox")
-        self.operator_combobox.addItem("")
-        self.operator_combobox.addItem("")
-        self.operator_combobox.addItem("")
-        self.operator_combobox.addItem("")
-        self.gridLayout.addWidget(self.operator_combobox, 3, 0, 1, 1)
-        self.comboBox_2 = QtWidgets.QComboBox(Form)
-        self.comboBox_2.setObjectName("comboBox_2")
-        self.gridLayout.addWidget(self.comboBox_2, 6, 0, 1, 2)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "Form"))
-        self.label_2.setText(_translate("Form", "Select part to fit"))
-        self.complex_comboBox.setItemText(0, _translate("Form", "Complex"))
-        self.complex_comboBox.setItemText(1, _translate("Form", "Real"))
-        self.complex_comboBox.setItemText(2, _translate("Form", "Imaginary"))
-        self.label.setText(_translate("Form", "Complex function found"))
-        self.use_function_button.setText(_translate("Form", "Use"))
-        self.fitequation.setText(_translate("Form", "Equation"))
-        self.operator_combobox.setItemText(0, _translate("Form", "Add"))
-        self.operator_combobox.setItemText(1, _translate("Form", "Multiply"))
-        self.operator_combobox.setItemText(2, _translate("Form", "Subtract"))
-        self.operator_combobox.setItemText(3, _translate("Form", "Divide by"))
-from ..lib.expandablewidget import ExpandableWidget

src/gui_qt/_py/gol.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/gol.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/gol.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
@@ -16,64 +15,64 @@ class Ui_Form(object):
         Form.resize(883, 732)
         self.gridLayout_2 = QtWidgets.QGridLayout(Form)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.widget = QtWidgets.QWidget(Form)
+        self.widget = QtWidgets.QWidget(parent=Form)
         self.widget.setObjectName("widget")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.widget)
         self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.vanish_shadow = QtWidgets.QRadioButton(self.widget)
+        self.vanish_shadow = QtWidgets.QRadioButton(parent=self.widget)
         self.vanish_shadow.setChecked(True)
         self.vanish_shadow.setObjectName("vanish_shadow")
         self.buttonGroup = QtWidgets.QButtonGroup(Form)
         self.buttonGroup.setObjectName("buttonGroup")
         self.buttonGroup.addButton(self.vanish_shadow)
         self.verticalLayout_3.addWidget(self.vanish_shadow)
-        self.full_shadow = QtWidgets.QRadioButton(self.widget)
+        self.full_shadow = QtWidgets.QRadioButton(parent=self.widget)
         self.full_shadow.setObjectName("full_shadow")
         self.buttonGroup.addButton(self.full_shadow)
         self.verticalLayout_3.addWidget(self.full_shadow)
-        self.radioButton = QtWidgets.QRadioButton(self.widget)
+        self.radioButton = QtWidgets.QRadioButton(parent=self.widget)
         self.radioButton.setObjectName("radioButton")
         self.buttonGroup.addButton(self.radioButton)
         self.verticalLayout_3.addWidget(self.radioButton)
-        self.line = QtWidgets.QFrame(self.widget)
+        self.line = QtWidgets.QFrame(parent=self.widget)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.verticalLayout_3.addWidget(self.line)
-        self.faster_button = QtWidgets.QToolButton(self.widget)
+        self.faster_button = QtWidgets.QToolButton(parent=self.widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.faster_button.sizePolicy().hasHeightForWidth())
         self.faster_button.setSizePolicy(sizePolicy)
-        self.faster_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.faster_button.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
-        self.faster_button.setArrowType(QtCore.Qt.RightArrow)
+        self.faster_button.setArrowType(QtCore.Qt.ArrowType.RightArrow)
         self.faster_button.setObjectName("faster_button")
         self.verticalLayout_3.addWidget(self.faster_button)
-        self.velocity_label = QtWidgets.QLabel(self.widget)
+        self.velocity_label = QtWidgets.QLabel(parent=self.widget)
         self.velocity_label.setObjectName("velocity_label")
         self.verticalLayout_3.addWidget(self.velocity_label)
-        self.slower_button = QtWidgets.QToolButton(self.widget)
+        self.slower_button = QtWidgets.QToolButton(parent=self.widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.slower_button.sizePolicy().hasHeightForWidth())
         self.slower_button.setSizePolicy(sizePolicy)
-        self.slower_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.slower_button.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
-        self.slower_button.setArrowType(QtCore.Qt.LeftArrow)
+        self.slower_button.setArrowType(QtCore.Qt.ArrowType.LeftArrow)
         self.slower_button.setObjectName("slower_button")
         self.verticalLayout_3.addWidget(self.slower_button)
-        self.current_step = QtWidgets.QLabel(self.widget)
+        self.current_step = QtWidgets.QLabel(parent=self.widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.current_step.sizePolicy().hasHeightForWidth())
         self.current_step.setSizePolicy(sizePolicy)
         self.current_step.setObjectName("current_step")
         self.verticalLayout_3.addWidget(self.current_step)
-        self.pause_button = QtWidgets.QPushButton(self.widget)
+        self.pause_button = QtWidgets.QPushButton(parent=self.widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.pause_button.sizePolicy().hasHeightForWidth())
@@ -81,38 +80,38 @@ class Ui_Form(object):
         self.pause_button.setCheckable(True)
         self.pause_button.setObjectName("pause_button")
         self.verticalLayout_3.addWidget(self.pause_button)
-        self.line_3 = QtWidgets.QFrame(self.widget)
+        self.line_3 = QtWidgets.QFrame(parent=self.widget)
-        self.line_3.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_3.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_3.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_3.setObjectName("line_3")
         self.verticalLayout_3.addWidget(self.line_3)
-        self.label_6 = QtWidgets.QLabel(self.widget)
+        self.label_6 = QtWidgets.QLabel(parent=self.widget)
         self.label_6.setObjectName("label_6")
         self.verticalLayout_3.addWidget(self.label_6)
-        self.cover_label = QtWidgets.QLabel(self.widget)
+        self.cover_label = QtWidgets.QLabel(parent=self.widget)
         self.cover_label.setText("")
         self.cover_label.setObjectName("cover_label")
         self.verticalLayout_3.addWidget(self.cover_label)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_3.addItem(spacerItem)
         self.gridLayout_2.addWidget(self.widget, 0, 0, 1, 1)
-        self.view = QtWidgets.QGraphicsView(Form)
+        self.view = QtWidgets.QGraphicsView(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.view.sizePolicy().hasHeightForWidth())
         self.view.setSizePolicy(sizePolicy)
         self.view.setStyleSheet("background-color: transparent")
-        self.view.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.view.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
         self.view.setObjectName("view")
         self.gridLayout_2.addWidget(self.view, 0, 1, 1, 1)
-        self.option_frame = QtWidgets.QFrame(Form)
+        self.option_frame = QtWidgets.QFrame(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.option_frame.sizePolicy().hasHeightForWidth())
         self.option_frame.setSizePolicy(sizePolicy)
-        self.option_frame.setFrameShape(QtWidgets.QFrame.Box)
+        self.option_frame.setFrameShape(QtWidgets.QFrame.Shape.Box)
         self.option_frame.setObjectName("option_frame")
         self.gridLayout = QtWidgets.QGridLayout(self.option_frame)
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
@@ -121,47 +120,47 @@ class Ui_Form(object):
         self.gridLayout.setObjectName("gridLayout")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.rule_label = QtWidgets.QLabel(self.option_frame)
+        self.rule_label = QtWidgets.QLabel(parent=self.option_frame)
         self.rule_label.setObjectName("rule_label")
         self.horizontalLayout_2.addWidget(self.rule_label)
-        self.rule_cb = QtWidgets.QComboBox(self.option_frame)
+        self.rule_cb = QtWidgets.QComboBox(parent=self.option_frame)
         self.rule_cb.setObjectName("rule_cb")
         self.horizontalLayout_2.addWidget(self.rule_cb)
         self.gridLayout.addLayout(self.horizontalLayout_2, 3, 0, 1, 1)
-        self.line_2 = QtWidgets.QFrame(self.option_frame)
+        self.line_2 = QtWidgets.QFrame(parent=self.option_frame)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.gridLayout.addWidget(self.line_2, 2, 0, 1, 1)
         self.verticalLayout_2 = QtWidgets.QVBoxLayout()
         self.verticalLayout_2.setContentsMargins(-1, 0, -1, 0)
         self.verticalLayout_2.setSpacing(3)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.object_widget = QtWidgets.QWidget(self.option_frame)
+        self.object_widget = QtWidgets.QWidget(parent=self.option_frame)
         self.object_widget.setObjectName("object_widget")
         self.horizontalLayout_6 = QtWidgets.QHBoxLayout(self.object_widget)
         self.horizontalLayout_6.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_6.setSpacing(3)
         self.horizontalLayout_6.setObjectName("horizontalLayout_6")
-        self.label_5 = QtWidgets.QLabel(self.object_widget)
+        self.label_5 = QtWidgets.QLabel(parent=self.object_widget)
         self.label_5.setObjectName("label_5")
         self.horizontalLayout_6.addWidget(self.label_5)
-        self.object_size = QtWidgets.QSpinBox(self.object_widget)
+        self.object_size = QtWidgets.QSpinBox(parent=self.object_widget)
         self.object_size.setMinimum(1)
         self.object_size.setMaximum(600)
         self.object_size.setObjectName("object_size")
         self.horizontalLayout_6.addWidget(self.object_size)
         self.verticalLayout_2.addWidget(self.object_widget)
-        self.rand_button_wdgt = QtWidgets.QWidget(self.option_frame)
+        self.rand_button_wdgt = QtWidgets.QWidget(parent=self.option_frame)
         self.rand_button_wdgt.setObjectName("rand_button_wdgt")
         self.horizontalLayout_7 = QtWidgets.QHBoxLayout(self.rand_button_wdgt)
         self.horizontalLayout_7.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_7.setSpacing(3)
         self.horizontalLayout_7.setObjectName("horizontalLayout_7")
-        self.add_random_button = QtWidgets.QPushButton(self.rand_button_wdgt)
+        self.add_random_button = QtWidgets.QPushButton(parent=self.rand_button_wdgt)
         self.add_random_button.setObjectName("add_random_button")
         self.horizontalLayout_7.addWidget(self.add_random_button)
-        self.remove_random_button = QtWidgets.QPushButton(self.rand_button_wdgt)
+        self.remove_random_button = QtWidgets.QPushButton(parent=self.rand_button_wdgt)
         self.remove_random_button.setObjectName("remove_random_button")
         self.horizontalLayout_7.addWidget(self.remove_random_button)
         self.verticalLayout_2.addWidget(self.rand_button_wdgt)
@@ -171,32 +170,32 @@ class Ui_Form(object):
         self.gridLayout.addLayout(self.verticalLayout_2, 2, 1, 4, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label_3 = QtWidgets.QLabel(self.option_frame)
+        self.label_3 = QtWidgets.QLabel(parent=self.option_frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
         self.label_3.setSizePolicy(sizePolicy)
         self.label_3.setObjectName("label_3")
         self.horizontalLayout.addWidget(self.label_3)
-        self.survival_line = QtWidgets.QLineEdit(self.option_frame)
+        self.survival_line = QtWidgets.QLineEdit(parent=self.option_frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.survival_line.sizePolicy().hasHeightForWidth())
         self.survival_line.setSizePolicy(sizePolicy)
         self.survival_line.setObjectName("survival_line")
         self.horizontalLayout.addWidget(self.survival_line)
-        self.label_4 = QtWidgets.QLabel(self.option_frame)
+        self.label_4 = QtWidgets.QLabel(parent=self.option_frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
         self.label_4.setSizePolicy(sizePolicy)
         self.label_4.setObjectName("label_4")
         self.horizontalLayout.addWidget(self.label_4)
-        self.birth_line = QtWidgets.QLineEdit(self.option_frame)
+        self.birth_line = QtWidgets.QLineEdit(parent=self.option_frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.birth_line.sizePolicy().hasHeightForWidth())
@@ -206,24 +205,24 @@ class Ui_Form(object):
         self.gridLayout.addLayout(self.horizontalLayout, 4, 0, 1, 1)
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.label = QtWidgets.QLabel(self.option_frame)
+        self.label = QtWidgets.QLabel(parent=self.option_frame)
         self.label.setObjectName("label")
         self.horizontalLayout_3.addWidget(self.label)
-        self.width_box = QtWidgets.QSpinBox(self.option_frame)
+        self.width_box = QtWidgets.QSpinBox(parent=self.option_frame)
         self.width_box.setMaximum(600)
         self.width_box.setProperty("value", 100)
         self.width_box.setObjectName("width_box")
         self.horizontalLayout_3.addWidget(self.width_box)
-        self.label_2 = QtWidgets.QLabel(self.option_frame)
+        self.label_2 = QtWidgets.QLabel(parent=self.option_frame)
         self.label_2.setObjectName("label_2")
         self.horizontalLayout_3.addWidget(self.label_2)
-        self.height_box = QtWidgets.QSpinBox(self.option_frame)
+        self.height_box = QtWidgets.QSpinBox(parent=self.option_frame)
         self.height_box.setMaximum(600)
         self.height_box.setProperty("value", 100)
         self.height_box.setObjectName("height_box")
         self.horizontalLayout_3.addWidget(self.height_box)
         self.gridLayout.addLayout(self.horizontalLayout_3, 1, 0, 1, 1)
-        self.object_combobox = QtWidgets.QComboBox(self.option_frame)
+        self.object_combobox = QtWidgets.QComboBox(parent=self.option_frame)
         self.object_combobox.setObjectName("object_combobox")
         self.object_combobox.addItem("")
         self.object_combobox.addItem("")
@@ -231,8 +230,8 @@ class Ui_Form(object):
         self.object_combobox.addItem("")
         self.object_combobox.addItem("")
         self.gridLayout.addWidget(self.object_combobox, 1, 1, 1, 1)
-        self.start_button = QtWidgets.QPushButton(self.option_frame)
+        self.start_button = QtWidgets.QPushButton(parent=self.option_frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.start_button.sizePolicy().hasHeightForWidth())
@@ -240,7 +239,7 @@ class Ui_Form(object):
         self.start_button.setObjectName("start_button")
         self.gridLayout.addWidget(self.start_button, 0, 0, 1, 2)
         self.gridLayout_2.addWidget(self.option_frame, 1, 1, 1, 1)
-        self.hide_button = QtWidgets.QCheckBox(Form)
+        self.hide_button = QtWidgets.QCheckBox(parent=Form)
         self.hide_button.setObjectName("hide_button")
         self.gridLayout_2.addWidget(self.hide_button, 1, 0, 1, 1)
 

src/gui_qt/_py/gracemsgdialog.py

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/gracemsgdialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_GraceMsgDialog(object):
-    def setupUi(self, GraceMsgDialog):
-        GraceMsgDialog.setObjectName("GraceMsgDialog")
-        GraceMsgDialog.resize(400, 300)
-        self.gridLayout = QtWidgets.QGridLayout(GraceMsgDialog)
-        self.gridLayout.setObjectName("gridLayout")
-        self.graph_combo = QtWidgets.QComboBox(GraceMsgDialog)
-        self.graph_combo.setObjectName("graph_combo")
-        self.gridLayout.addWidget(self.graph_combo, 1, 1, 1, 1)
-        self.graph_button = QtWidgets.QRadioButton(GraceMsgDialog)
-        self.graph_button.setObjectName("graph_button")
-        self.buttonGroup = QtWidgets.QButtonGroup(GraceMsgDialog)
-        self.buttonGroup.setObjectName("buttonGroup")
-        self.buttonGroup.addButton(self.graph_button)
-        self.gridLayout.addWidget(self.graph_button, 1, 0, 1, 1)
-        self.overwrite_button = QtWidgets.QRadioButton(GraceMsgDialog)
-        self.overwrite_button.setChecked(True)
-        self.overwrite_button.setObjectName("overwrite_button")
-        self.buttonGroup.addButton(self.overwrite_button)
-        self.gridLayout.addWidget(self.overwrite_button, 0, 0, 1, 1)
-        self.radioButton = QtWidgets.QRadioButton(GraceMsgDialog)
-        self.radioButton.setObjectName("radioButton")
-        self.buttonGroup.addButton(self.radioButton)
-        self.gridLayout.addWidget(self.radioButton, 2, 0, 1, 1)
-        self.tableWidget = QtWidgets.QTableWidget(GraceMsgDialog)
-        self.tableWidget.setColumnCount(2)
-        self.tableWidget.setObjectName("tableWidget")
-        self.tableWidget.setRowCount(0)
-        self.tableWidget.horizontalHeader().setVisible(False)
-        self.gridLayout.addWidget(self.tableWidget, 3, 0, 2, 2)
-        self.buttonBox = QtWidgets.QDialogButtonBox(GraceMsgDialog)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 2)
-
-        self.retranslateUi(GraceMsgDialog)
-        QtCore.QMetaObject.connectSlotsByName(GraceMsgDialog)
-
-    def retranslateUi(self, GraceMsgDialog):
-        _translate = QtCore.QCoreApplication.translate
-        GraceMsgDialog.setWindowTitle(_translate("GraceMsgDialog", "Goodness gracious, file already exists."))
-        self.graph_button.setText(_translate("GraceMsgDialog", "Add to graph"))
-        self.overwrite_button.setText(_translate("GraceMsgDialog", "Overwrite file"))
-        self.radioButton.setText(_translate("GraceMsgDialog", "Replace sets"))

src/gui_qt/_py/gracereader.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/gracereader.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/gracereader.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
@@ -16,63 +15,63 @@ class Ui_Dialog(object):
         Dialog.resize(400, 613)
         self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.label = QtWidgets.QLabel(Dialog)
+        self.label = QtWidgets.QLabel(parent=Dialog)
         self.label.setObjectName("label")
         self.verticalLayout.addWidget(self.label)
-        self.treeWidget = QtWidgets.QTreeWidget(Dialog)
+        self.treeWidget = QtWidgets.QTreeWidget(parent=Dialog)
-        self.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
+        self.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
         self.treeWidget.setObjectName("treeWidget")
         self.treeWidget.headerItem().setText(0, "1")
         self.treeWidget.header().setVisible(False)
         self.verticalLayout.addWidget(self.treeWidget)
-        self.tableWidget = QtWidgets.QTableWidget(Dialog)
+        self.tableWidget = QtWidgets.QTableWidget(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.tableWidget.sizePolicy().hasHeightForWidth())
         self.tableWidget.setSizePolicy(sizePolicy)
-        self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
-        self.tableWidget.setGridStyle(QtCore.Qt.NoPen)
+        self.tableWidget.setGridStyle(QtCore.Qt.PenStyle.NoPen)
         self.tableWidget.setRowCount(4)
         self.tableWidget.setColumnCount(2)
         self.tableWidget.setObjectName("tableWidget")
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(0, 0, item)
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(0, 1, item)
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(1, 0, item)
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(1, 1, item)
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(2, 0, item)
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(2, 1, item)
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(3, 0, item)
         item = QtWidgets.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsEnabled)
+        item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
         self.tableWidget.setItem(3, 1, item)
         self.tableWidget.horizontalHeader().setVisible(False)
         self.tableWidget.horizontalHeader().setStretchLastSection(True)
         self.tableWidget.verticalHeader().setVisible(False)
         self.verticalLayout.addWidget(self.tableWidget)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):

src/gui_qt/_py/graph.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/graph.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/graph.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_GraphWindow(object):
@@ -19,8 +18,8 @@ class Ui_GraphWindow(object):
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.widget = QtWidgets.QWidget(GraphWindow)
+        self.widget = QtWidgets.QWidget(parent=GraphWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.widget.sizePolicy().hasHeightForWidth())
@@ -30,93 +29,93 @@ class Ui_GraphWindow(object):
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setSpacing(1)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.logx_button = QtWidgets.QToolButton(self.widget)
+        self.logx_button = QtWidgets.QToolButton(parent=self.widget)
         self.logx_button.setIconSize(QtCore.QSize(16, 16))
         self.logx_button.setCheckable(True)
         self.logx_button.setAutoRaise(True)
         self.logx_button.setObjectName("logx_button")
         self.horizontalLayout.addWidget(self.logx_button)
-        self.logy_button = QtWidgets.QToolButton(self.widget)
+        self.logy_button = QtWidgets.QToolButton(parent=self.widget)
         self.logy_button.setIconSize(QtCore.QSize(16, 16))
         self.logy_button.setCheckable(True)
         self.logy_button.setAutoRaise(True)
         self.logy_button.setObjectName("logy_button")
         self.horizontalLayout.addWidget(self.logy_button)
-        self.line = QtWidgets.QFrame(self.widget)
+        self.line = QtWidgets.QFrame(parent=self.widget)
-        self.line.setFrameShape(QtWidgets.QFrame.VLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.VLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.horizontalLayout.addWidget(self.line)
-        self.gridbutton = QtWidgets.QToolButton(self.widget)
+        self.gridbutton = QtWidgets.QToolButton(parent=self.widget)
         self.gridbutton.setCheckable(True)
         self.gridbutton.setAutoRaise(True)
         self.gridbutton.setObjectName("gridbutton")
         self.horizontalLayout.addWidget(self.gridbutton)
-        self.bwbutton = QtWidgets.QToolButton(self.widget)
+        self.bwbutton = QtWidgets.QToolButton(parent=self.widget)
         self.bwbutton.setCheckable(True)
         self.bwbutton.setAutoRaise(True)
         self.bwbutton.setObjectName("bwbutton")
         self.horizontalLayout.addWidget(self.bwbutton)
-        self.line_2 = QtWidgets.QFrame(self.widget)
+        self.line_2 = QtWidgets.QFrame(parent=self.widget)
-        self.line_2.setFrameShape(QtWidgets.QFrame.VLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.VLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.horizontalLayout.addWidget(self.line_2)
-        self.legend_button = QtWidgets.QToolButton(self.widget)
+        self.legend_button = QtWidgets.QToolButton(parent=self.widget)
         self.legend_button.setIconSize(QtCore.QSize(16, 16))
         self.legend_button.setCheckable(True)
         self.legend_button.setAutoRaise(True)
         self.legend_button.setObjectName("legend_button")
         self.horizontalLayout.addWidget(self.legend_button)
-        self.imag_button = QtWidgets.QToolButton(self.widget)
+        self.imag_button = QtWidgets.QToolButton(parent=self.widget)
         self.imag_button.setIconSize(QtCore.QSize(16, 16))
         self.imag_button.setCheckable(True)
         self.imag_button.setChecked(True)
         self.imag_button.setAutoRaise(True)
         self.imag_button.setObjectName("imag_button")
         self.horizontalLayout.addWidget(self.imag_button)
-        self.real_button = QtWidgets.QToolButton(self.widget)
+        self.real_button = QtWidgets.QToolButton(parent=self.widget)
         self.real_button.setIconSize(QtCore.QSize(16, 16))
         self.real_button.setCheckable(True)
         self.real_button.setChecked(True)
         self.real_button.setAutoRaise(True)
         self.real_button.setObjectName("real_button")
         self.horizontalLayout.addWidget(self.real_button)
-        self.error_button = QtWidgets.QToolButton(self.widget)
+        self.error_button = QtWidgets.QToolButton(parent=self.widget)
         self.error_button.setIconSize(QtCore.QSize(16, 16))
         self.error_button.setCheckable(True)
         self.error_button.setAutoRaise(True)
         self.error_button.setObjectName("error_button")
         self.horizontalLayout.addWidget(self.error_button)
-        self.line_3 = QtWidgets.QFrame(self.widget)
+        self.line_3 = QtWidgets.QFrame(parent=self.widget)
-        self.line_3.setFrameShape(QtWidgets.QFrame.VLine)
+        self.line_3.setFrameShape(QtWidgets.QFrame.Shape.VLine)
-        self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_3.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_3.setObjectName("line_3")
         self.horizontalLayout.addWidget(self.line_3)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
-        self.limit_button = QtWidgets.QToolButton(self.widget)
+        self.limit_button = QtWidgets.QToolButton(parent=self.widget)
         self.limit_button.setCheckable(True)
-        self.limit_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.limit_button.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         self.limit_button.setAutoRaise(True)
-        self.limit_button.setArrowType(QtCore.Qt.RightArrow)
+        self.limit_button.setArrowType(QtCore.Qt.ArrowType.RightArrow)
         self.limit_button.setObjectName("limit_button")
         self.horizontalLayout.addWidget(self.limit_button)
-        self.label_button = QtWidgets.QToolButton(self.widget)
+        self.label_button = QtWidgets.QToolButton(parent=self.widget)
         self.label_button.setCheckable(True)
-        self.label_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.label_button.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         self.label_button.setAutoRaise(True)
-        self.label_button.setArrowType(QtCore.Qt.RightArrow)
+        self.label_button.setArrowType(QtCore.Qt.ArrowType.RightArrow)
         self.label_button.setObjectName("label_button")
         self.horizontalLayout.addWidget(self.label_button)
         self.verticalLayout.addWidget(self.widget)
-        self.line_4 = QtWidgets.QFrame(GraphWindow)
+        self.line_4 = QtWidgets.QFrame(parent=GraphWindow)
-        self.line_4.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_4.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_4.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_4.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_4.setObjectName("line_4")
         self.verticalLayout.addWidget(self.line_4)
-        self.limit_widget = QtWidgets.QWidget(GraphWindow)
+        self.limit_widget = QtWidgets.QWidget(parent=GraphWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.limit_widget.sizePolicy().hasHeightForWidth())
@@ -126,40 +125,40 @@ class Ui_GraphWindow(object):
         self.horizontalLayout_2.setContentsMargins(1, 1, 1, 1)
         self.horizontalLayout_2.setSpacing(2)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label = QtWidgets.QLabel(self.limit_widget)
+        self.label = QtWidgets.QLabel(parent=self.limit_widget)
         self.label.setObjectName("label")
         self.horizontalLayout_2.addWidget(self.label)
-        self.xmin_lineedit = QtWidgets.QLineEdit(self.limit_widget)
+        self.xmin_lineedit = QtWidgets.QLineEdit(parent=self.limit_widget)
         self.xmin_lineedit.setObjectName("xmin_lineedit")
         self.horizontalLayout_2.addWidget(self.xmin_lineedit)
-        self.label_2 = QtWidgets.QLabel(self.limit_widget)
+        self.label_2 = QtWidgets.QLabel(parent=self.limit_widget)
         self.label_2.setObjectName("label_2")
         self.horizontalLayout_2.addWidget(self.label_2)
-        self.xmax_lineedit = QtWidgets.QLineEdit(self.limit_widget)
+        self.xmax_lineedit = QtWidgets.QLineEdit(parent=self.limit_widget)
         self.xmax_lineedit.setObjectName("xmax_lineedit")
         self.horizontalLayout_2.addWidget(self.xmax_lineedit)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_2.addItem(spacerItem1)
-        self.label_3 = QtWidgets.QLabel(self.limit_widget)
+        self.label_3 = QtWidgets.QLabel(parent=self.limit_widget)
         self.label_3.setObjectName("label_3")
         self.horizontalLayout_2.addWidget(self.label_3)
-        self.ymin_lineedit = QtWidgets.QLineEdit(self.limit_widget)
+        self.ymin_lineedit = QtWidgets.QLineEdit(parent=self.limit_widget)
         self.ymin_lineedit.setObjectName("ymin_lineedit")
         self.horizontalLayout_2.addWidget(self.ymin_lineedit)
-        self.label_4 = QtWidgets.QLabel(self.limit_widget)
+        self.label_4 = QtWidgets.QLabel(parent=self.limit_widget)
         self.label_4.setObjectName("label_4")
         self.horizontalLayout_2.addWidget(self.label_4)
-        self.ymax_lineedit = QtWidgets.QLineEdit(self.limit_widget)
+        self.ymax_lineedit = QtWidgets.QLineEdit(parent=self.limit_widget)
         self.ymax_lineedit.setObjectName("ymax_lineedit")
         self.horizontalLayout_2.addWidget(self.ymax_lineedit)
-        self.apply_button = QtWidgets.QPushButton(self.limit_widget)
+        self.apply_button = QtWidgets.QPushButton(parent=self.limit_widget)
         icon = QtGui.QIcon.fromTheme("dialog-ok")
         self.apply_button.setIcon(icon)
         self.apply_button.setObjectName("apply_button")
         self.horizontalLayout_2.addWidget(self.apply_button)
         self.verticalLayout.addWidget(self.limit_widget)
-        self.label_widget = QtWidgets.QWidget(GraphWindow)
+        self.label_widget = QtWidgets.QWidget(parent=GraphWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_widget.sizePolicy().hasHeightForWidth())
@@ -169,26 +168,26 @@ class Ui_GraphWindow(object):
         self.horizontalLayout_3.setContentsMargins(1, 1, 1, 1)
         self.horizontalLayout_3.setSpacing(2)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.label_5 = QtWidgets.QLabel(self.label_widget)
+        self.label_5 = QtWidgets.QLabel(parent=self.label_widget)
         self.label_5.setObjectName("label_5")
         self.horizontalLayout_3.addWidget(self.label_5)
-        self.title_lineedit = QtWidgets.QLineEdit(self.label_widget)
+        self.title_lineedit = QtWidgets.QLineEdit(parent=self.label_widget)
         self.title_lineedit.setObjectName("title_lineedit")
         self.horizontalLayout_3.addWidget(self.title_lineedit)
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_3.addItem(spacerItem2)
-        self.label_6 = QtWidgets.QLabel(self.label_widget)
+        self.label_6 = QtWidgets.QLabel(parent=self.label_widget)
         self.label_6.setObjectName("label_6")
         self.horizontalLayout_3.addWidget(self.label_6)
-        self.xaxis_linedit = QtWidgets.QLineEdit(self.label_widget)
+        self.xaxis_linedit = QtWidgets.QLineEdit(parent=self.label_widget)
         self.xaxis_linedit.setObjectName("xaxis_linedit")
         self.horizontalLayout_3.addWidget(self.xaxis_linedit)
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_3.addItem(spacerItem3)
-        self.label_7 = QtWidgets.QLabel(self.label_widget)
+        self.label_7 = QtWidgets.QLabel(parent=self.label_widget)
         self.label_7.setObjectName("label_7")
         self.horizontalLayout_3.addWidget(self.label_7)
-        self.yaxis_linedit = QtWidgets.QLineEdit(self.label_widget)
+        self.yaxis_linedit = QtWidgets.QLineEdit(parent=self.label_widget)
         self.yaxis_linedit.setObjectName("yaxis_linedit")
         self.horizontalLayout_3.addWidget(self.yaxis_linedit)
         self.verticalLayout.addWidget(self.label_widget)
@@ -196,20 +195,21 @@ class Ui_GraphWindow(object):
         self.gridLayout.setHorizontalSpacing(3)
         self.gridLayout.setVerticalSpacing(0)
         self.gridLayout.setObjectName("gridLayout")
-        self.listWidget = QtWidgets.QListWidget(GraphWindow)
+        self.listWidget = QListWidgetSelect(parent=GraphWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
         self.listWidget.setSizePolicy(sizePolicy)
+        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
         self.listWidget.setObjectName("listWidget")
         self.gridLayout.addWidget(self.listWidget, 1, 1, 1, 1)
-        self.checkBox = QtWidgets.QCheckBox(GraphWindow)
+        self.checkBox = QtWidgets.QCheckBox(parent=GraphWindow)
         self.checkBox.setChecked(True)
         self.checkBox.setObjectName("checkBox")
         self.gridLayout.addWidget(self.checkBox, 0, 1, 1, 1)
-        self.graphic = PlotWidget(GraphWindow)
+        self.graphic = NMRPlotWidget(parent=GraphWindow)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.graphic.sizePolicy().hasHeightForWidth())
@@ -269,7 +269,11 @@ class Ui_GraphWindow(object):
         self.label_4.setText(_translate("GraphWindow", "---"))
         self.apply_button.setText(_translate("GraphWindow", "Apply"))
         self.label_5.setText(_translate("GraphWindow", "Title"))
+        self.title_lineedit.setToolTip(_translate("GraphWindow", "<html><head/><body><p>Uses simple latex syntax, does not support italic/math environment. Sub-/superscripts need curly brackets.<br/></p><p>Example: \\alpha^{123}</p></body></html>"))
         self.label_6.setText(_translate("GraphWindow", "X Axis"))
+        self.xaxis_linedit.setToolTip(_translate("GraphWindow", "<html><head/><body><p>Uses simple latex syntax, does not support italic/math environment. Sub-/superscripts need curly brackets.<br/></p><p>Example: \\alpha^{123}</p></body></html>"))
         self.label_7.setText(_translate("GraphWindow", "Y Axis"))
+        self.yaxis_linedit.setToolTip(_translate("GraphWindow", "<html><head/><body><p>Uses simple latex syntax, does not support italic/math environment. Sub-/superscripts need curly brackets.<br/></p><p>Example: \\alpha^{123}</p></body></html>"))
         self.checkBox.setText(_translate("GraphWindow", "Show legend"))
-from pyqtgraph import PlotWidget
+from ..lib.graph_items import NMRPlotWidget
+from ..lib.listwidget import QListWidgetSelect

src/gui_qt/_py/guidelinewidget.py

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/guidelinewidget.ui'
-
-# Form implementation generated from reading ui file '/autohome/dominik/nmreval/src/resources/_ui/guidelinewidget.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
@@ -17,78 +15,78 @@ class Ui_Form(object):
         Form.resize(459, 830)
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(Form)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.graph_comboBox = QtWidgets.QComboBox(Form)
+        self.graph_comboBox = QtWidgets.QComboBox(parent=Form)
         self.graph_comboBox.setObjectName("graph_comboBox")
         self.verticalLayout_2.addWidget(self.graph_comboBox)
-        self.listWidget_2 = QtWidgets.QListWidget(Form)
+        self.listWidget_2 = QtWidgets.QListWidget(parent=Form)
         self.listWidget_2.setObjectName("listWidget_2")
         self.verticalLayout_2.addWidget(self.listWidget_2)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.pushButton = QtWidgets.QPushButton(Form)
+        self.pushButton = QtWidgets.QPushButton(parent=Form)
         self.pushButton.setObjectName("pushButton")
         self.horizontalLayout.addWidget(self.pushButton)
-        self.pushButton_2 = QtWidgets.QPushButton(Form)
+        self.pushButton_2 = QtWidgets.QPushButton(parent=Form)
         self.pushButton_2.setObjectName("pushButton_2")
         self.horizontalLayout.addWidget(self.pushButton_2)
-        self.pushButton_3 = QtWidgets.QPushButton(Form)
+        self.pushButton_3 = QtWidgets.QPushButton(parent=Form)
         self.pushButton_3.setObjectName("pushButton_3")
         self.horizontalLayout.addWidget(self.pushButton_3)
         self.verticalLayout_2.addLayout(self.horizontalLayout)
-        self.frame = QtWidgets.QFrame(Form)
+        self.frame = QtWidgets.QFrame(parent=Form)
-        self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
         self.frame.setObjectName("frame")
         self.formLayout = QtWidgets.QFormLayout(self.frame)
         self.formLayout.setObjectName("formLayout")
-        self.mode_comboBox = QtWidgets.QComboBox(self.frame)
+        self.mode_comboBox = QtWidgets.QComboBox(parent=self.frame)
         self.mode_comboBox.setObjectName("mode_comboBox")
         self.mode_comboBox.addItem("")
         self.mode_comboBox.addItem("")
         self.mode_comboBox.addItem("")
         self.mode_comboBox.addItem("")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.mode_comboBox)
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.mode_comboBox)
-        self.label_12 = QtWidgets.QLabel(self.frame)
+        self.label_12 = QtWidgets.QLabel(parent=self.frame)
         self.label_12.setObjectName("label_12")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_12)
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_12)
-        self.label_6 = QtWidgets.QLabel(self.frame)
+        self.label_6 = QtWidgets.QLabel(parent=self.frame)
         self.label_6.setObjectName("label_6")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_6)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_6)
-        self.comment_lineEdit = QtWidgets.QLineEdit(self.frame)
+        self.comment_lineEdit = QtWidgets.QLineEdit(parent=self.frame)
         self.comment_lineEdit.setObjectName("comment_lineEdit")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.comment_lineEdit)
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.comment_lineEdit)
-        self.label_2 = QtWidgets.QLabel(self.frame)
+        self.label_2 = QtWidgets.QLabel(parent=self.frame)
         self.label_2.setObjectName("label_2")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_2)
-        self.color_comboBox = ColorListEditor(self.frame)
+        self.color_comboBox = ColorListEditor(parent=self.frame)
         self.color_comboBox.setObjectName("color_comboBox")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.color_comboBox)
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.color_comboBox)
-        self.stackedWidget = QtWidgets.QStackedWidget(self.frame)
+        self.stackedWidget = QtWidgets.QStackedWidget(parent=self.frame)
         self.stackedWidget.setObjectName("stackedWidget")
         self.page = QtWidgets.QWidget()
         self.page.setObjectName("page")
         self.formLayout_2 = QtWidgets.QFormLayout(self.page)
         self.formLayout_2.setObjectName("formLayout_2")
-        self.label_13 = QtWidgets.QLabel(self.page)
+        self.label_13 = QtWidgets.QLabel(parent=self.page)
         self.label_13.setObjectName("label_13")
-        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_13)
+        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_13)
-        self.lineEdit_8 = QtWidgets.QLineEdit(self.page)
+        self.lineEdit_8 = QtWidgets.QLineEdit(parent=self.page)
         self.lineEdit_8.setObjectName("lineEdit_8")
-        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.lineEdit_8)
+        self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_8)
-        self.label = QtWidgets.QLabel(self.page)
+        self.label = QtWidgets.QLabel(parent=self.page)
         self.label.setObjectName("label")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label)
-        self.infiniteline_angle_spinbox = QtWidgets.QSpinBox(self.page)
+        self.infiniteline_angle_spinbox = QtWidgets.QSpinBox(parent=self.page)
         self.infiniteline_angle_spinbox.setWrapping(True)
         self.infiniteline_angle_spinbox.setMaximum(179)
         self.infiniteline_angle_spinbox.setObjectName("infiniteline_angle_spinbox")
-        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.infiniteline_angle_spinbox)
+        self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.infiniteline_angle_spinbox)
         self.stackedWidget.addWidget(self.page)
         self.page_2 = QtWidgets.QWidget()
         self.page_2.setObjectName("page_2")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.page_2)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.listWidget = QtWidgets.QListWidget(self.page_2)
+        self.listWidget = QtWidgets.QListWidget(parent=self.page_2)
         self.listWidget.setObjectName("listWidget")
         self.verticalLayout.addWidget(self.listWidget)
         self.stackedWidget.addWidget(self.page_2)
@@ -96,61 +94,61 @@ class Ui_Form(object):
         self.page_3.setObjectName("page_3")
         self.formLayout_3 = QtWidgets.QFormLayout(self.page_3)
         self.formLayout_3.setObjectName("formLayout_3")
-        self.label_5 = QtWidgets.QLabel(self.page_3)
+        self.label_5 = QtWidgets.QLabel(parent=self.page_3)
         self.label_5.setObjectName("label_5")
-        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_5)
-        self.lineEdit = QtWidgets.QLineEdit(self.page_3)
+        self.lineEdit = QtWidgets.QLineEdit(parent=self.page_3)
         self.lineEdit.setObjectName("lineEdit")
-        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.lineEdit)
+        self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit)
-        self.label_3 = QtWidgets.QLabel(self.page_3)
+        self.label_3 = QtWidgets.QLabel(parent=self.page_3)
         self.label_3.setObjectName("label_3")
-        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_3)
+        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
-        self.lineEdit_2 = QtWidgets.QLineEdit(self.page_3)
+        self.lineEdit_2 = QtWidgets.QLineEdit(parent=self.page_3)
         self.lineEdit_2.setObjectName("lineEdit_2")
-        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.lineEdit_2)
+        self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_2)
-        self.label_9 = QtWidgets.QLabel(self.page_3)
+        self.label_9 = QtWidgets.QLabel(parent=self.page_3)
         self.label_9.setObjectName("label_9")
-        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_9)
+        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_9)
-        self.lineEdit_3 = QtWidgets.QLineEdit(self.page_3)
+        self.lineEdit_3 = QtWidgets.QLineEdit(parent=self.page_3)
         self.lineEdit_3.setObjectName("lineEdit_3")
-        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.lineEdit_3)
+        self.formLayout_3.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_3)
-        self.label_4 = QtWidgets.QLabel(self.page_3)
+        self.label_4 = QtWidgets.QLabel(parent=self.page_3)
         self.label_4.setObjectName("label_4")
-        self.formLayout_3.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_4)
+        self.formLayout_3.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_4)
-        self.spinBox = QtWidgets.QSpinBox(self.page_3)
+        self.spinBox = QtWidgets.QSpinBox(parent=self.page_3)
         self.spinBox.setObjectName("spinBox")
-        self.formLayout_3.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.spinBox)
+        self.formLayout_3.setWidget(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.spinBox)
         self.stackedWidget.addWidget(self.page_3)
         self.page_4 = QtWidgets.QWidget()
         self.page_4.setObjectName("page_4")
         self.formLayout_4 = QtWidgets.QFormLayout(self.page_4)
         self.formLayout_4.setObjectName("formLayout_4")
-        self.label_7 = QtWidgets.QLabel(self.page_4)
+        self.label_7 = QtWidgets.QLabel(parent=self.page_4)
         self.label_7.setObjectName("label_7")
-        self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_7)
+        self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_7)
-        self.lineEdit_4 = QtWidgets.QLineEdit(self.page_4)
+        self.lineEdit_4 = QtWidgets.QLineEdit(parent=self.page_4)
         self.lineEdit_4.setObjectName("lineEdit_4")
-        self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.lineEdit_4)
+        self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_4)
-        self.label_8 = QtWidgets.QLabel(self.page_4)
+        self.label_8 = QtWidgets.QLabel(parent=self.page_4)
         self.label_8.setObjectName("label_8")
-        self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_8)
+        self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_8)
-        self.lineEdit_5 = QtWidgets.QLineEdit(self.page_4)
+        self.lineEdit_5 = QtWidgets.QLineEdit(parent=self.page_4)
         self.lineEdit_5.setObjectName("lineEdit_5")
-        self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.lineEdit_5)
+        self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_5)
-        self.label_10 = QtWidgets.QLabel(self.page_4)
+        self.label_10 = QtWidgets.QLabel(parent=self.page_4)
         self.label_10.setObjectName("label_10")
-        self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_10)
+        self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_10)
-        self.lineEdit_6 = QtWidgets.QLineEdit(self.page_4)
+        self.lineEdit_6 = QtWidgets.QLineEdit(parent=self.page_4)
         self.lineEdit_6.setObjectName("lineEdit_6")
-        self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.lineEdit_6)
+        self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_6)
-        self.label_11 = QtWidgets.QLabel(self.page_4)
+        self.label_11 = QtWidgets.QLabel(parent=self.page_4)
         self.label_11.setObjectName("label_11")
-        self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_11)
+        self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_11)
-        self.lineEdit_7 = QtWidgets.QLineEdit(self.page_4)
+        self.lineEdit_7 = QtWidgets.QLineEdit(parent=self.page_4)
         self.lineEdit_7.setObjectName("lineEdit_7")
-        self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.lineEdit_7)
+        self.formLayout_4.setWidget(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_7)
         self.stackedWidget.addWidget(self.page_4)
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.SpanningRole, self.stackedWidget)
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.SpanningRole, self.stackedWidget)
         self.verticalLayout_2.addWidget(self.frame)
         self.label_6.setBuddy(self.comment_lineEdit)
         self.label_2.setBuddy(self.color_comboBox)

src/gui_qt/_py/hdftree.py

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/hdftree.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/hdftree.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Hdf_Dialog(object):
@@ -17,15 +15,15 @@ class Ui_Hdf_Dialog(object):
         Hdf_Dialog.resize(460, 772)
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(Hdf_Dialog)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.label_3 = QtWidgets.QLabel(Hdf_Dialog)
+        self.label_3 = QtWidgets.QLabel(parent=Hdf_Dialog)
-        self.label_3.setTextFormat(QtCore.Qt.RichText)
+        self.label_3.setTextFormat(QtCore.Qt.TextFormat.RichText)
         self.label_3.setObjectName("label_3")
         self.verticalLayout_2.addWidget(self.label_3)
-        self.splitter = QtWidgets.QSplitter(Hdf_Dialog)
+        self.splitter = QtWidgets.QSplitter(parent=Hdf_Dialog)
-        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Vertical)
         self.splitter.setChildrenCollapsible(False)
         self.splitter.setObjectName("splitter")
-        self.horizontalLayoutWidget = QtWidgets.QWidget(self.splitter)
+        self.horizontalLayoutWidget = QtWidgets.QWidget(parent=self.splitter)
         self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.horizontalLayoutWidget)
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
@@ -34,41 +32,41 @@ class Ui_Hdf_Dialog(object):
         self.verticalLayout_3 = QtWidgets.QVBoxLayout()
         self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.verticalLayout.addLayout(self.verticalLayout_3)
-        self.widget = QtWidgets.QWidget(self.horizontalLayoutWidget)
+        self.widget = QtWidgets.QWidget(parent=self.horizontalLayoutWidget)
         self.widget.setObjectName("widget")
         self.gridLayout = QtWidgets.QGridLayout(self.widget)
         self.gridLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout.setSpacing(2)
         self.gridLayout.setObjectName("gridLayout")
-        self.label = QtWidgets.QLabel(self.widget)
+        self.label = QtWidgets.QLabel(parent=self.widget)
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.comboBox_2 = QtWidgets.QComboBox(self.widget)
+        self.comboBox_2 = QtWidgets.QComboBox(parent=self.widget)
         self.comboBox_2.setObjectName("comboBox_2")
         self.gridLayout.addWidget(self.comboBox_2, 1, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.widget)
+        self.label_2 = QtWidgets.QLabel(parent=self.widget)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
-        self.comboBox = QtWidgets.QComboBox(self.widget)
+        self.comboBox = QtWidgets.QComboBox(parent=self.widget)
         self.comboBox.setObjectName("comboBox")
         self.gridLayout.addWidget(self.comboBox, 0, 1, 1, 1)
         self.verticalLayout.addWidget(self.widget)
-        self.widget_2 = ExpandableWidget(self.splitter)
+        self.widget_2 = ExpandableWidget(parent=self.splitter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.widget_2.sizePolicy().hasHeightForWidth())
         self.widget_2.setSizePolicy(sizePolicy)
         self.widget_2.setObjectName("widget_2")
         self.verticalLayout_2.addWidget(self.splitter)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Hdf_Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Hdf_Dialog)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout_2.addWidget(self.buttonBox)
 
         self.retranslateUi(Hdf_Dialog)
-        self.buttonBox.rejected.connect(Hdf_Dialog.close)
+        self.buttonBox.rejected.connect(Hdf_Dialog.close) # type: ignore
-        self.buttonBox.accepted.connect(Hdf_Dialog.accept)
+        self.buttonBox.accepted.connect(Hdf_Dialog.accept) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Hdf_Dialog)
 
     def retranslateUi(self, Hdf_Dialog):

src/gui_qt/_py/integral_widget.py

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/integral_widget.ui'
-
-# Form implementation generated from reading ui file '/autohome/dominik/nmreval/src/resources/_ui/integral_widget.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
@@ -19,15 +17,14 @@ class Ui_Form(object):
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.label_2 = QtWidgets.QLabel(Form)
+        self.label_2 = QtWidgets.QLabel(parent=Form)
         self.label_2.setObjectName("label_2")
         self.verticalLayout.addWidget(self.label_2)
-        self.set_combobox = QtWidgets.QComboBox(Form)
+        self.set_combobox = QtWidgets.QComboBox(parent=Form)
         self.set_combobox.setObjectName("set_combobox")
         self.verticalLayout.addWidget(self.set_combobox)
-        self.treeWidget = QtWidgets.QTreeWidget(Form)
+        self.treeWidget = QtWidgets.QTreeWidget(parent=Form)
-        self.treeWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.treeWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
-        self.treeWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
         self.treeWidget.setHeaderHidden(True)
         self.treeWidget.setObjectName("treeWidget")
         self.treeWidget.headerItem().setText(0, "1")
@@ -35,10 +32,10 @@ class Ui_Form(object):
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(Form)
+        self.label = QtWidgets.QLabel(parent=Form)
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
-        self.pushButton = QtWidgets.QPushButton(Form)
+        self.pushButton = QtWidgets.QPushButton(parent=Form)
         self.pushButton.setObjectName("pushButton")
         self.horizontalLayout.addWidget(self.pushButton)
         self.verticalLayout.addLayout(self.horizontalLayout)

src/gui_qt/_py/integratederive_dialog.py

@@ -1,74 +1,76 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/integratederive_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/integratederive_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(400, 308)
+        Dialog.resize(400, 375)
         self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.listWidget = QtWidgets.QListWidget(Dialog)
+        self.listWidget = QtWidgets.QListWidget(parent=Dialog)
         self.listWidget.setObjectName("listWidget")
         self.verticalLayout.addWidget(self.listWidget)
-        self.widget = QtWidgets.QWidget(Dialog)
+        self.widget = QtWidgets.QWidget(parent=Dialog)
         self.widget.setObjectName("widget")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.widget)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(self.widget)
+        self.label = QtWidgets.QLabel(parent=self.widget)
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
-        self.start_lineedit = QtWidgets.QLineEdit(self.widget)
+        self.start_lineedit = QtWidgets.QLineEdit(parent=self.widget)
         self.start_lineedit.setEnabled(False)
         self.start_lineedit.setObjectName("start_lineedit")
         self.horizontalLayout.addWidget(self.start_lineedit)
-        self.stop_lineedit = QtWidgets.QLineEdit(self.widget)
+        self.stop_lineedit = QtWidgets.QLineEdit(parent=self.widget)
         self.stop_lineedit.setEnabled(False)
         self.stop_lineedit.setObjectName("stop_lineedit")
         self.horizontalLayout.addWidget(self.stop_lineedit)
-        self.range_checkbox = QtWidgets.QCheckBox(self.widget)
+        self.range_checkbox = QtWidgets.QCheckBox(parent=self.widget)
         self.range_checkbox.setChecked(True)
         self.range_checkbox.setObjectName("range_checkbox")
         self.horizontalLayout.addWidget(self.range_checkbox)
         self.verticalLayout.addWidget(self.widget)
-        self.ft_comboBox = QtWidgets.QComboBox(Dialog)
+        self.ft_comboBox = QtWidgets.QComboBox(parent=Dialog)
         self.ft_comboBox.setObjectName("ft_comboBox")
         self.ft_comboBox.addItem("")
         self.ft_comboBox.addItem("")
         self.ft_comboBox.addItem("")
         self.verticalLayout.addWidget(self.ft_comboBox)
-        self.log_checkbox = QtWidgets.QCheckBox(Dialog)
+        self.log_checkbox = QtWidgets.QCheckBox(parent=Dialog)
         self.log_checkbox.setObjectName("log_checkbox")
         self.verticalLayout.addWidget(self.log_checkbox)
+        self.freq_box = QtWidgets.QCheckBox(parent=Dialog)
+        self.freq_box.setObjectName("freq_box")
+        self.verticalLayout.addWidget(self.freq_box)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout_2.setSpacing(3)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.newgraph_checkbox = QtWidgets.QCheckBox(Dialog)
+        self.newgraph_checkbox = QtWidgets.QCheckBox(parent=Dialog)
         self.newgraph_checkbox.setObjectName("newgraph_checkbox")
         self.horizontalLayout_2.addWidget(self.newgraph_checkbox)
-        self.graph_combobox = QtWidgets.QComboBox(Dialog)
+        self.graph_combobox = QtWidgets.QComboBox(parent=Dialog)
         self.graph_combobox.setObjectName("graph_combobox")
         self.horizontalLayout_2.addWidget(self.graph_combobox)
         self.verticalLayout.addLayout(self.horizontalLayout_2)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):
@@ -80,4 +82,5 @@ class Ui_Dialog(object):
         self.ft_comboBox.setItemText(1, _translate("Dialog", "Imag"))
         self.ft_comboBox.setItemText(2, _translate("Dialog", "Complex"))
         self.log_checkbox.setText(_translate("Dialog", "use logarithmic x axis"))
+        self.freq_box.setText(_translate("Dialog", "return x axis as f, not omega"))
         self.newgraph_checkbox.setText(_translate("Dialog", "New graph"))

src/gui_qt/_py/interpol_dialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/interpol_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/interpol_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
@@ -18,108 +17,109 @@ class Ui_Dialog(object):
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        self.src_widget = QtWidgets.QWidget(Dialog)
+        self.src_widget = QtWidgets.QWidget(parent=Dialog)
         self.src_widget.setObjectName("src_widget")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.src_widget)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.graph_combobox = QtWidgets.QComboBox(self.src_widget)
+        self.graph_combobox = QtWidgets.QComboBox(parent=self.src_widget)
         self.graph_combobox.setObjectName("graph_combobox")
         self.horizontalLayout.addWidget(self.graph_combobox)
-        self.set_combobox = QtWidgets.QComboBox(self.src_widget)
+        self.set_combobox = QtWidgets.QComboBox(parent=self.src_widget)
         self.set_combobox.setObjectName("set_combobox")
         self.horizontalLayout.addWidget(self.set_combobox)
         self.gridLayout.addWidget(self.src_widget, 8, 0, 1, 2)
-        self.label_3 = QtWidgets.QLabel(Dialog)
+        self.label_3 = QtWidgets.QLabel(parent=Dialog)
         self.label_3.setObjectName("label_3")
         self.gridLayout.addWidget(self.label_3, 0, 0, 1, 1)
-        self.label = QtWidgets.QLabel(Dialog)
+        self.label = QtWidgets.QLabel(parent=Dialog)
         self.label.setToolTip("")
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 4, 0, 1, 1)
-        self.line_2 = QtWidgets.QFrame(Dialog)
+        self.line_2 = QtWidgets.QFrame(parent=Dialog)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.gridLayout.addWidget(self.line_2, 5, 0, 1, 2)
-        self.ylog_checkBox = QtWidgets.QCheckBox(Dialog)
+        self.ylog_checkBox = QtWidgets.QCheckBox(parent=Dialog)
         self.ylog_checkBox.setObjectName("ylog_checkBox")
         self.gridLayout.addWidget(self.ylog_checkBox, 2, 1, 1, 1)
-        self.interp_comboBox = QtWidgets.QComboBox(Dialog)
+        self.interp_comboBox = QtWidgets.QComboBox(parent=Dialog)
         self.interp_comboBox.setToolTip("")
         self.interp_comboBox.setObjectName("interp_comboBox")
         self.interp_comboBox.addItem("")
         self.interp_comboBox.addItem("")
         self.gridLayout.addWidget(self.interp_comboBox, 4, 1, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 12, 0, 1, 2)
-        self.line = QtWidgets.QFrame(Dialog)
+        self.line = QtWidgets.QFrame(parent=Dialog)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.gridLayout.addWidget(self.line, 3, 0, 1, 2)
-        self.label_2 = QtWidgets.QLabel(Dialog)
+        self.label_2 = QtWidgets.QLabel(parent=Dialog)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 6, 0, 1, 1)
-        self.listWidget = QtWidgets.QListWidget(Dialog)
+        self.listWidget = QListWidgetSelect(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
         self.listWidget.setSizePolicy(sizePolicy)
+        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.MultiSelection)
         self.listWidget.setObjectName("listWidget")
         self.gridLayout.addWidget(self.listWidget, 1, 0, 1, 2)
-        self.sampling_widget = QtWidgets.QWidget(Dialog)
+        self.sampling_widget = QtWidgets.QWidget(parent=Dialog)
         self.sampling_widget.setObjectName("sampling_widget")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.sampling_widget)
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_2.setSpacing(3)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label_4 = QtWidgets.QLabel(self.sampling_widget)
+        self.label_4 = QtWidgets.QLabel(parent=self.sampling_widget)
         self.label_4.setObjectName("label_4")
         self.horizontalLayout_2.addWidget(self.label_4)
-        self.start_lineEdit = QtWidgets.QLineEdit(self.sampling_widget)
+        self.start_lineEdit = QtWidgets.QLineEdit(parent=self.sampling_widget)
         self.start_lineEdit.setObjectName("start_lineEdit")
         self.horizontalLayout_2.addWidget(self.start_lineEdit)
-        self.label_5 = QtWidgets.QLabel(self.sampling_widget)
+        self.label_5 = QtWidgets.QLabel(parent=self.sampling_widget)
         self.label_5.setObjectName("label_5")
         self.horizontalLayout_2.addWidget(self.label_5)
-        self.stop_lineEdit = QtWidgets.QLineEdit(self.sampling_widget)
+        self.stop_lineEdit = QtWidgets.QLineEdit(parent=self.sampling_widget)
         self.stop_lineEdit.setObjectName("stop_lineEdit")
         self.horizontalLayout_2.addWidget(self.stop_lineEdit)
-        self.label_6 = QtWidgets.QLabel(self.sampling_widget)
+        self.label_6 = QtWidgets.QLabel(parent=self.sampling_widget)
         self.label_6.setObjectName("label_6")
         self.horizontalLayout_2.addWidget(self.label_6)
-        self.step_lineEdit = QtWidgets.QLineEdit(self.sampling_widget)
+        self.step_lineEdit = QtWidgets.QLineEdit(parent=self.sampling_widget)
         self.step_lineEdit.setObjectName("step_lineEdit")
         self.horizontalLayout_2.addWidget(self.step_lineEdit)
-        self.logspace_checkBox = QtWidgets.QCheckBox(self.sampling_widget)
+        self.logspace_checkBox = QtWidgets.QCheckBox(parent=self.sampling_widget)
         self.logspace_checkBox.setObjectName("logspace_checkBox")
         self.horizontalLayout_2.addWidget(self.logspace_checkBox)
         self.gridLayout.addWidget(self.sampling_widget, 7, 0, 1, 2)
-        self.xaxis_comboBox = QtWidgets.QComboBox(Dialog)
+        self.xaxis_comboBox = QtWidgets.QComboBox(parent=Dialog)
         self.xaxis_comboBox.setObjectName("xaxis_comboBox")
         self.xaxis_comboBox.addItem("")
         self.xaxis_comboBox.addItem("")
         self.gridLayout.addWidget(self.xaxis_comboBox, 6, 1, 1, 1)
-        self.line_3 = QtWidgets.QFrame(Dialog)
+        self.line_3 = QtWidgets.QFrame(parent=Dialog)
-        self.line_3.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_3.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_3.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_3.setObjectName("line_3")
         self.gridLayout.addWidget(self.line_3, 9, 0, 1, 2)
-        self.dest_combobox = QtWidgets.QComboBox(Dialog)
+        self.dest_combobox = QtWidgets.QComboBox(parent=Dialog)
         self.dest_combobox.setObjectName("dest_combobox")
         self.gridLayout.addWidget(self.dest_combobox, 10, 1, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.gridLayout.addItem(spacerItem, 11, 0, 1, 1)
-        self.label_8 = QtWidgets.QLabel(Dialog)
+        self.label_8 = QtWidgets.QLabel(parent=Dialog)
         self.label_8.setObjectName("label_8")
         self.gridLayout.addWidget(self.label_8, 10, 0, 1, 1)
-        self.xlog_checkBox = QtWidgets.QCheckBox(Dialog)
+        self.xlog_checkBox = QtWidgets.QCheckBox(parent=Dialog)
         self.xlog_checkBox.setObjectName("xlog_checkBox")
         self.gridLayout.addWidget(self.xlog_checkBox, 2, 0, 1, 1)
         self.label.setBuddy(self.interp_comboBox)
@@ -130,8 +130,6 @@ class Ui_Dialog(object):
         self.label_8.setBuddy(self.dest_combobox)
 
         self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
-        self.buttonBox.rejected.connect(Dialog.reject)
         QtCore.QMetaObject.connectSlotsByName(Dialog)
         Dialog.setTabOrder(self.listWidget, self.ylog_checkBox)
         Dialog.setTabOrder(self.ylog_checkBox, self.interp_comboBox)
@@ -164,3 +162,4 @@ class Ui_Dialog(object):
         self.xaxis_comboBox.setItemText(1, _translate("Dialog", "from data"))
         self.label_8.setText(_translate("Dialog", "Add interpolated data to"))
         self.xlog_checkBox.setText(_translate("Dialog", "use log(x)"))
+from ..lib.listwidget import QListWidgetSelect

src/gui_qt/_py/lineedit_dialog.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/lineedit_dialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_LineEdit_Dialog(object):
-    def setupUi(self, LineEdit_Dialog):
-        LineEdit_Dialog.setObjectName("LineEdit_Dialog")
-        LineEdit_Dialog.resize(400, 84)
-        self.formLayout = QtWidgets.QFormLayout(LineEdit_Dialog)
-        self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow)
-        self.formLayout.setObjectName("formLayout")
-        self.label = QtWidgets.QLabel(LineEdit_Dialog)
-        self.label.setObjectName("label")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label)
-        self.new_string = QtWidgets.QLineEdit(LineEdit_Dialog)
-        self.new_string.setObjectName("new_string")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.new_string)
-        self.buttonBox = QtWidgets.QDialogButtonBox(LineEdit_Dialog)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.SpanningRole, self.buttonBox)
-
-        self.retranslateUi(LineEdit_Dialog)
-        self.buttonBox.accepted.connect(LineEdit_Dialog.accept)
-        self.buttonBox.rejected.connect(LineEdit_Dialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(LineEdit_Dialog)
-
-    def retranslateUi(self, LineEdit_Dialog):
-        _translate = QtCore.QCoreApplication.translate
-        LineEdit_Dialog.setWindowTitle(_translate("LineEdit_Dialog", "Dialog"))
-        self.label.setText(_translate("LineEdit_Dialog", "Label"))

src/gui_qt/_py/mean_form.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/mean_form.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/mean_form.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_mean_form(object):
@@ -17,35 +16,35 @@ class Ui_mean_form(object):
         self.horizontalLayout = QtWidgets.QHBoxLayout(mean_form)
         self.horizontalLayout.setContentsMargins(1, 1, 1, 1)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(mean_form)
+        self.label = QtWidgets.QLabel(parent=mean_form)
-        self.label.setAlignment(QtCore.Qt.AlignCenter)
+        self.label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
-        self.digit_checkbox = QtWidgets.QCheckBox(mean_form)
+        self.digit_checkbox = QtWidgets.QCheckBox(parent=mean_form)
         self.digit_checkbox.setChecked(True)
         self.digit_checkbox.setObjectName("digit_checkbox")
         self.horizontalLayout.addWidget(self.digit_checkbox)
-        self.lineEdit = QtWidgets.QLineEdit(mean_form)
+        self.lineEdit = QtWidgets.QLineEdit(parent=mean_form)
         self.lineEdit.setObjectName("lineEdit")
         self.horizontalLayout.addWidget(self.lineEdit)
-        self.data_checkbox = QtWidgets.QCheckBox(mean_form)
+        self.data_checkbox = QtWidgets.QCheckBox(parent=mean_form)
         self.data_checkbox.setObjectName("data_checkbox")
         self.horizontalLayout.addWidget(self.data_checkbox)
-        self.frame = QtWidgets.QFrame(mean_form)
+        self.frame = QtWidgets.QFrame(parent=mean_form)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
         self.frame.setObjectName("frame")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.frame)
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_2.setSpacing(2)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.graph_combobox = QtWidgets.QComboBox(self.frame)
+        self.graph_combobox = QtWidgets.QComboBox(parent=self.frame)
         self.graph_combobox.setObjectName("graph_combobox")
         self.horizontalLayout_2.addWidget(self.graph_combobox)
-        self.set_combobox = QtWidgets.QComboBox(self.frame)
+        self.set_combobox = QtWidgets.QComboBox(parent=self.frame)
-        self.set_combobox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+        self.set_combobox.setSizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents)
         self.set_combobox.setObjectName("set_combobox")
         self.horizontalLayout_2.addWidget(self.set_combobox)
         self.horizontalLayout.addWidget(self.frame)

src/gui_qt/_py/meandialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/meandialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/meandialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_calc_means_dialog(object):
@@ -17,7 +16,7 @@ class Ui_calc_means_dialog(object):
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(calc_means_dialog)
         self.verticalLayout_2.setSpacing(3)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.dist_combobox = QtWidgets.QComboBox(calc_means_dialog)
+        self.dist_combobox = QtWidgets.QComboBox(parent=calc_means_dialog)
         self.dist_combobox.setObjectName("dist_combobox")
         self.verticalLayout_2.addWidget(self.dist_combobox)
         self.verticalLayout = QtWidgets.QVBoxLayout()
@@ -25,15 +24,15 @@ class Ui_calc_means_dialog(object):
         self.verticalLayout_2.addLayout(self.verticalLayout)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.from_combobox = QtWidgets.QComboBox(calc_means_dialog)
+        self.from_combobox = QtWidgets.QComboBox(parent=calc_means_dialog)
         self.from_combobox.setObjectName("from_combobox")
         self.from_combobox.addItem("")
         self.from_combobox.addItem("")
         self.from_combobox.addItem("")
         self.from_combobox.addItem("")
         self.horizontalLayout.addWidget(self.from_combobox)
-        self.label_4 = QtWidgets.QLabel(calc_means_dialog)
+        self.label_4 = QtWidgets.QLabel(parent=calc_means_dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
@@ -43,7 +42,7 @@ class Ui_calc_means_dialog(object):
         self.label_4.setFont(font)
         self.label_4.setObjectName("label_4")
         self.horizontalLayout.addWidget(self.label_4)
-        self.to_combobox = QtWidgets.QComboBox(calc_means_dialog)
+        self.to_combobox = QtWidgets.QComboBox(parent=calc_means_dialog)
         self.to_combobox.setObjectName("to_combobox")
         self.to_combobox.addItem("")
         self.to_combobox.addItem("")
@@ -51,28 +50,28 @@ class Ui_calc_means_dialog(object):
         self.to_combobox.addItem("")
         self.horizontalLayout.addWidget(self.to_combobox)
         self.verticalLayout_2.addLayout(self.horizontalLayout)
-        self.line = QtWidgets.QFrame(calc_means_dialog)
+        self.line = QtWidgets.QFrame(parent=calc_means_dialog)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.verticalLayout_2.addWidget(self.line)
-        self.label = QtWidgets.QLabel(calc_means_dialog)
+        self.label = QtWidgets.QLabel(parent=calc_means_dialog)
         self.label.setObjectName("label")
         self.verticalLayout_2.addWidget(self.label)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout_2.addItem(spacerItem)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.checkBox = QtWidgets.QCheckBox(calc_means_dialog)
+        self.checkBox = QtWidgets.QCheckBox(parent=calc_means_dialog)
         self.checkBox.setObjectName("checkBox")
         self.horizontalLayout_2.addWidget(self.checkBox)
-        self.graph_combobox = QtWidgets.QComboBox(calc_means_dialog)
+        self.graph_combobox = QtWidgets.QComboBox(parent=calc_means_dialog)
         self.graph_combobox.setObjectName("graph_combobox")
         self.horizontalLayout_2.addWidget(self.graph_combobox)
         self.verticalLayout_2.addLayout(self.horizontalLayout_2)
-        self.buttonBox = QtWidgets.QDialogButtonBox(calc_means_dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=calc_means_dialog)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout_2.addWidget(self.buttonBox)
 

src/gui_qt/_py/modelwidget.py

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/modelwidget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(188, 44)
-        self.horizontalLayout = QtWidgets.QHBoxLayout(Form)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(Form)
-        self.label.setObjectName("label")
-        self.horizontalLayout.addWidget(self.label)
-        self.lineEdit = QtWidgets.QLineEdit(Form)
-        self.lineEdit.setObjectName("lineEdit")
-        self.horizontalLayout.addWidget(self.lineEdit)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "Form"))
-        self.label.setText(_translate("Form", "TextLabel"))

src/gui_qt/_py/move_dialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/move_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/move_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_MoveDialog(object):
@@ -17,56 +16,56 @@ class Ui_MoveDialog(object):
         self.gridLayout = QtWidgets.QGridLayout(MoveDialog)
         self.gridLayout.setVerticalSpacing(1)
         self.gridLayout.setObjectName("gridLayout")
-        self.tocomboBox = QtWidgets.QComboBox(MoveDialog)
+        self.tocomboBox = QtWidgets.QComboBox(parent=MoveDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.tocomboBox.sizePolicy().hasHeightForWidth())
         self.tocomboBox.setSizePolicy(sizePolicy)
         self.tocomboBox.setObjectName("tocomboBox")
         self.gridLayout.addWidget(self.tocomboBox, 3, 1, 1, 1)
-        self.fromcomboBox = QtWidgets.QComboBox(MoveDialog)
+        self.fromcomboBox = QtWidgets.QComboBox(parent=MoveDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.fromcomboBox.sizePolicy().hasHeightForWidth())
         self.fromcomboBox.setSizePolicy(sizePolicy)
         self.fromcomboBox.setObjectName("fromcomboBox")
         self.gridLayout.addWidget(self.fromcomboBox, 0, 1, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(MoveDialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=MoveDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 6, 0, 1, 2)
-        self.label_2 = QtWidgets.QLabel(MoveDialog)
+        self.label_2 = QtWidgets.QLabel(parent=MoveDialog)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 3, 0, 1, 1)
-        self.line = QtWidgets.QFrame(MoveDialog)
+        self.line = QtWidgets.QFrame(parent=MoveDialog)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.gridLayout.addWidget(self.line, 4, 0, 1, 2)
-        self.label = QtWidgets.QLabel(MoveDialog)
+        self.label = QtWidgets.QLabel(parent=MoveDialog)
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.copy_button = QtWidgets.QRadioButton(MoveDialog)
+        self.copy_button = QtWidgets.QRadioButton(parent=MoveDialog)
         self.copy_button.setObjectName("copy_button")
         self.buttonGroup = QtWidgets.QButtonGroup(MoveDialog)
         self.buttonGroup.setObjectName("buttonGroup")
         self.buttonGroup.addButton(self.copy_button)
         self.horizontalLayout.addWidget(self.copy_button)
-        self.move_button = QtWidgets.QRadioButton(MoveDialog)
+        self.move_button = QtWidgets.QRadioButton(parent=MoveDialog)
         self.move_button.setChecked(True)
         self.move_button.setObjectName("move_button")
         self.buttonGroup.addButton(self.move_button)
         self.horizontalLayout.addWidget(self.move_button)
         self.gridLayout.addLayout(self.horizontalLayout, 5, 0, 1, 2)
-        self.listWidget = QtWidgets.QListWidget(MoveDialog)
+        self.listWidget = QtWidgets.QListWidget(parent=MoveDialog)
-        self.listWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.listWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
-        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
+        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.MultiSelection)
         self.listWidget.setObjectName("listWidget")
         self.gridLayout.addWidget(self.listWidget, 1, 1, 1, 1)
         self.label_2.setBuddy(self.tocomboBox)

src/gui_qt/_py/movedialog.py

@@ -0,0 +1,8 @@
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/movedialog.ui'
+#
+# Created by: PyQt6 UI code generator 6.7.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+

src/gui_qt/_py/namespace_widget.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/namespace_widget.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/namespace_widget.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
@@ -18,23 +17,23 @@ class Ui_Form(object):
         self.gridLayout_2.setContentsMargins(1, 1, 1, 1)
         self.gridLayout_2.setSpacing(3)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.groups_comboBox = QtWidgets.QComboBox(Form)
+        self.groups_comboBox = QtWidgets.QComboBox(parent=Form)
         self.groups_comboBox.setObjectName("groups_comboBox")
         self.gridLayout_2.addWidget(self.groups_comboBox, 0, 0, 1, 1)
-        self.subgroups_comboBox = QtWidgets.QComboBox(Form)
+        self.subgroups_comboBox = QtWidgets.QComboBox(parent=Form)
         self.subgroups_comboBox.setObjectName("subgroups_comboBox")
         self.gridLayout_2.addWidget(self.subgroups_comboBox, 0, 1, 1, 1)
-        self.namespace_table = QtWidgets.QTableWidget(Form)
+        self.namespace_table = QtWidgets.QTableWidget(parent=Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.namespace_table.sizePolicy().hasHeightForWidth())
         self.namespace_table.setSizePolicy(sizePolicy)
         self.namespace_table.setMinimumSize(QtCore.QSize(0, 0))
-        self.namespace_table.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.namespace_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
-        self.namespace_table.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
+        self.namespace_table.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection)
-        self.namespace_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.namespace_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
-        self.namespace_table.setTextElideMode(QtCore.Qt.ElideNone)
+        self.namespace_table.setTextElideMode(QtCore.Qt.TextElideMode.ElideNone)
         self.namespace_table.setColumnCount(2)
         self.namespace_table.setObjectName("namespace_table")
         self.namespace_table.setRowCount(5)

src/gui_qt/_py/option_selection.py

@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/option_selection.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(400, 182)
-        self.gridLayout = QtWidgets.QGridLayout(Form)
-        self.gridLayout.setObjectName("gridLayout")
-        self.tableWidget = QtWidgets.QTableWidget(Form)
-        self.tableWidget.setObjectName("tableWidget")
-        self.tableWidget.setColumnCount(2)
-        self.tableWidget.setRowCount(0)
-        item = QtWidgets.QTableWidgetItem()
-        self.tableWidget.setHorizontalHeaderItem(0, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.tableWidget.setHorizontalHeaderItem(1, item)
-        self.gridLayout.addWidget(self.tableWidget, 1, 1, 1, 1)
-        self.verticalLayout = QtWidgets.QVBoxLayout()
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.label_2 = QtWidgets.QLabel(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
-        self.label_2.setSizePolicy(sizePolicy)
-        self.label_2.setObjectName("label_2")
-        self.verticalLayout.addWidget(self.label_2)
-        self.lineEdit = QtWidgets.QLineEdit(Form)
-        self.lineEdit.setObjectName("lineEdit")
-        self.verticalLayout.addWidget(self.lineEdit)
-        self.label = QtWidgets.QLabel(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setObjectName("label")
-        self.verticalLayout.addWidget(self.label)
-        self.comboBox = QtWidgets.QComboBox(Form)
-        self.comboBox.setObjectName("comboBox")
-        self.verticalLayout.addWidget(self.comboBox)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem)
-        self.gridLayout.addLayout(self.verticalLayout, 1, 0, 1, 1)
-        self.pushButton = QtWidgets.QPushButton(Form)
-        self.pushButton.setObjectName("pushButton")
-        self.gridLayout.addWidget(self.pushButton, 2, 1, 1, 1)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "Form"))
-        item = self.tableWidget.horizontalHeaderItem(0)
-        item.setText(_translate("Form", "Name"))
-        item = self.tableWidget.horizontalHeaderItem(1)
-        item.setText(_translate("Form", "Value"))
-        self.label_2.setText(_translate("Form", "Nice name"))
-        self.label.setText(_translate("Form", "TextLabel"))
-        self.pushButton.setText(_translate("Form", "Add option"))

src/gui_qt/_py/parameterform.py

@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/parameterform.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_parameterform(object):
-    def setupUi(self, parameterform):
-        parameterform.setObjectName("parameterform")
-        parameterform.setWindowModality(QtCore.Qt.WindowModal)
-        parameterform.resize(290, 37)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(parameterform.sizePolicy().hasHeightForWidth())
-        parameterform.setSizePolicy(sizePolicy)
-        parameterform.setAutoFillBackground(True)
-        self.horizontalLayout = QtWidgets.QHBoxLayout(parameterform)
-        self.horizontalLayout.setContentsMargins(1, 1, 1, 1)
-        self.horizontalLayout.setSpacing(2)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.line_2 = QtWidgets.QFrame(parameterform)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line_2.setObjectName("line_2")
-        self.horizontalLayout.addWidget(self.line_2)
-        self.label = QtWidgets.QLabel(parameterform)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(10)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.label.setObjectName("label")
-        self.horizontalLayout.addWidget(self.label)
-        spacerItem = QtWidgets.QSpacerItem(65, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
-        self.vals = QtWidgets.QLineEdit(parameterform)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.vals.sizePolicy().hasHeightForWidth())
-        self.vals.setSizePolicy(sizePolicy)
-        self.vals.setObjectName("vals")
-        self.horizontalLayout.addWidget(self.vals)
-        self.checkBox = QtWidgets.QCheckBox(parameterform)
-        self.checkBox.setObjectName("checkBox")
-        self.horizontalLayout.addWidget(self.checkBox)
-
-        self.retranslateUi(parameterform)
-        QtCore.QMetaObject.connectSlotsByName(parameterform)
-
-    def retranslateUi(self, parameterform):
-        _translate = QtCore.QCoreApplication.translate
-        parameterform.setWindowTitle(_translate("parameterform", "Form"))
-        self.label.setText(_translate("parameterform", "Name"))
-        self.vals.setText(_translate("parameterform", "1"))
-        self.checkBox.setText(_translate("parameterform", "Fix?"))

src/gui_qt/_py/phase_corr_dialog.py

@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/phase_corr_dialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.15.4
-#
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
-# run again.  Do not edit this file unless you know what you are doing.
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_SignalEdit(object):
-    def setupUi(self, SignalEdit):
-        SignalEdit.setObjectName("SignalEdit")
-        SignalEdit.resize(919, 595)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(SignalEdit.sizePolicy().hasHeightForWidth())
-        SignalEdit.setSizePolicy(sizePolicy)
-        self.gridLayout = QtWidgets.QGridLayout(SignalEdit)
-        self.gridLayout.setContentsMargins(6, 6, 6, 6)
-        self.gridLayout.setSpacing(3)
-        self.gridLayout.setObjectName("gridLayout")
-        self.graphicsView = PlotWidget(SignalEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.graphicsView.sizePolicy().hasHeightForWidth())
-        self.graphicsView.setSizePolicy(sizePolicy)
-        self.graphicsView.setObjectName("graphicsView")
-        self.gridLayout.addWidget(self.graphicsView, 0, 0, 1, 8)
-        self.pivot_lineedit = QtWidgets.QLineEdit(SignalEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pivot_lineedit.sizePolicy().hasHeightForWidth())
-        self.pivot_lineedit.setSizePolicy(sizePolicy)
-        self.pivot_lineedit.setInputMethodHints(QtCore.Qt.ImhDigitsOnly)
-        self.pivot_lineedit.setObjectName("pivot_lineedit")
-        self.gridLayout.addWidget(self.pivot_lineedit, 1, 7, 1, 1)
-        self.ph0slider = QtWidgets.QDoubleSpinBox(SignalEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ph0slider.sizePolicy().hasHeightForWidth())
-        self.ph0slider.setSizePolicy(sizePolicy)
-        self.ph0slider.setWrapping(True)
-        self.ph0slider.setMinimum(-180.0)
-        self.ph0slider.setMaximum(180.0)
-        self.ph0slider.setObjectName("ph0slider")
-        self.gridLayout.addWidget(self.ph0slider, 1, 1, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(SignalEdit)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 2, 1, 1, 7)
-        self.ph1slider = QtWidgets.QDoubleSpinBox(SignalEdit)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ph1slider.sizePolicy().hasHeightForWidth())
-        self.ph1slider.setSizePolicy(sizePolicy)
-        self.ph1slider.setWrapping(True)
-        self.ph1slider.setMinimum(-360.0)
-        self.ph1slider.setMaximum(360.0)
-        self.ph1slider.setObjectName("ph1slider")
-        self.gridLayout.addWidget(self.ph1slider, 1, 4, 1, 1)
-        self.label_8 = QtWidgets.QLabel(SignalEdit)
-        self.label_8.setObjectName("label_8")
-        self.gridLayout.addWidget(self.label_8, 1, 6, 1, 1)
-        self.label_6 = QtWidgets.QLabel(SignalEdit)
-        self.label_6.setObjectName("label_6")
-        self.gridLayout.addWidget(self.label_6, 1, 3, 1, 1)
-        self.label = QtWidgets.QLabel(SignalEdit)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem, 1, 2, 1, 1)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem1, 1, 5, 1, 1)
-
-        self.retranslateUi(SignalEdit)
-        self.buttonBox.accepted.connect(SignalEdit.accept)
-        self.buttonBox.rejected.connect(SignalEdit.close)
-        QtCore.QMetaObject.connectSlotsByName(SignalEdit)
-
-    def retranslateUi(self, SignalEdit):
-        _translate = QtCore.QCoreApplication.translate
-        SignalEdit.setWindowTitle(_translate("SignalEdit", "Phase correction"))
-        self.pivot_lineedit.setText(_translate("SignalEdit", "0"))
-        self.label_8.setText(_translate("SignalEdit", "Pivot"))
-        self.label_6.setText(_translate("SignalEdit", "Phase 1"))
-        self.label.setText(_translate("SignalEdit", "Phase 0"))
-from pyqtgraph import PlotWidget

src/gui_qt/_py/plotConfigTemplate.py

@@ -1,179 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/plotConfigTemplate.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(481, 840)
-        self.averageGroup = QtWidgets.QGroupBox(Form)
-        self.averageGroup.setGeometry(QtCore.QRect(0, 640, 242, 182))
-        self.averageGroup.setCheckable(True)
-        self.averageGroup.setChecked(False)
-        self.averageGroup.setObjectName("averageGroup")
-        self.gridLayout_5 = QtWidgets.QGridLayout(self.averageGroup)
-        self.gridLayout_5.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout_5.setSpacing(0)
-        self.gridLayout_5.setObjectName("gridLayout_5")
-        self.avgParamList = QtWidgets.QListWidget(self.averageGroup)
-        self.avgParamList.setObjectName("avgParamList")
-        self.gridLayout_5.addWidget(self.avgParamList, 0, 0, 1, 1)
-        self.decimateGroup = QtWidgets.QFrame(Form)
-        self.decimateGroup.setGeometry(QtCore.QRect(10, 140, 191, 171))
-        self.decimateGroup.setObjectName("decimateGroup")
-        self.gridLayout_4 = QtWidgets.QGridLayout(self.decimateGroup)
-        self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout_4.setSpacing(0)
-        self.gridLayout_4.setObjectName("gridLayout_4")
-        self.clipToViewCheck = QtWidgets.QCheckBox(self.decimateGroup)
-        self.clipToViewCheck.setObjectName("clipToViewCheck")
-        self.gridLayout_4.addWidget(self.clipToViewCheck, 7, 0, 1, 3)
-        self.maxTracesCheck = QtWidgets.QCheckBox(self.decimateGroup)
-        self.maxTracesCheck.setObjectName("maxTracesCheck")
-        self.gridLayout_4.addWidget(self.maxTracesCheck, 8, 0, 1, 2)
-        self.downsampleCheck = QtWidgets.QCheckBox(self.decimateGroup)
-        self.downsampleCheck.setObjectName("downsampleCheck")
-        self.gridLayout_4.addWidget(self.downsampleCheck, 0, 0, 1, 3)
-        self.peakRadio = QtWidgets.QRadioButton(self.decimateGroup)
-        self.peakRadio.setChecked(True)
-        self.peakRadio.setObjectName("peakRadio")
-        self.gridLayout_4.addWidget(self.peakRadio, 6, 1, 1, 2)
-        self.maxTracesSpin = QtWidgets.QSpinBox(self.decimateGroup)
-        self.maxTracesSpin.setObjectName("maxTracesSpin")
-        self.gridLayout_4.addWidget(self.maxTracesSpin, 8, 2, 1, 1)
-        self.forgetTracesCheck = QtWidgets.QCheckBox(self.decimateGroup)
-        self.forgetTracesCheck.setObjectName("forgetTracesCheck")
-        self.gridLayout_4.addWidget(self.forgetTracesCheck, 9, 0, 1, 3)
-        self.meanRadio = QtWidgets.QRadioButton(self.decimateGroup)
-        self.meanRadio.setObjectName("meanRadio")
-        self.gridLayout_4.addWidget(self.meanRadio, 3, 1, 1, 2)
-        self.subsampleRadio = QtWidgets.QRadioButton(self.decimateGroup)
-        self.subsampleRadio.setObjectName("subsampleRadio")
-        self.gridLayout_4.addWidget(self.subsampleRadio, 2, 1, 1, 2)
-        self.autoDownsampleCheck = QtWidgets.QCheckBox(self.decimateGroup)
-        self.autoDownsampleCheck.setChecked(True)
-        self.autoDownsampleCheck.setObjectName("autoDownsampleCheck")
-        self.gridLayout_4.addWidget(self.autoDownsampleCheck, 1, 2, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(30, 20, QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_4.addItem(spacerItem, 2, 0, 1, 1)
-        self.downsampleSpin = QtWidgets.QSpinBox(self.decimateGroup)
-        self.downsampleSpin.setMinimum(1)
-        self.downsampleSpin.setMaximum(100000)
-        self.downsampleSpin.setProperty("value", 1)
-        self.downsampleSpin.setObjectName("downsampleSpin")
-        self.gridLayout_4.addWidget(self.downsampleSpin, 1, 1, 1, 1)
-        self.transformGroup = QtWidgets.QFrame(Form)
-        self.transformGroup.setGeometry(QtCore.QRect(10, 10, 171, 101))
-        self.transformGroup.setObjectName("transformGroup")
-        self.gridLayout = QtWidgets.QGridLayout(self.transformGroup)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setSpacing(0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.logYCheck = QtWidgets.QCheckBox(self.transformGroup)
-        self.logYCheck.setObjectName("logYCheck")
-        self.gridLayout.addWidget(self.logYCheck, 2, 0, 1, 1)
-        self.logXCheck = QtWidgets.QCheckBox(self.transformGroup)
-        self.logXCheck.setObjectName("logXCheck")
-        self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1)
-        self.fftCheck = QtWidgets.QCheckBox(self.transformGroup)
-        self.fftCheck.setObjectName("fftCheck")
-        self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1)
-        self.derivativeCheck = QtWidgets.QCheckBox(self.transformGroup)
-        self.derivativeCheck.setObjectName("derivativeCheck")
-        self.gridLayout.addWidget(self.derivativeCheck, 3, 0, 1, 1)
-        self.phasemapCheck = QtWidgets.QCheckBox(self.transformGroup)
-        self.phasemapCheck.setObjectName("phasemapCheck")
-        self.gridLayout.addWidget(self.phasemapCheck, 4, 0, 1, 1)
-        self.pointsGroup = QtWidgets.QGroupBox(Form)
-        self.pointsGroup.setGeometry(QtCore.QRect(10, 550, 234, 58))
-        self.pointsGroup.setCheckable(True)
-        self.pointsGroup.setObjectName("pointsGroup")
-        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.pointsGroup)
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.autoPointsCheck = QtWidgets.QCheckBox(self.pointsGroup)
-        self.autoPointsCheck.setChecked(True)
-        self.autoPointsCheck.setObjectName("autoPointsCheck")
-        self.verticalLayout_5.addWidget(self.autoPointsCheck)
-        self.gridGroup = QtWidgets.QFrame(Form)
-        self.gridGroup.setGeometry(QtCore.QRect(10, 460, 221, 81))
-        self.gridGroup.setObjectName("gridGroup")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.gridGroup)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.xGridCheck = QtWidgets.QCheckBox(self.gridGroup)
-        self.xGridCheck.setObjectName("xGridCheck")
-        self.gridLayout_2.addWidget(self.xGridCheck, 0, 0, 1, 2)
-        self.yGridCheck = QtWidgets.QCheckBox(self.gridGroup)
-        self.yGridCheck.setObjectName("yGridCheck")
-        self.gridLayout_2.addWidget(self.yGridCheck, 1, 0, 1, 2)
-        self.gridAlphaSlider = QtWidgets.QSlider(self.gridGroup)
-        self.gridAlphaSlider.setMaximum(255)
-        self.gridAlphaSlider.setProperty("value", 128)
-        self.gridAlphaSlider.setOrientation(QtCore.Qt.Horizontal)
-        self.gridAlphaSlider.setObjectName("gridAlphaSlider")
-        self.gridLayout_2.addWidget(self.gridAlphaSlider, 2, 1, 1, 1)
-        self.label = QtWidgets.QLabel(self.gridGroup)
-        self.label.setObjectName("label")
-        self.gridLayout_2.addWidget(self.label, 2, 0, 1, 1)
-        self.alphaGroup = QtWidgets.QGroupBox(Form)
-        self.alphaGroup.setGeometry(QtCore.QRect(10, 390, 234, 60))
-        self.alphaGroup.setCheckable(True)
-        self.alphaGroup.setObjectName("alphaGroup")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.alphaGroup)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.autoAlphaCheck = QtWidgets.QCheckBox(self.alphaGroup)
-        self.autoAlphaCheck.setChecked(False)
-        self.autoAlphaCheck.setObjectName("autoAlphaCheck")
-        self.horizontalLayout.addWidget(self.autoAlphaCheck)
-        self.alphaSlider = QtWidgets.QSlider(self.alphaGroup)
-        self.alphaSlider.setMaximum(1000)
-        self.alphaSlider.setProperty("value", 1000)
-        self.alphaSlider.setOrientation(QtCore.Qt.Horizontal)
-        self.alphaSlider.setObjectName("alphaSlider")
-        self.horizontalLayout.addWidget(self.alphaSlider)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "PyQtGraph"))
-        self.averageGroup.setToolTip(_translate("Form", "Display averages of the curves displayed in this plot. The parameter list allows you to choose parameters to average over (if any are available)."))
-        self.averageGroup.setTitle(_translate("Form", "Average"))
-        self.clipToViewCheck.setToolTip(_translate("Form", "Plot only the portion of each curve that is visible. This assumes X values are uniformly spaced."))
-        self.clipToViewCheck.setText(_translate("Form", "Clip to View"))
-        self.maxTracesCheck.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check this box to limit the number of traces that are displayed."))
-        self.maxTracesCheck.setText(_translate("Form", "Max Traces:"))
-        self.downsampleCheck.setText(_translate("Form", "Downsample"))
-        self.peakRadio.setToolTip(_translate("Form", "Downsample by drawing a saw wave that follows the min and max of the original data. This method produces the best visual representation of the data but is slower."))
-        self.peakRadio.setText(_translate("Form", "Peak"))
-        self.maxTracesSpin.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check \"Max Traces\" and set this value to limit the number of traces that are displayed."))
-        self.forgetTracesCheck.setToolTip(_translate("Form", "If MaxTraces is checked, remove curves from memory after they are hidden (saves memory, but traces can not be un-hidden)."))
-        self.forgetTracesCheck.setText(_translate("Form", "Forget hidden traces"))
-        self.meanRadio.setToolTip(_translate("Form", "Downsample by taking the mean of N samples."))
-        self.meanRadio.setText(_translate("Form", "Mean"))
-        self.subsampleRadio.setToolTip(_translate("Form", "Downsample by taking the first of N samples. This method is fastest and least accurate."))
-        self.subsampleRadio.setText(_translate("Form", "Subsample"))
-        self.autoDownsampleCheck.setToolTip(_translate("Form", "Automatically downsample data based on the visible range. This assumes X values are uniformly spaced."))
-        self.autoDownsampleCheck.setText(_translate("Form", "Auto"))
-        self.downsampleSpin.setToolTip(_translate("Form", "Downsample data before plotting. (plot every Nth sample)"))
-        self.downsampleSpin.setSuffix(_translate("Form", "x"))
-        self.logYCheck.setText(_translate("Form", "Log Y"))
-        self.logXCheck.setText(_translate("Form", "Log X"))
-        self.fftCheck.setText(_translate("Form", "Power Spectrum (FFT)"))
-        self.derivativeCheck.setText(_translate("Form", "dy/dx"))
-        self.phasemapCheck.setText(_translate("Form", "Y vs. Y\'"))
-        self.pointsGroup.setTitle(_translate("Form", "Points"))
-        self.autoPointsCheck.setText(_translate("Form", "Auto"))
-        self.xGridCheck.setText(_translate("Form", "Show X Grid"))
-        self.yGridCheck.setText(_translate("Form", "Show Y Grid"))
-        self.label.setText(_translate("Form", "Opacity"))
-        self.alphaGroup.setTitle(_translate("Form", "Alpha"))
-        self.autoAlphaCheck.setText(_translate("Form", "Auto"))

src/gui_qt/_py/pokeentry.py

@@ -0,0 +1,258 @@
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/pokeentry.ui'
+#
+# Created by: PyQt6 UI code generator 6.7.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(640, 642)
+        self.verticalLayout_4 = QtWidgets.QVBoxLayout(Form)
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.artwork_label = QtWidgets.QLabel(parent=Form)
+        self.artwork_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop)
+        self.artwork_label.setObjectName("artwork_label")
+        self.verticalLayout_4.addWidget(self.artwork_label)
+        self.formLayout = QtWidgets.QFormLayout()
+        self.formLayout.setContentsMargins(3, 3, 3, 3)
+        self.formLayout.setVerticalSpacing(12)
+        self.formLayout.setObjectName("formLayout")
+        self.label = QtWidgets.QLabel(parent=Form)
+        self.label.setObjectName("label")
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label)
+        self.nationaldex_label = QtWidgets.QLabel(parent=Form)
+        self.nationaldex_label.setObjectName("nationaldex_label")
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.nationaldex_label)
+        self.label_1 = QtWidgets.QLabel(parent=Form)
+        self.label_1.setObjectName("label_1")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_1)
+        self.species_label = QtWidgets.QLabel(parent=Form)
+        self.species_label.setObjectName("species_label")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.species_label)
+        self.label_4 = QtWidgets.QLabel(parent=Form)
+        self.label_4.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop)
+        self.label_4.setObjectName("label_4")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_4)
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.type1_label = QtWidgets.QLabel(parent=Form)
+        self.type1_label.setObjectName("type1_label")
+        self.verticalLayout_2.addWidget(self.type1_label)
+        self.type2_label = QtWidgets.QLabel(parent=Form)
+        self.type2_label.setObjectName("type2_label")
+        self.verticalLayout_2.addWidget(self.type2_label)
+        self.formLayout.setLayout(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.verticalLayout_2)
+        self.label_5 = QtWidgets.QLabel(parent=Form)
+        self.label_5.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop)
+        self.label_5.setObjectName("label_5")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_5)
+        self.verticalLayout = QtWidgets.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.ability1_label = QtWidgets.QLabel(parent=Form)
+        self.ability1_label.setObjectName("ability1_label")
+        self.verticalLayout.addWidget(self.ability1_label)
+        self.ability2_label = QtWidgets.QLabel(parent=Form)
+        self.ability2_label.setObjectName("ability2_label")
+        self.verticalLayout.addWidget(self.ability2_label)
+        self.ability3_label = QtWidgets.QLabel(parent=Form)
+        self.ability3_label.setObjectName("ability3_label")
+        self.verticalLayout.addWidget(self.ability3_label)
+        self.formLayout.setLayout(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.verticalLayout)
+        self.label_2 = QtWidgets.QLabel(parent=Form)
+        self.label_2.setObjectName("label_2")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_2)
+        self.height_label = QtWidgets.QLabel(parent=Form)
+        self.height_label.setObjectName("height_label")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.FieldRole, self.height_label)
+        self.label_3 = QtWidgets.QLabel(parent=Form)
+        self.label_3.setObjectName("label_3")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
+        self.weight_label = QtWidgets.QLabel(parent=Form)
+        self.weight_label.setObjectName("weight_label")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.ItemRole.FieldRole, self.weight_label)
+        self.gender_label = QtWidgets.QLabel(parent=Form)
+        self.gender_label.setObjectName("gender_label")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.ItemRole.LabelRole, self.gender_label)
+        self.verticalLayout_4.addLayout(self.formLayout)
+        self.groupBox = QtWidgets.QGroupBox(parent=Form)
+        self.groupBox.setFlat(True)
+        self.groupBox.setObjectName("groupBox")
+        self.gridLayout_4 = QtWidgets.QGridLayout(self.groupBox)
+        self.gridLayout_4.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.spec_attack_bar = QtWidgets.QProgressBar(parent=self.groupBox)
+        self.spec_attack_bar.setStyleSheet("QProgressBar{\n"
+"    border: none;\n"
+"    background-color: transparent;\n"
+"    text-align: center;\n"
+"}\n"
+"\n"
+"QProgressBar::chunk {\n"
+"    background-color: #009cda;\n"
+"    border-radius: 3px;\n"
+"}")
+        self.spec_attack_bar.setMaximum(194)
+        self.spec_attack_bar.setProperty("value", 24)
+        self.spec_attack_bar.setObjectName("spec_attack_bar")
+        self.gridLayout_4.addWidget(self.spec_attack_bar, 0, 3, 1, 1)
+        self.label_8 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_8.setObjectName("label_8")
+        self.gridLayout_4.addWidget(self.label_8, 0, 2, 1, 1)
+        self.spec_defense_bar = QtWidgets.QProgressBar(parent=self.groupBox)
+        self.spec_defense_bar.setStyleSheet("QProgressBar{\n"
+"    border: none;\n"
+"    background-color: transparent;\n"
+"    text-align: center;\n"
+"}\n"
+"\n"
+"QProgressBar::chunk {\n"
+"    background-color: #009cda;\n"
+"    border-radius: 3px;\n"
+"}")
+        self.spec_defense_bar.setMaximum(250)
+        self.spec_defense_bar.setProperty("value", 24)
+        self.spec_defense_bar.setObjectName("spec_defense_bar")
+        self.gridLayout_4.addWidget(self.spec_defense_bar, 1, 3, 1, 1)
+        self.label_6 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_6.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
+        self.label_6.setObjectName("label_6")
+        self.gridLayout_4.addWidget(self.label_6, 0, 0, 1, 1)
+        self.hp_bar = QtWidgets.QProgressBar(parent=self.groupBox)
+        self.hp_bar.setStyleSheet("QProgressBar{\n"
+"    border: none;\n"
+"    background-color: transparent;\n"
+"    text-align: center;\n"
+"}\n"
+"\n"
+"QProgressBar::chunk {\n"
+"    background-color: #009cda;\n"
+"    border-radius: 3px;\n"
+"}")
+        self.hp_bar.setMaximum(255)
+        self.hp_bar.setProperty("value", 24)
+        self.hp_bar.setObjectName("hp_bar")
+        self.gridLayout_4.addWidget(self.hp_bar, 0, 1, 1, 1)
+        self.speed_bar = QtWidgets.QProgressBar(parent=self.groupBox)
+        self.speed_bar.setStyleSheet("QProgressBar{\n"
+"    border: none;\n"
+"    background-color: transparent;\n"
+"    text-align: center;\n"
+"}\n"
+"\n"
+"QProgressBar::chunk {\n"
+"    background-color: #009cda;\n"
+"    border-radius: 3px;\n"
+"}")
+        self.speed_bar.setMaximum(200)
+        self.speed_bar.setProperty("value", 24)
+        self.speed_bar.setObjectName("speed_bar")
+        self.gridLayout_4.addWidget(self.speed_bar, 2, 3, 1, 1)
+        self.label_11 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_11.setObjectName("label_11")
+        self.gridLayout_4.addWidget(self.label_11, 2, 2, 1, 1)
+        self.label_10 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_10.setObjectName("label_10")
+        self.gridLayout_4.addWidget(self.label_10, 1, 2, 1, 1)
+        self.defense_bar = QtWidgets.QProgressBar(parent=self.groupBox)
+        self.defense_bar.setStyleSheet("QProgressBar{\n"
+"    border: none;\n"
+"    background-color: transparent;\n"
+"    text-align: center;\n"
+"}\n"
+"\n"
+"QProgressBar::chunk {\n"
+"    background-color: #009cda;\n"
+"    border-radius: 3px;\n"
+"}")
+        self.defense_bar.setMaximum(250)
+        self.defense_bar.setProperty("value", 24)
+        self.defense_bar.setObjectName("defense_bar")
+        self.gridLayout_4.addWidget(self.defense_bar, 2, 1, 1, 1)
+        self.attack_bar = QtWidgets.QProgressBar(parent=self.groupBox)
+        self.attack_bar.setStyleSheet("QProgressBar{\n"
+"    border: none;\n"
+"    background-color: transparent;\n"
+"    text-align: center;\n"
+"}\n"
+"\n"
+"QProgressBar::chunk {\n"
+"    background-color: #009cda;\n"
+"    border-radius: 3px;\n"
+"}")
+        self.attack_bar.setMaximum(190)
+        self.attack_bar.setProperty("value", 24)
+        self.attack_bar.setObjectName("attack_bar")
+        self.gridLayout_4.addWidget(self.attack_bar, 1, 1, 1, 1)
+        self.label_7 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_7.setObjectName("label_7")
+        self.gridLayout_4.addWidget(self.label_7, 1, 0, 1, 1)
+        self.label_9 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_9.setObjectName("label_9")
+        self.gridLayout_4.addWidget(self.label_9, 2, 0, 1, 1)
+        self.verticalLayout_4.addWidget(self.groupBox)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=Form)
+        self.groupBox_2.setFlat(True)
+        self.groupBox_2.setCheckable(False)
+        self.groupBox_2.setObjectName("groupBox_2")
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.groupBox_2)
+        self.verticalLayout_3.setContentsMargins(3, 3, 3, 3)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.tableWidget = QtWidgets.QTableWidget(parent=self.groupBox_2)
+        self.tableWidget.setStyleSheet("background-color: transparent;")
+        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.tableWidget.setShowGrid(False)
+        self.tableWidget.setGridStyle(QtCore.Qt.PenStyle.NoPen)
+        self.tableWidget.setWordWrap(False)
+        self.tableWidget.setObjectName("tableWidget")
+        self.tableWidget.setColumnCount(0)
+        self.tableWidget.setRowCount(0)
+        self.tableWidget.horizontalHeader().setVisible(False)
+        self.tableWidget.verticalHeader().setVisible(False)
+        self.verticalLayout_3.addWidget(self.tableWidget)
+        self.verticalLayout_4.addWidget(self.groupBox_2)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.verticalLayout_4.addItem(spacerItem)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.artwork_label.setText(_translate("Form", "TextLabel"))
+        self.label.setText(_translate("Form", "National No."))
+        self.nationaldex_label.setText(_translate("Form", "TextLabel"))
+        self.label_1.setText(_translate("Form", "Species"))
+        self.species_label.setText(_translate("Form", "TextLabel"))
+        self.label_4.setText(_translate("Form", "Type"))
+        self.type1_label.setText(_translate("Form", "TextLabel"))
+        self.type2_label.setText(_translate("Form", "TextLabel"))
+        self.label_5.setText(_translate("Form", "Abilities"))
+        self.ability1_label.setText(_translate("Form", "TextLabel"))
+        self.ability2_label.setText(_translate("Form", "TextLabel"))
+        self.ability3_label.setText(_translate("Form", "TextLabel"))
+        self.label_2.setText(_translate("Form", "Height"))
+        self.height_label.setText(_translate("Form", "0.0 m"))
+        self.label_3.setText(_translate("Form", "Weight"))
+        self.weight_label.setText(_translate("Form", "0.0 kg"))
+        self.gender_label.setText(_translate("Form", "TextLabel"))
+        self.groupBox.setTitle(_translate("Form", "Stats"))
+        self.spec_attack_bar.setFormat(_translate("Form", "%v"))
+        self.label_8.setText(_translate("Form", "Special Attack"))
+        self.spec_defense_bar.setFormat(_translate("Form", "%v"))
+        self.label_6.setText(_translate("Form", "HP"))
+        self.hp_bar.setFormat(_translate("Form", "%v"))
+        self.speed_bar.setFormat(_translate("Form", "%v"))
+        self.label_11.setText(_translate("Form", "Speed"))
+        self.label_10.setText(_translate("Form", "Special Defense"))
+        self.defense_bar.setFormat(_translate("Form", "%v"))
+        self.attack_bar.setFormat(_translate("Form", "%v"))
+        self.label_7.setText(_translate("Form", "Attack"))
+        self.label_9.setText(_translate("Form", "Defense"))
+        self.groupBox_2.setTitle(_translate("Form", "Evolution chain"))

src/gui_qt/_py/pokemon.py

@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/pokemon.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Dialog(object):
-    def setupUi(self, Dialog):
-        Dialog.setObjectName("Dialog")
-        Dialog.resize(400, 359)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(Dialog.sizePolicy().hasHeightForWidth())
-        Dialog.setSizePolicy(sizePolicy)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidget = QtWidgets.QTabWidget(Dialog)
-        self.tabWidget.setObjectName("tabWidget")
-        self.verticalLayout.addWidget(self.tabWidget)
-        self.formLayout = QtWidgets.QFormLayout()
-        self.formLayout.setObjectName("formLayout")
-        self.label = QtWidgets.QLabel(Dialog)
-        self.label.setObjectName("label")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label)
-        self.pokedex_nr = QtWidgets.QLabel(Dialog)
-        self.pokedex_nr.setObjectName("pokedex_nr")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.pokedex_nr)
-        self.label_2 = QtWidgets.QLabel(Dialog)
-        self.label_2.setObjectName("label_2")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_2)
-        self.name = QtWidgets.QComboBox(Dialog)
-        self.name.setObjectName("name")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.name)
-        self.label_3 = QtWidgets.QLabel(Dialog)
-        self.label_3.setObjectName("label_3")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_3)
-        self.category = QtWidgets.QLabel(Dialog)
-        self.category.setObjectName("category")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.category)
-        self.label_4 = QtWidgets.QLabel(Dialog)
-        self.label_4.setObjectName("label_4")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_4)
-        self.poketype = QtWidgets.QLabel(Dialog)
-        self.poketype.setObjectName("poketype")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.poketype)
-        self.label_5 = QtWidgets.QLabel(Dialog)
-        self.label_5.setObjectName("label_5")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_5)
-        self.height = QtWidgets.QLabel(Dialog)
-        self.height.setObjectName("height")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.height)
-        self.label_6 = QtWidgets.QLabel(Dialog)
-        self.label_6.setObjectName("label_6")
-        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_6)
-        self.weight = QtWidgets.QLabel(Dialog)
-        self.weight.setObjectName("weight")
-        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.weight)
-        self.label_7 = QtWidgets.QLabel(Dialog)
-        self.label_7.setObjectName("label_7")
-        self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_7)
-        self.color = QtWidgets.QLabel(Dialog)
-        self.color.setObjectName("color")
-        self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.color)
-        self.label_8 = QtWidgets.QLabel(Dialog)
-        self.label_8.setObjectName("label_8")
-        self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_8)
-        self.info = QtWidgets.QLabel(Dialog)
-        self.info.setObjectName("info")
-        self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.info)
-        self.verticalLayout.addLayout(self.formLayout)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.prev_button = QtWidgets.QToolButton(Dialog)
-        self.prev_button.setObjectName("prev_button")
-        self.horizontalLayout_2.addWidget(self.prev_button)
-        self.next_button = QtWidgets.QToolButton(Dialog)
-        self.next_button.setObjectName("next_button")
-        self.horizontalLayout_2.addWidget(self.next_button)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close|QtWidgets.QDialogButtonBox.Retry)
-        self.buttonBox.setCenterButtons(False)
-        self.buttonBox.setObjectName("buttonBox")
-        self.horizontalLayout_2.addWidget(self.buttonBox)
-        self.verticalLayout.addLayout(self.horizontalLayout_2)
-        self.label_2.setBuddy(self.name)
-
-        self.retranslateUi(Dialog)
-        self.tabWidget.setCurrentIndex(-1)
-        self.buttonBox.rejected.connect(Dialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(Dialog)
-
-    def retranslateUi(self, Dialog):
-        _translate = QtCore.QCoreApplication.translate
-        Dialog.setWindowTitle(_translate("Dialog", "Random Pokémon"))
-        self.label.setText(_translate("Dialog", "National-Dex"))
-        self.pokedex_nr.setText(_translate("Dialog", "TextLabel"))
-        self.label_2.setText(_translate("Dialog", "Name"))
-        self.label_3.setText(_translate("Dialog", "Kategorie"))
-        self.category.setText(_translate("Dialog", "TextLabel"))
-        self.label_4.setText(_translate("Dialog", "Typ"))
-        self.poketype.setText(_translate("Dialog", "TextLabel"))
-        self.label_5.setText(_translate("Dialog", "Größe"))
-        self.height.setText(_translate("Dialog", "TextLabel"))
-        self.label_6.setText(_translate("Dialog", "Gewicht"))
-        self.weight.setText(_translate("Dialog", "TextLabel"))
-        self.label_7.setText(_translate("Dialog", "Farbe"))
-        self.color.setText(_translate("Dialog", "TextLabel"))
-        self.label_8.setText(_translate("Dialog", "Mehr..."))
-        self.info.setText(_translate("Dialog", "TextLabel"))
-        self.prev_button.setText(_translate("Dialog", "Prev."))
-        self.next_button.setText(_translate("Dialog", "Next"))

src/gui_qt/_py/pokewindow.py

@@ -0,0 +1,129 @@
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/pokewindow.ui'
+#
+# Created by: PyQt6 UI code generator 6.7.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_Dialog(object):
+    def setupUi(self, Dialog):
+        Dialog.setObjectName("Dialog")
+        Dialog.resize(1687, 991)
+        self.gridLayout = QtWidgets.QGridLayout(Dialog)
+        self.gridLayout.setObjectName("gridLayout")
+        self.pushButton = QtWidgets.QPushButton(parent=Dialog)
+        self.pushButton.setObjectName("pushButton")
+        self.gridLayout.addWidget(self.pushButton, 0, 2, 1, 1)
+        self.comboBox_2 = QtWidgets.QComboBox(parent=Dialog)
+        self.comboBox_2.setObjectName("comboBox_2")
+        self.gridLayout.addWidget(self.comboBox_2, 0, 0, 1, 1)
+        self.comboBox = QtWidgets.QComboBox(parent=Dialog)
+        self.comboBox.setObjectName("comboBox")
+        self.gridLayout.addWidget(self.comboBox, 0, 1, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout.addItem(spacerItem, 0, 4, 1, 1)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.buttonBox.sizePolicy().hasHeightForWidth())
+        self.buttonBox.setSizePolicy(sizePolicy)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Close)
+        self.buttonBox.setObjectName("buttonBox")
+        self.gridLayout.addWidget(self.buttonBox, 0, 3, 1, 1)
+        self.splitter = QtWidgets.QSplitter(parent=Dialog)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.splitter.setObjectName("splitter")
+        self.tableWidget_2 = QtWidgets.QTableWidget(parent=self.splitter)
+        self.tableWidget_2.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.tableWidget_2.setAlternatingRowColors(True)
+        self.tableWidget_2.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection)
+        self.tableWidget_2.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+        self.tableWidget_2.setShowGrid(False)
+        self.tableWidget_2.setGridStyle(QtCore.Qt.PenStyle.NoPen)
+        self.tableWidget_2.setObjectName("tableWidget_2")
+        self.tableWidget_2.setColumnCount(13)
+        self.tableWidget_2.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(1, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(2, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(3, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(4, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(5, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(6, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(7, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(8, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(9, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(10, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(11, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.tableWidget_2.setHorizontalHeaderItem(12, item)
+        self.tableWidget_2.horizontalHeader().setDefaultSectionSize(80)
+        self.tableWidget_2.horizontalHeader().setStretchLastSection(False)
+        self.tableWidget_2.verticalHeader().setVisible(False)
+        self.tabWidget = QtWidgets.QTabWidget(parent=self.splitter)
+        self.tabWidget.setMinimumSize(QtCore.QSize(418, 0))
+        self.tabWidget.setObjectName("tabWidget")
+        self.gridLayout.addWidget(self.splitter, 1, 0, 1, 5)
+
+        self.retranslateUi(Dialog)
+        self.tabWidget.setCurrentIndex(-1)
+        self.buttonBox.rejected.connect(Dialog.close) # type: ignore
+        QtCore.QMetaObject.connectSlotsByName(Dialog)
+
+    def retranslateUi(self, Dialog):
+        _translate = QtCore.QCoreApplication.translate
+        Dialog.setWindowTitle(_translate("Dialog", "Gotta catch \'em all!"))
+        self.pushButton.setText(_translate("Dialog", "Random"))
+        self.tableWidget_2.setSortingEnabled(True)
+        item = self.tableWidget_2.horizontalHeaderItem(0)
+        item.setText(_translate("Dialog", "#"))
+        item = self.tableWidget_2.horizontalHeaderItem(1)
+        item.setText(_translate("Dialog", "Pokemon"))
+        item = self.tableWidget_2.horizontalHeaderItem(2)
+        item.setText(_translate("Dialog", "Type"))
+        item = self.tableWidget_2.horizontalHeaderItem(3)
+        item.setText(_translate("Dialog", "Total"))
+        item = self.tableWidget_2.horizontalHeaderItem(4)
+        item.setText(_translate("Dialog", "HP"))
+        item.setToolTip(_translate("Dialog", "Hit Points; Kraftpunkte"))
+        item = self.tableWidget_2.horizontalHeaderItem(5)
+        item.setText(_translate("Dialog", "Attack"))
+        item.setToolTip(_translate("Dialog", "Attacke"))
+        item = self.tableWidget_2.horizontalHeaderItem(6)
+        item.setText(_translate("Dialog", "Defense"))
+        item.setToolTip(_translate("Dialog", "Verteidigung"))
+        item = self.tableWidget_2.horizontalHeaderItem(7)
+        item.setText(_translate("Dialog", "Sp. Attack"))
+        item.setToolTip(_translate("Dialog", "Special Attack; Spezial-Attacke"))
+        item = self.tableWidget_2.horizontalHeaderItem(8)
+        item.setText(_translate("Dialog", "Sp. Defense"))
+        item.setToolTip(_translate("Dialog", "Special Defense; Spezial-Verteidigung"))
+        item = self.tableWidget_2.horizontalHeaderItem(9)
+        item.setText(_translate("Dialog", "Speed"))
+        item.setToolTip(_translate("Dialog", "Initiative"))
+        item = self.tableWidget_2.horizontalHeaderItem(10)
+        item.setText(_translate("Dialog", "Height"))
+        item.setToolTip(_translate("Dialog", "Größe"))
+        item = self.tableWidget_2.horizontalHeaderItem(11)
+        item.setText(_translate("Dialog", "Weight"))
+        item.setToolTip(_translate("Dialog", "Gewicht"))
+        item = self.tableWidget_2.horizontalHeaderItem(12)
+        item.setText(_translate("Dialog", "BMI"))
+        item.setToolTip(_translate("Dialog", "Body-Mass-Index"))

src/gui_qt/_py/propwidget.py

@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/propwidget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(400, 300)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
-        self.verticalLayout.setContentsMargins(2, 2, 2, 2)
-        self.verticalLayout.setSpacing(2)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.tabWidget = QtWidgets.QTabWidget(Form)
-        self.tabWidget.setObjectName("tabWidget")
-        self.tabWidgetPage2 = QtWidgets.QWidget()
-        self.tabWidgetPage2.setObjectName("tabWidgetPage2")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.tabWidgetPage2)
-        self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_3.setSpacing(0)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.tableWidget_2 = QtWidgets.QTableWidget(self.tabWidgetPage2)
-        self.tableWidget_2.setObjectName("tableWidget_2")
-        self.tableWidget_2.setColumnCount(0)
-        self.tableWidget_2.setRowCount(0)
-        self.verticalLayout_3.addWidget(self.tableWidget_2)
-        self.tabWidget.addTab(self.tabWidgetPage2, "")
-        self.tabWidgetPage1 = QtWidgets.QWidget()
-        self.tabWidgetPage1.setObjectName("tabWidgetPage1")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.tabWidgetPage1)
-        self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_2.setSpacing(0)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.tableWidget = QtWidgets.QTableWidget(self.tabWidgetPage1)
-        self.tableWidget.setObjectName("tableWidget")
-        self.tableWidget.setColumnCount(0)
-        self.tableWidget.setRowCount(0)
-        self.verticalLayout_2.addWidget(self.tableWidget)
-        self.tabWidget.addTab(self.tabWidgetPage1, "")
-        self.verticalLayout.addWidget(self.tabWidget)
-
-        self.retranslateUi(Form)
-        self.tabWidget.setCurrentIndex(0)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "Form"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabWidgetPage2), _translate("Form", "General"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabWidgetPage1), _translate("Form", "Symbol"))

src/gui_qt/_py/ptstab.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/ptstab.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/ptstab.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
@@ -17,26 +16,26 @@ class Ui_Form(object):
         self.verticalLayout = QtWidgets.QVBoxLayout(Form)
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.peaktable = QtWidgets.QListWidget(Form)
+        self.peaktable = QtWidgets.QListWidget(parent=Form)
-        self.peaktable.setEditTriggers(QtWidgets.QAbstractItemView.DoubleClicked|QtWidgets.QAbstractItemView.EditKeyPressed)
+        self.peaktable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.DoubleClicked|QtWidgets.QAbstractItemView.EditTrigger.EditKeyPressed)
         self.peaktable.setObjectName("peaktable")
         self.verticalLayout.addWidget(self.peaktable)
-        self.groupBox = QtWidgets.QGroupBox(Form)
+        self.groupBox = QtWidgets.QGroupBox(parent=Form)
         self.groupBox.setObjectName("groupBox")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox)
         self.horizontalLayout.setContentsMargins(3, 3, 3, 3)
         self.horizontalLayout.setSpacing(3)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.left_pt = QtWidgets.QSpinBox(self.groupBox)
+        self.left_pt = QtWidgets.QSpinBox(parent=self.groupBox)
         self.left_pt.setMaximum(999)
         self.left_pt.setObjectName("left_pt")
         self.horizontalLayout.addWidget(self.left_pt)
-        self.right_pt = QtWidgets.QSpinBox(self.groupBox)
+        self.right_pt = QtWidgets.QSpinBox(parent=self.groupBox)
         self.right_pt.setMaximum(999)
         self.right_pt.setObjectName("right_pt")
         self.horizontalLayout.addWidget(self.right_pt)
-        self.average_combobox = QtWidgets.QComboBox(self.groupBox)
+        self.average_combobox = QtWidgets.QComboBox(parent=self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.average_combobox.sizePolicy().hasHeightForWidth())
@@ -45,9 +44,10 @@ class Ui_Form(object):
         self.average_combobox.addItem("")
         self.average_combobox.addItem("")
         self.average_combobox.addItem("")
+        self.average_combobox.addItem("")
         self.horizontalLayout.addWidget(self.average_combobox)
         self.verticalLayout.addWidget(self.groupBox)
-        self.groupBox_2 = QtWidgets.QGroupBox(Form)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=Form)
         self.groupBox_2.setCheckable(True)
         self.groupBox_2.setChecked(False)
         self.groupBox_2.setObjectName("groupBox_2")
@@ -55,7 +55,7 @@ class Ui_Form(object):
         self.horizontalLayout_5.setContentsMargins(3, 3, 3, 3)
         self.horizontalLayout_5.setSpacing(2)
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
-        self.special_comboBox = QtWidgets.QComboBox(self.groupBox_2)
+        self.special_comboBox = QtWidgets.QComboBox(parent=self.groupBox_2)
         self.special_comboBox.setObjectName("special_comboBox")
         self.special_comboBox.addItem("")
         self.special_comboBox.addItem("")
@@ -63,24 +63,24 @@ class Ui_Form(object):
         self.special_comboBox.addItem("")
         self.horizontalLayout_5.addWidget(self.special_comboBox)
         self.verticalLayout.addWidget(self.groupBox_2)
-        self.groupBox_3 = QtWidgets.QGroupBox(Form)
+        self.groupBox_3 = QtWidgets.QGroupBox(parent=Form)
         self.groupBox_3.setObjectName("groupBox_3")
         self.gridLayout = QtWidgets.QGridLayout(self.groupBox_3)
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        self.xbutton = QtWidgets.QCheckBox(self.groupBox_3)
+        self.xbutton = QtWidgets.QCheckBox(parent=self.groupBox_3)
         self.xbutton.setObjectName("xbutton")
         self.gridLayout.addWidget(self.xbutton, 0, 0, 1, 1)
-        self.ybutton = QtWidgets.QCheckBox(self.groupBox_3)
+        self.ybutton = QtWidgets.QCheckBox(parent=self.groupBox_3)
         self.ybutton.setChecked(True)
         self.ybutton.setObjectName("ybutton")
         self.gridLayout.addWidget(self.ybutton, 0, 1, 1, 1)
-        self.graph_checkbox = QtWidgets.QCheckBox(self.groupBox_3)
+        self.graph_checkbox = QtWidgets.QCheckBox(parent=self.groupBox_3)
         self.graph_checkbox.setChecked(True)
         self.graph_checkbox.setObjectName("graph_checkbox")
         self.gridLayout.addWidget(self.graph_checkbox, 1, 0, 1, 1)
-        self.graph_combobox = QtWidgets.QComboBox(self.groupBox_3)
+        self.graph_combobox = QtWidgets.QComboBox(parent=self.groupBox_3)
         self.graph_combobox.setEnabled(False)
         self.graph_combobox.setObjectName("graph_combobox")
         self.gridLayout.addWidget(self.graph_combobox, 1, 1, 1, 1)
@@ -89,12 +89,12 @@ class Ui_Form(object):
         self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout_2.setSpacing(2)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.okButton = QtWidgets.QPushButton(Form)
+        self.okButton = QtWidgets.QPushButton(parent=Form)
         icon = QtGui.QIcon.fromTheme("dialog-ok")
         self.okButton.setIcon(icon)
         self.okButton.setObjectName("okButton")
         self.horizontalLayout_2.addWidget(self.okButton)
-        self.deleteButton = QtWidgets.QPushButton(Form)
+        self.deleteButton = QtWidgets.QPushButton(parent=Form)
         icon = QtGui.QIcon.fromTheme("dialog-cancel")
         self.deleteButton.setIcon(icon)
         self.deleteButton.setObjectName("deleteButton")
@@ -111,7 +111,7 @@ class Ui_Form(object):
 "Single number for points (e.g. 1e-6); \n"
 "two numbers separated by space for regions (e.g. 1e-6 5e-6). \n"
 "Changing between regions and points is NOT possible"))
-        self.groupBox.setTitle(_translate("Form", "Average"))
+        self.groupBox.setTitle(_translate("Form", "Average (drop-down used for pts and regions)"))
         self.left_pt.setSuffix(_translate("Form", " pts"))
         self.left_pt.setPrefix(_translate("Form", "- "))
         self.right_pt.setSuffix(_translate("Form", " pts"))
@@ -119,6 +119,7 @@ class Ui_Form(object):
         self.average_combobox.setItemText(0, _translate("Form", "Mean"))
         self.average_combobox.setItemText(1, _translate("Form", "Sum"))
         self.average_combobox.setItemText(2, _translate("Form", "Integral"))
+        self.average_combobox.setItemText(3, _translate("Form", "Std. deviation"))
         self.groupBox_2.setTitle(_translate("Form", "Special value"))
         self.special_comboBox.setToolTip(_translate("Form", "Automatic selection of respective points"))
         self.special_comboBox.setItemText(0, _translate("Form", "max(y)"))

src/gui_qt/_py/qfiledialog.py

@@ -1,179 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/qfiledialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_QFileDialog(object):
-    def setupUi(self, QFileDialog):
-        QFileDialog.setObjectName("QFileDialog")
-        QFileDialog.resize(521, 316)
-        QFileDialog.setSizeGripEnabled(True)
-        self.gridlayout = QtWidgets.QGridLayout(QFileDialog)
-        self.gridlayout.setObjectName("gridlayout")
-        self.lookInLabel = QtWidgets.QLabel(QFileDialog)
-        self.lookInLabel.setObjectName("lookInLabel")
-        self.gridlayout.addWidget(self.lookInLabel, 0, 0, 1, 1)
-        self.hboxlayout = QtWidgets.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.lookInCombo = QtWidgets.QComboBox(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.lookInCombo.sizePolicy().hasHeightForWidth())
-        self.lookInCombo.setSizePolicy(sizePolicy)
-        self.lookInCombo.setMinimumSize(QtCore.QSize(50, 0))
-        self.lookInCombo.setObjectName("lookInCombo")
-        self.hboxlayout.addWidget(self.lookInCombo)
-        self.backButton = QtWidgets.QToolButton(QFileDialog)
-        self.backButton.setObjectName("backButton")
-        self.hboxlayout.addWidget(self.backButton)
-        self.forwardButton = QtWidgets.QToolButton(QFileDialog)
-        self.forwardButton.setObjectName("forwardButton")
-        self.hboxlayout.addWidget(self.forwardButton)
-        self.toParentButton = QtWidgets.QToolButton(QFileDialog)
-        self.toParentButton.setObjectName("toParentButton")
-        self.hboxlayout.addWidget(self.toParentButton)
-        self.newFolderButton = QtWidgets.QToolButton(QFileDialog)
-        self.newFolderButton.setObjectName("newFolderButton")
-        self.hboxlayout.addWidget(self.newFolderButton)
-        self.listModeButton = QtWidgets.QToolButton(QFileDialog)
-        self.listModeButton.setObjectName("listModeButton")
-        self.hboxlayout.addWidget(self.listModeButton)
-        self.detailModeButton = QtWidgets.QToolButton(QFileDialog)
-        self.detailModeButton.setObjectName("detailModeButton")
-        self.hboxlayout.addWidget(self.detailModeButton)
-        self.gridlayout.addLayout(self.hboxlayout, 0, 1, 1, 2)
-        self.splitter = QtWidgets.QSplitter(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.splitter.sizePolicy().hasHeightForWidth())
-        self.splitter.setSizePolicy(sizePolicy)
-        self.splitter.setOrientation(QtCore.Qt.Horizontal)
-        self.splitter.setChildrenCollapsible(False)
-        self.splitter.setObjectName("splitter")
-        self.sidebar = QtWidgets.QListWidget(self.splitter)
-        self.sidebar.setObjectName("sidebar")
-        self.frame = QtWidgets.QFrame(self.splitter)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.frame.setObjectName("frame")
-        self.vboxlayout = QtWidgets.QVBoxLayout(self.frame)
-        self.vboxlayout.setContentsMargins(0, 0, 0, 0)
-        self.vboxlayout.setSpacing(0)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.stackedWidget = QtWidgets.QStackedWidget(self.frame)
-        self.stackedWidget.setObjectName("stackedWidget")
-        self.page = QtWidgets.QWidget()
-        self.page.setObjectName("page")
-        self.vboxlayout1 = QtWidgets.QVBoxLayout(self.page)
-        self.vboxlayout1.setContentsMargins(0, 0, 0, 0)
-        self.vboxlayout1.setSpacing(0)
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.listView = QtWidgets.QListView(self.page)
-        self.listView.setObjectName("listView")
-        self.vboxlayout1.addWidget(self.listView)
-        self.stackedWidget.addWidget(self.page)
-        self.page_2 = QtWidgets.QWidget()
-        self.page_2.setObjectName("page_2")
-        self.vboxlayout2 = QtWidgets.QVBoxLayout(self.page_2)
-        self.vboxlayout2.setContentsMargins(0, 0, 0, 0)
-        self.vboxlayout2.setSpacing(0)
-        self.vboxlayout2.setObjectName("vboxlayout2")
-        self.treeView = QtWidgets.QTreeView(self.page_2)
-        self.treeView.setObjectName("treeView")
-        self.vboxlayout2.addWidget(self.treeView)
-        self.stackedWidget.addWidget(self.page_2)
-        self.vboxlayout.addWidget(self.stackedWidget)
-        self.gridlayout.addWidget(self.splitter, 1, 0, 1, 3)
-        self.fileNameLabel = QtWidgets.QLabel(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileNameLabel.sizePolicy().hasHeightForWidth())
-        self.fileNameLabel.setSizePolicy(sizePolicy)
-        self.fileNameLabel.setMinimumSize(QtCore.QSize(0, 0))
-        self.fileNameLabel.setObjectName("fileNameLabel")
-        self.gridlayout.addWidget(self.fileNameLabel, 2, 0, 1, 1)
-        self.fileNameEdit = QtWidgets.QLineEdit(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileNameEdit.sizePolicy().hasHeightForWidth())
-        self.fileNameEdit.setSizePolicy(sizePolicy)
-        self.fileNameEdit.setObjectName("fileNameEdit")
-        self.gridlayout.addWidget(self.fileNameEdit, 2, 1, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(QFileDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Vertical)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridlayout.addWidget(self.buttonBox, 2, 2, 2, 1)
-        self.fileTypeLabel = QtWidgets.QLabel(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileTypeLabel.sizePolicy().hasHeightForWidth())
-        self.fileTypeLabel.setSizePolicy(sizePolicy)
-        self.fileTypeLabel.setObjectName("fileTypeLabel")
-        self.gridlayout.addWidget(self.fileTypeLabel, 3, 0, 1, 1)
-        self.fileTypeCombo = QtWidgets.QComboBox(QFileDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.fileTypeCombo.sizePolicy().hasHeightForWidth())
-        self.fileTypeCombo.setSizePolicy(sizePolicy)
-        self.fileTypeCombo.setObjectName("fileTypeCombo")
-        self.gridlayout.addWidget(self.fileTypeCombo, 3, 1, 1, 1)
-
-        self.retranslateUi(QFileDialog)
-        self.stackedWidget.setCurrentIndex(0)
-        QtCore.QMetaObject.connectSlotsByName(QFileDialog)
-        QFileDialog.setTabOrder(self.lookInCombo, self.backButton)
-        QFileDialog.setTabOrder(self.backButton, self.forwardButton)
-        QFileDialog.setTabOrder(self.forwardButton, self.toParentButton)
-        QFileDialog.setTabOrder(self.toParentButton, self.newFolderButton)
-        QFileDialog.setTabOrder(self.newFolderButton, self.listModeButton)
-        QFileDialog.setTabOrder(self.listModeButton, self.detailModeButton)
-        QFileDialog.setTabOrder(self.detailModeButton, self.sidebar)
-        QFileDialog.setTabOrder(self.sidebar, self.treeView)
-        QFileDialog.setTabOrder(self.treeView, self.listView)
-        QFileDialog.setTabOrder(self.listView, self.fileNameEdit)
-        QFileDialog.setTabOrder(self.fileNameEdit, self.buttonBox)
-        QFileDialog.setTabOrder(self.buttonBox, self.fileTypeCombo)
-
-    def retranslateUi(self, QFileDialog):
-        _translate = QtCore.QCoreApplication.translate
-        self.lookInLabel.setText(_translate("QFileDialog", "Look in:"))
-        self.backButton.setToolTip(_translate("QFileDialog", "Back"))
-        self.backButton.setAccessibleName(_translate("QFileDialog", "Back"))
-        self.backButton.setAccessibleDescription(_translate("QFileDialog", "Go back"))
-        self.backButton.setShortcut(_translate("QFileDialog", "Alt+Left"))
-        self.forwardButton.setToolTip(_translate("QFileDialog", "Forward"))
-        self.forwardButton.setAccessibleName(_translate("QFileDialog", "Forward"))
-        self.forwardButton.setAccessibleDescription(_translate("QFileDialog", "Go forward"))
-        self.forwardButton.setShortcut(_translate("QFileDialog", "Alt+Right"))
-        self.toParentButton.setToolTip(_translate("QFileDialog", "Parent Directory"))
-        self.toParentButton.setAccessibleName(_translate("QFileDialog", "Parent Directory"))
-        self.toParentButton.setAccessibleDescription(_translate("QFileDialog", "Go to the parent directory"))
-        self.toParentButton.setShortcut(_translate("QFileDialog", "Alt+Up"))
-        self.newFolderButton.setToolTip(_translate("QFileDialog", "Create New Folder"))
-        self.newFolderButton.setAccessibleName(_translate("QFileDialog", "Create New Folder"))
-        self.newFolderButton.setAccessibleDescription(_translate("QFileDialog", "Create a New Folder"))
-        self.listModeButton.setToolTip(_translate("QFileDialog", "List View"))
-        self.listModeButton.setAccessibleName(_translate("QFileDialog", "List View"))
-        self.listModeButton.setAccessibleDescription(_translate("QFileDialog", "Change to list view mode"))
-        self.detailModeButton.setToolTip(_translate("QFileDialog", "Detail View"))
-        self.detailModeButton.setAccessibleName(_translate("QFileDialog", "Detail View"))
-        self.detailModeButton.setAccessibleDescription(_translate("QFileDialog", "Change to detail view mode"))
-        self.sidebar.setAccessibleName(_translate("QFileDialog", "Sidebar"))
-        self.sidebar.setAccessibleDescription(_translate("QFileDialog", "List of places and bookmarks"))
-        self.listView.setAccessibleName(_translate("QFileDialog", "Files"))
-        self.treeView.setAccessibleName(_translate("QFileDialog", "Files"))
-        self.fileTypeLabel.setText(_translate("QFileDialog", "Files of type:"))

src/gui_qt/_py/save_fit_parameter.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/save_fit_parameter.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/save_fit_parameter.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_fitparameter_save_dialog(object):
@@ -16,88 +15,88 @@ class Ui_fitparameter_save_dialog(object):
         fitparameter_save_dialog.resize(578, 537)
         self.gridLayout = QtWidgets.QGridLayout(fitparameter_save_dialog)
         self.gridLayout.setObjectName("gridLayout")
-        self.save_path_line = QtWidgets.QLineEdit(fitparameter_save_dialog)
+        self.save_path_line = QtWidgets.QLineEdit(parent=fitparameter_save_dialog)
         self.save_path_line.setObjectName("save_path_line")
         self.gridLayout.addWidget(self.save_path_line, 0, 1, 1, 6)
-        self.save_path_button = QtWidgets.QToolButton(fitparameter_save_dialog)
+        self.save_path_button = QtWidgets.QToolButton(parent=fitparameter_save_dialog)
         self.save_path_button.setObjectName("save_path_button")
         self.gridLayout.addWidget(self.save_path_button, 0, 0, 1, 1)
-        self.comment_line = QtWidgets.QLineEdit(fitparameter_save_dialog)
+        self.comment_line = QtWidgets.QLineEdit(parent=fitparameter_save_dialog)
         self.comment_line.setObjectName("comment_line")
         self.gridLayout.addWidget(self.comment_line, 6, 6, 1, 1)
-        self.prec_spinbox = QtWidgets.QSpinBox(fitparameter_save_dialog)
+        self.prec_spinbox = QtWidgets.QSpinBox(parent=fitparameter_save_dialog)
         self.prec_spinbox.setProperty("value", 8)
         self.prec_spinbox.setObjectName("prec_spinbox")
         self.gridLayout.addWidget(self.prec_spinbox, 6, 3, 1, 1)
-        self.line_2 = QtWidgets.QFrame(fitparameter_save_dialog)
+        self.line_2 = QtWidgets.QFrame(parent=fitparameter_save_dialog)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.gridLayout.addWidget(self.line_2, 4, 0, 1, 7)
-        self.label_5 = QtWidgets.QLabel(fitparameter_save_dialog)
+        self.label_5 = QtWidgets.QLabel(parent=fitparameter_save_dialog)
         self.label_5.setObjectName("label_5")
         self.gridLayout.addWidget(self.label_5, 3, 0, 1, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.col_line = QtWidgets.QLineEdit(fitparameter_save_dialog)
+        self.col_line = QtWidgets.QLineEdit(parent=fitparameter_save_dialog)
         self.col_line.setObjectName("col_line")
         self.horizontalLayout.addWidget(self.col_line)
-        self.usage_button = QtWidgets.QToolButton(fitparameter_save_dialog)
+        self.usage_button = QtWidgets.QToolButton(parent=fitparameter_save_dialog)
         self.usage_button.setObjectName("usage_button")
         self.horizontalLayout.addWidget(self.usage_button)
         self.gridLayout.addLayout(self.horizontalLayout, 3, 1, 1, 6)
-        self.header_edit = QtWidgets.QTextEdit(fitparameter_save_dialog)
+        self.header_edit = QtWidgets.QTextEdit(parent=fitparameter_save_dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.header_edit.sizePolicy().hasHeightForWidth())
         self.header_edit.setSizePolicy(sizePolicy)
         self.header_edit.setObjectName("header_edit")
         self.gridLayout.addWidget(self.header_edit, 5, 1, 1, 6)
-        self.label_4 = QtWidgets.QLabel(fitparameter_save_dialog)
+        self.label_4 = QtWidgets.QLabel(parent=fitparameter_save_dialog)
         self.label_4.setObjectName("label_4")
         self.gridLayout.addWidget(self.label_4, 6, 2, 1, 1)
-        self.line = QtWidgets.QFrame(fitparameter_save_dialog)
+        self.line = QtWidgets.QFrame(parent=fitparameter_save_dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.line.sizePolicy().hasHeightForWidth())
         self.line.setSizePolicy(sizePolicy)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.gridLayout.addWidget(self.line, 1, 0, 1, 7)
-        self.missing_value_line = QtWidgets.QLineEdit(fitparameter_save_dialog)
+        self.missing_value_line = QtWidgets.QLineEdit(parent=fitparameter_save_dialog)
         self.missing_value_line.setObjectName("missing_value_line")
         self.gridLayout.addWidget(self.missing_value_line, 6, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(fitparameter_save_dialog)
+        self.label_2 = QtWidgets.QLabel(parent=fitparameter_save_dialog)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 6, 4, 1, 1)
-        self.tableWidget = QtWidgets.QTableWidget(fitparameter_save_dialog)
+        self.tableWidget = QtWidgets.QTableWidget(parent=fitparameter_save_dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.tableWidget.sizePolicy().hasHeightForWidth())
         self.tableWidget.setSizePolicy(sizePolicy)
-        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
-        self.tableWidget.setDragDropMode(QtWidgets.QAbstractItemView.DragOnly)
+        self.tableWidget.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.DragOnly)
         self.tableWidget.setAlternatingRowColors(True)
-        self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.tableWidget.setColumnCount(2)
         self.tableWidget.setObjectName("tableWidget")
         self.tableWidget.setRowCount(0)
         self.tableWidget.horizontalHeader().setVisible(False)
         self.tableWidget.horizontalHeader().setStretchLastSection(True)
         self.gridLayout.addWidget(self.tableWidget, 2, 0, 1, 7)
-        self.buttonBox = QtWidgets.QDialogButtonBox(fitparameter_save_dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=fitparameter_save_dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 7, 0, 1, 7)
-        self.label = QtWidgets.QLabel(fitparameter_save_dialog)
+        self.label = QtWidgets.QLabel(parent=fitparameter_save_dialog)
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 6, 0, 1, 1)
-        self.header_checkBox = QtWidgets.QCheckBox(fitparameter_save_dialog)
+        self.header_checkBox = QtWidgets.QCheckBox(parent=fitparameter_save_dialog)
         self.header_checkBox.setObjectName("header_checkBox")
         self.gridLayout.addWidget(self.header_checkBox, 5, 0, 1, 1)
         self.label_5.setBuddy(self.col_line)
@@ -105,8 +104,8 @@ class Ui_fitparameter_save_dialog(object):
         self.label.setBuddy(self.missing_value_line)
 
         self.retranslateUi(fitparameter_save_dialog)
-        self.buttonBox.accepted.connect(fitparameter_save_dialog.accept)
+        self.buttonBox.accepted.connect(fitparameter_save_dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(fitparameter_save_dialog.reject)
+        self.buttonBox.rejected.connect(fitparameter_save_dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(fitparameter_save_dialog)
         fitparameter_save_dialog.setTabOrder(self.save_path_button, self.save_path_line)
         fitparameter_save_dialog.setTabOrder(self.save_path_line, self.tableWidget)

src/gui_qt/_py/save_fitmodel_dialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/save_fitmodel_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/save_fitmodel_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_SaveDialog(object):
@@ -16,44 +15,44 @@ class Ui_SaveDialog(object):
         SaveDialog.resize(400, 166)
         self.gridLayout = QtWidgets.QGridLayout(SaveDialog)
         self.gridLayout.setObjectName("gridLayout")
-        self.label_2 = QtWidgets.QLabel(SaveDialog)
+        self.label_2 = QtWidgets.QLabel(parent=SaveDialog)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(SaveDialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=SaveDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 3, 1, 1, 1)
-        self.comboBox = QtWidgets.QComboBox(SaveDialog)
+        self.comboBox = QtWidgets.QComboBox(parent=SaveDialog)
         self.comboBox.setObjectName("comboBox")
         self.gridLayout.addWidget(self.comboBox, 1, 1, 1, 1)
-        self.label = QtWidgets.QLabel(SaveDialog)
+        self.label = QtWidgets.QLabel(parent=SaveDialog)
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.lineEdit = QtWidgets.QLineEdit(SaveDialog)
+        self.lineEdit = QtWidgets.QLineEdit(parent=SaveDialog)
         self.lineEdit.setObjectName("lineEdit")
         self.gridLayout.addWidget(self.lineEdit, 0, 1, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.gridLayout.addItem(spacerItem, 4, 1, 1, 1)
-        self.frame = QtWidgets.QFrame(SaveDialog)
+        self.frame = QtWidgets.QFrame(parent=SaveDialog)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
         self.frame.setObjectName("frame")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setSpacing(0)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.lineEdit_2 = QtWidgets.QLineEdit(self.frame)
+        self.lineEdit_2 = QtWidgets.QLineEdit(parent=self.frame)
         self.lineEdit_2.setObjectName("lineEdit_2")
         self.horizontalLayout.addWidget(self.lineEdit_2)
-        self.toolButton = QtWidgets.QToolButton(self.frame)
+        self.toolButton = QtWidgets.QToolButton(parent=self.frame)
         self.toolButton.setObjectName("toolButton")
         self.horizontalLayout.addWidget(self.toolButton)
         self.gridLayout.addWidget(self.frame, 2, 1, 1, 1)
 
         self.retranslateUi(SaveDialog)
-        self.buttonBox.accepted.connect(SaveDialog.accept)
+        self.buttonBox.accepted.connect(SaveDialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(SaveDialog.reject)
+        self.buttonBox.rejected.connect(SaveDialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(SaveDialog)
 
     def retranslateUi(self, SaveDialog):

src/gui_qt/_py/save_options.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/save_options.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(400, 58)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.label = QtWidgets.QLabel(Form)
-        self.label.setObjectName("label")
-        self.verticalLayout.addWidget(self.label)
-        self.checkBox = QtWidgets.QCheckBox(Form)
-        self.checkBox.setObjectName("checkBox")
-        self.verticalLayout.addWidget(self.checkBox)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "Form"))
-        self.label.setText(_translate("Form", "<html><head/><body><p>Use <span style=\" font-weight:600;\">&lt;label&gt;</span> as placeholder in filename for data label.</p></body></html>"))
-        self.checkBox.setText(_translate("Form", "Replace spaces with underscore"))

src/gui_qt/_py/saveoptions.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/saveoptions.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Frame(object):
-    def setupUi(self, Frame):
-        Frame.setObjectName("Frame")
-        Frame.resize(464, 62)
-        Frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        Frame.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Frame)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.label = QtWidgets.QLabel(Frame)
-        self.label.setObjectName("label")
-        self.verticalLayout.addWidget(self.label)
-        self.line = QtWidgets.QFrame(Frame)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.verticalLayout.addWidget(self.line)
-        self.checkBox = QtWidgets.QCheckBox(Frame)
-        self.checkBox.setChecked(True)
-        self.checkBox.setObjectName("checkBox")
-        self.verticalLayout.addWidget(self.checkBox)
-
-        self.retranslateUi(Frame)
-        QtCore.QMetaObject.connectSlotsByName(Frame)
-
-    def retranslateUi(self, Frame):
-        _translate = QtCore.QCoreApplication.translate
-        Frame.setWindowTitle(_translate("Frame", "Frame"))
-        self.label.setText(_translate("Frame", "<html><head/><body><p>Use <span style=\" font-weight:600;\">&lt;label&gt;</span> as placeholder in filename. (e.g. <span style=\" font-style:italic;\">t1_&lt;label&gt;.dat</span>)</p></body></html>"))
-        self.checkBox.setText(_translate("Frame", "Replace spaces with underscore"))

src/gui_qt/_py/sdmodelwidget.py

@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/sdmodelwidget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_SDParameter(object):
-    def setupUi(self, SDParameter):
-        SDParameter.setObjectName("SDParameter")
-        SDParameter.setWindowModality(QtCore.Qt.WindowModal)
-        SDParameter.resize(290, 37)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(SDParameter.sizePolicy().hasHeightForWidth())
-        SDParameter.setSizePolicy(sizePolicy)
-        SDParameter.setAutoFillBackground(True)
-        self.verticalLayout = QtWidgets.QVBoxLayout(SDParameter)
-        self.verticalLayout.setContentsMargins(1, 0, 0, 0)
-        self.verticalLayout.setSpacing(0)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.gridLayout = QtWidgets.QGridLayout()
-        self.gridLayout.setContentsMargins(6, -1, 0, -1)
-        self.gridLayout.setSpacing(0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.parameter_line = LineEdit(SDParameter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.parameter_line.sizePolicy().hasHeightForWidth())
-        self.parameter_line.setSizePolicy(sizePolicy)
-        self.parameter_line.setObjectName("parameter_line")
-        self.gridLayout.addWidget(self.parameter_line, 0, 2, 1, 1)
-        self.parametername = QtWidgets.QLabel(SDParameter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(10)
-        sizePolicy.setHeightForWidth(self.parametername.sizePolicy().hasHeightForWidth())
-        self.parametername.setSizePolicy(sizePolicy)
-        self.parametername.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.parametername.setObjectName("parametername")
-        self.gridLayout.addWidget(self.parametername, 0, 0, 1, 1)
-        self.checkBox = QtWidgets.QCheckBox(SDParameter)
-        self.checkBox.setObjectName("checkBox")
-        self.gridLayout.addWidget(self.checkBox, 0, 3, 1, 1)
-        self.line_2 = QtWidgets.QFrame(SDParameter)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line_2.setObjectName("line_2")
-        self.gridLayout.addWidget(self.line_2, 1, 0, 1, 4)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem, 0, 1, 1, 1)
-        self.verticalLayout.addLayout(self.gridLayout)
-
-        self.retranslateUi(SDParameter)
-        QtCore.QMetaObject.connectSlotsByName(SDParameter)
-
-    def retranslateUi(self, SDParameter):
-        _translate = QtCore.QCoreApplication.translate
-        SDParameter.setWindowTitle(_translate("SDParameter", "Form"))
-        self.parameter_line.setText(_translate("SDParameter", "1"))
-        self.parametername.setText(_translate("SDParameter", "Fitparameter"))
-        self.checkBox.setText(_translate("SDParameter", "Fix?"))
-from nmrevalgui.lib.forms import LineEdit

src/gui_qt/_py/selection_widget.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/selection_widget.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_SelectionWidget(object):
-    def setupUi(self, SelectionWidget):
-        SelectionWidget.setObjectName("SelectionWidget")
-        SelectionWidget.resize(367, 43)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(SelectionWidget.sizePolicy().hasHeightForWidth())
-        SelectionWidget.setSizePolicy(sizePolicy)
-        self.horizontalLayout = QtWidgets.QHBoxLayout(SelectionWidget)
-        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout.setSpacing(0)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(SelectionWidget)
-        self.label.setObjectName("label")
-        self.horizontalLayout.addWidget(self.label)
-        self.comboBox = QtWidgets.QComboBox(SelectionWidget)
-        self.comboBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
-        self.comboBox.setFrame(True)
-        self.comboBox.setObjectName("comboBox")
-        self.horizontalLayout.addWidget(self.comboBox)
-
-        self.retranslateUi(SelectionWidget)
-        QtCore.QMetaObject.connectSlotsByName(SelectionWidget)
-
-    def retranslateUi(self, SelectionWidget):
-        _translate = QtCore.QCoreApplication.translate
-        SelectionWidget.setWindowTitle(_translate("SelectionWidget", "Form"))
-        self.label.setText(_translate("SelectionWidget", "TextLabel"))

src/gui_qt/_py/setbyfunction_dialog.py

@@ -1,225 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/setbyfunction_dialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_NewCurveDialog(object):
-    def setupUi(self, NewCurveDialog):
-        NewCurveDialog.setObjectName("NewCurveDialog")
-        NewCurveDialog.resize(648, 578)
-        self.gridLayout_4 = QtWidgets.QGridLayout(NewCurveDialog)
-        self.gridLayout_4.setObjectName("gridLayout_4")
-        self.groupBox_2 = QtWidgets.QGroupBox(NewCurveDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth())
-        self.groupBox_2.setSizePolicy(sizePolicy)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox_2)
-        self.gridLayout_2.setContentsMargins(2, 2, 2, 2)
-        self.gridLayout_2.setSpacing(2)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.lineEdit_3 = QtWidgets.QLineEdit(self.groupBox_2)
-        self.lineEdit_3.setPlaceholderText("")
-        self.lineEdit_3.setObjectName("lineEdit_3")
-        self.gridLayout_2.addWidget(self.lineEdit_3, 0, 1, 1, 1)
-        self.lineEdit_5 = QtWidgets.QLineEdit(self.groupBox_2)
-        self.lineEdit_5.setObjectName("lineEdit_5")
-        self.gridLayout_2.addWidget(self.lineEdit_5, 0, 6, 1, 1)
-        self.label_5 = QtWidgets.QLabel(self.groupBox_2)
-        self.label_5.setObjectName("label_5")
-        self.gridLayout_2.addWidget(self.label_5, 0, 3, 1, 1)
-        self.lineEdit_4 = QtWidgets.QLineEdit(self.groupBox_2)
-        self.lineEdit_4.setObjectName("lineEdit_4")
-        self.gridLayout_2.addWidget(self.lineEdit_4, 0, 4, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.groupBox_2)
-        self.label_4.setObjectName("label_4")
-        self.gridLayout_2.addWidget(self.label_4, 0, 0, 1, 1)
-        self.label_6 = QtWidgets.QLabel(self.groupBox_2)
-        self.label_6.setObjectName("label_6")
-        self.gridLayout_2.addWidget(self.label_6, 0, 5, 1, 1)
-        self.checkBox = QtWidgets.QCheckBox(self.groupBox_2)
-        self.checkBox.setLayoutDirection(QtCore.Qt.RightToLeft)
-        self.checkBox.setObjectName("checkBox")
-        self.gridLayout_2.addWidget(self.checkBox, 0, 7, 1, 1)
-        self.gridLayout_4.addWidget(self.groupBox_2, 0, 0, 1, 1)
-        self.groupBox = QtWidgets.QGroupBox(NewCurveDialog)
-        self.groupBox.setObjectName("groupBox")
-        self.gridLayout_3 = QtWidgets.QGridLayout(self.groupBox)
-        self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout_3.setSpacing(2)
-        self.gridLayout_3.setObjectName("gridLayout_3")
-        self.lineEdit_2 = QtWidgets.QLineEdit(self.groupBox)
-        self.lineEdit_2.setObjectName("lineEdit_2")
-        self.gridLayout_3.addWidget(self.lineEdit_2, 1, 2, 1, 1)
-        self.comboBox_6 = QtWidgets.QComboBox(self.groupBox)
-        self.comboBox_6.setObjectName("comboBox_6")
-        self.gridLayout_3.addWidget(self.comboBox_6, 2, 0, 1, 1)
-        self.pushButton = QtWidgets.QPushButton(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pushButton.sizePolicy().hasHeightForWidth())
-        self.pushButton.setSizePolicy(sizePolicy)
-        self.pushButton.setObjectName("pushButton")
-        self.gridLayout_3.addWidget(self.pushButton, 4, 0, 1, 1)
-        self.verticalLayout = QtWidgets.QVBoxLayout()
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.gridLayout_3.addLayout(self.verticalLayout, 3, 0, 1, 1)
-        self.comboBox_7 = QtWidgets.QComboBox(self.groupBox)
-        self.comboBox_7.setObjectName("comboBox_7")
-        self.gridLayout_3.addWidget(self.comboBox_7, 2, 2, 1, 1)
-        self.lineEdit = QtWidgets.QLineEdit(self.groupBox)
-        self.lineEdit.setObjectName("lineEdit")
-        self.gridLayout_3.addWidget(self.lineEdit, 1, 0, 1, 1)
-        self.label = QtWidgets.QLabel(self.groupBox)
-        self.label.setObjectName("label")
-        self.gridLayout_3.addWidget(self.label, 0, 0, 1, 1)
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.gridLayout_3.addLayout(self.verticalLayout_2, 3, 2, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
-        self.label_2.setSizePolicy(sizePolicy)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout_3.addWidget(self.label_2, 0, 2, 1, 1)
-        self.line_2 = QtWidgets.QFrame(self.groupBox)
-        self.line_2.setFrameShape(QtWidgets.QFrame.VLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line_2.setObjectName("line_2")
-        self.gridLayout_3.addWidget(self.line_2, 0, 1, 4, 1)
-        self.gridLayout_4.addWidget(self.groupBox, 1, 0, 1, 1)
-        self.groupBox_3 = QtWidgets.QGroupBox(NewCurveDialog)
-        self.groupBox_3.setObjectName("groupBox_3")
-        self.gridLayout = QtWidgets.QGridLayout(self.groupBox_3)
-        self.gridLayout.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout.setSpacing(2)
-        self.gridLayout.setObjectName("gridLayout")
-        self.doubleSpinBox = QtWidgets.QDoubleSpinBox(self.groupBox_3)
-        self.doubleSpinBox.setDecimals(1)
-        self.doubleSpinBox.setMaximum(20.0)
-        self.doubleSpinBox.setSingleStep(0.5)
-        self.doubleSpinBox.setProperty("value", 1.0)
-        self.doubleSpinBox.setObjectName("doubleSpinBox")
-        self.gridLayout.addWidget(self.doubleSpinBox, 3, 4, 1, 1)
-        self.line = QtWidgets.QFrame(self.groupBox_3)
-        self.line.setFrameShape(QtWidgets.QFrame.VLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.gridLayout.addWidget(self.line, 0, 2, 4, 1)
-        self.spinBox = QtWidgets.QSpinBox(self.groupBox_3)
-        self.spinBox.setMaximum(100)
-        self.spinBox.setProperty("value", 10)
-        self.spinBox.setObjectName("spinBox")
-        self.gridLayout.addWidget(self.spinBox, 3, 1, 1, 1)
-        self.label_8 = QtWidgets.QLabel(self.groupBox_3)
-        self.label_8.setObjectName("label_8")
-        self.gridLayout.addWidget(self.label_8, 0, 4, 1, 1)
-        self.comboBox = SymbolStyleEditor(self.groupBox_3)
-        self.comboBox.setObjectName("comboBox")
-        self.gridLayout.addWidget(self.comboBox, 1, 1, 1, 1)
-        self.comboBox_2 = LineStyleEditor(self.groupBox_3)
-        self.comboBox_2.setObjectName("comboBox_2")
-        self.gridLayout.addWidget(self.comboBox_2, 1, 4, 1, 1)
-        self.label_7 = QtWidgets.QLabel(self.groupBox_3)
-        self.label_7.setObjectName("label_7")
-        self.gridLayout.addWidget(self.label_7, 0, 1, 1, 1)
-        self.comboBox_4 = ColorListEditor(self.groupBox_3)
-        self.comboBox_4.setObjectName("comboBox_4")
-        self.gridLayout.addWidget(self.comboBox_4, 2, 4, 1, 1)
-        self.comboBox_5 = ColorListEditor(self.groupBox_3)
-        self.comboBox_5.setObjectName("comboBox_5")
-        self.gridLayout.addWidget(self.comboBox_5, 2, 1, 1, 1)
-        self.gridLayout_4.addWidget(self.groupBox_3, 2, 0, 1, 1)
-        self.groupBox_21 = QtWidgets.QGroupBox(NewCurveDialog)
-        self.groupBox_21.setObjectName("groupBox_21")
-        self.gridLayout_5 = QtWidgets.QGridLayout(self.groupBox_21)
-        self.gridLayout_5.setObjectName("gridLayout_5")
-        self.label_3 = QtWidgets.QLabel(self.groupBox_21)
-        self.label_3.setObjectName("label_3")
-        self.gridLayout_5.addWidget(self.label_3, 0, 0, 1, 1)
-        self.lineEdit_6 = QtWidgets.QLineEdit(self.groupBox_21)
-        self.lineEdit_6.setObjectName("lineEdit_6")
-        self.gridLayout_5.addWidget(self.lineEdit_6, 0, 1, 1, 1)
-        self.label_10 = QtWidgets.QLabel(self.groupBox_21)
-        self.label_10.setObjectName("label_10")
-        self.gridLayout_5.addWidget(self.label_10, 0, 2, 1, 1)
-        self.comboBox_3 = QtWidgets.QComboBox(self.groupBox_21)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.comboBox_3.sizePolicy().hasHeightForWidth())
-        self.comboBox_3.setSizePolicy(sizePolicy)
-        self.comboBox_3.setObjectName("comboBox_3")
-        self.gridLayout_5.addWidget(self.comboBox_3, 0, 3, 1, 1)
-        self.gridLayout_4.addWidget(self.groupBox_21, 3, 0, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(NewCurveDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout_4.addWidget(self.buttonBox, 5, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_4.addItem(spacerItem, 4, 0, 1, 1)
-        self.label_5.setBuddy(self.lineEdit_4)
-        self.label_4.setBuddy(self.lineEdit_3)
-        self.label_6.setBuddy(self.lineEdit_5)
-        self.label.setBuddy(self.lineEdit)
-        self.label_2.setBuddy(self.lineEdit_2)
-        self.label_8.setBuddy(self.comboBox_2)
-        self.label_7.setBuddy(self.comboBox)
-        self.label_3.setBuddy(self.lineEdit_6)
-        self.label_10.setBuddy(self.comboBox_3)
-
-        self.retranslateUi(NewCurveDialog)
-        self.comboBox.setCurrentIndex(-1)
-        self.comboBox_2.setCurrentIndex(-1)
-        self.buttonBox.accepted.connect(NewCurveDialog.accept)
-        self.buttonBox.rejected.connect(NewCurveDialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(NewCurveDialog)
-        NewCurveDialog.setTabOrder(self.lineEdit_3, self.lineEdit_4)
-        NewCurveDialog.setTabOrder(self.lineEdit_4, self.lineEdit_5)
-        NewCurveDialog.setTabOrder(self.lineEdit_5, self.checkBox)
-        NewCurveDialog.setTabOrder(self.checkBox, self.lineEdit)
-        NewCurveDialog.setTabOrder(self.lineEdit, self.comboBox)
-        NewCurveDialog.setTabOrder(self.comboBox, self.spinBox)
-        NewCurveDialog.setTabOrder(self.spinBox, self.comboBox_2)
-        NewCurveDialog.setTabOrder(self.comboBox_2, self.doubleSpinBox)
-        NewCurveDialog.setTabOrder(self.doubleSpinBox, self.lineEdit_6)
-        NewCurveDialog.setTabOrder(self.lineEdit_6, self.comboBox_3)
-        NewCurveDialog.setTabOrder(self.comboBox_3, self.buttonBox)
-
-    def retranslateUi(self, NewCurveDialog):
-        _translate = QtCore.QCoreApplication.translate
-        NewCurveDialog.setWindowTitle(_translate("NewCurveDialog", "Create new data by function"))
-        self.groupBox_2.setTitle(_translate("NewCurveDialog", "Control variable i"))
-        self.lineEdit_3.setText(_translate("NewCurveDialog", "0"))
-        self.lineEdit_5.setText(_translate("NewCurveDialog", "10"))
-        self.label_5.setText(_translate("NewCurveDialog", "Stop at"))
-        self.lineEdit_4.setText(_translate("NewCurveDialog", "1"))
-        self.label_4.setText(_translate("NewCurveDialog", "Start at"))
-        self.label_6.setText(_translate("NewCurveDialog", "# points"))
-        self.checkBox.setText(_translate("NewCurveDialog", "Logarithmic?"))
-        self.groupBox.setTitle(_translate("NewCurveDialog", "Expressions"))
-        self.lineEdit_2.setText(_translate("NewCurveDialog", "x**2"))
-        self.pushButton.setText(_translate("NewCurveDialog", "Check"))
-        self.lineEdit.setText(_translate("NewCurveDialog", "i"))
-        self.label.setText(_translate("NewCurveDialog", " x = "))
-        self.label_2.setText(_translate("NewCurveDialog", " y = "))
-        self.groupBox_3.setTitle(_translate("NewCurveDialog", "Look"))
-        self.label_8.setText(_translate("NewCurveDialog", "Line"))
-        self.label_7.setText(_translate("NewCurveDialog", "Symbol"))
-        self.groupBox_21.setTitle(_translate("NewCurveDialog", "Designation"))
-        self.label_3.setText(_translate("NewCurveDialog", "Name"))
-        self.label_10.setText(_translate("NewCurveDialog", "Graph"))
-from ..lib.delegates import ColorListEditor, LineStyleEditor, SymbolStyleEditor

src/gui_qt/_py/shift_scale_dialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/shift_scale_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/shift_scale_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_shift_dialog(object):
@@ -16,23 +15,23 @@ class Ui_shift_dialog(object):
         shift_dialog.resize(959, 639)
         self.verticalLayout = QtWidgets.QVBoxLayout(shift_dialog)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.splitter = QtWidgets.QSplitter(shift_dialog)
+        self.splitter = QtWidgets.QSplitter(parent=shift_dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.splitter.sizePolicy().hasHeightForWidth())
         self.splitter.setSizePolicy(sizePolicy)
-        self.splitter.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Horizontal)
         self.splitter.setObjectName("splitter")
-        self.tabWidget = QtWidgets.QTabWidget(self.splitter)
+        self.tabWidget = QtWidgets.QTabWidget(parent=self.splitter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.tabWidget.sizePolicy().hasHeightForWidth())
         self.tabWidget.setSizePolicy(sizePolicy)
         self.tabWidget.setObjectName("tabWidget")
         self.shift_page = QtWidgets.QWidget()
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.shift_page.sizePolicy().hasHeightForWidth())
@@ -41,42 +40,42 @@ class Ui_shift_dialog(object):
         self.gridLayout_2 = QtWidgets.QGridLayout(self.shift_page)
         self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.label_7 = QtWidgets.QLabel(self.shift_page)
+        self.label_7 = QtWidgets.QLabel(parent=self.shift_page)
         self.label_7.setObjectName("label_7")
         self.gridLayout_2.addWidget(self.label_7, 2, 0, 1, 1)
-        self.label = QtWidgets.QLabel(self.shift_page)
+        self.label = QtWidgets.QLabel(parent=self.shift_page)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
         self.label.setSizePolicy(sizePolicy)
-        self.label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.label.setObjectName("label")
         self.gridLayout_2.addWidget(self.label, 2, 1, 1, 1)
-        self.x_shift_spinbox = SciSpinBox(self.shift_page)
+        self.x_shift_spinbox = SciSpinBox(parent=self.shift_page)
         self.x_shift_spinbox.setMinimumSize(QtCore.QSize(150, 0))
         self.x_shift_spinbox.setDecimals(3)
         self.x_shift_spinbox.setProperty("value", 0.0)
         self.x_shift_spinbox.setObjectName("x_shift_spinbox")
         self.gridLayout_2.addWidget(self.x_shift_spinbox, 2, 2, 1, 1)
-        self.label_5 = QtWidgets.QLabel(self.shift_page)
+        self.label_5 = QtWidgets.QLabel(parent=self.shift_page)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth())
         self.label_5.setSizePolicy(sizePolicy)
-        self.label_5.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_5.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.label_5.setObjectName("label_5")
         self.gridLayout_2.addWidget(self.label_5, 3, 1, 1, 1)
-        self.y_shift_spinbox = SciSpinBox(self.shift_page)
+        self.y_shift_spinbox = SciSpinBox(parent=self.shift_page)
         self.y_shift_spinbox.setMinimumSize(QtCore.QSize(150, 0))
         self.y_shift_spinbox.setDecimals(3)
         self.y_shift_spinbox.setProperty("value", 0.0)
         self.y_shift_spinbox.setObjectName("y_shift_spinbox")
         self.gridLayout_2.addWidget(self.y_shift_spinbox, 3, 2, 1, 1)
-        self.shift_table = QtWidgets.QTableWidget(self.shift_page)
+        self.shift_table = QtWidgets.QTableWidget(parent=self.shift_page)
-        self.shift_table.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
+        self.shift_table.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection)
-        self.shift_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.shift_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.shift_table.setColumnCount(3)
         self.shift_table.setObjectName("shift_table")
         self.shift_table.setRowCount(0)
@@ -90,7 +89,7 @@ class Ui_shift_dialog(object):
         self.gridLayout_2.addWidget(self.shift_table, 0, 0, 1, 3)
         self.tabWidget.addTab(self.shift_page, "")
         self.scale_page = QtWidgets.QWidget()
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.scale_page.sizePolicy().hasHeightForWidth())
@@ -99,17 +98,17 @@ class Ui_shift_dialog(object):
         self.gridLayout = QtWidgets.QGridLayout(self.scale_page)
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
         self.gridLayout.setObjectName("gridLayout")
-        self.label_3 = QtWidgets.QLabel(self.scale_page)
+        self.label_3 = QtWidgets.QLabel(parent=self.scale_page)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
         self.label_3.setSizePolicy(sizePolicy)
-        self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.label_3.setObjectName("label_3")
         self.gridLayout.addWidget(self.label_3, 1, 1, 1, 1)
-        self.x_scale_spinbox = SciSpinBox(self.scale_page)
+        self.x_scale_spinbox = SciSpinBox(parent=self.scale_page)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.x_scale_spinbox.sizePolicy().hasHeightForWidth())
@@ -119,20 +118,20 @@ class Ui_shift_dialog(object):
         self.x_scale_spinbox.setProperty("value", 1.0)
         self.x_scale_spinbox.setObjectName("x_scale_spinbox")
         self.gridLayout.addWidget(self.x_scale_spinbox, 1, 2, 1, 1)
-        self.label_6 = QtWidgets.QLabel(self.scale_page)
+        self.label_6 = QtWidgets.QLabel(parent=self.scale_page)
         self.label_6.setObjectName("label_6")
         self.gridLayout.addWidget(self.label_6, 1, 0, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.scale_page)
+        self.label_2 = QtWidgets.QLabel(parent=self.scale_page)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
         self.label_2.setSizePolicy(sizePolicy)
-        self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 2, 1, 1, 1)
-        self.y_scale_spinbox = SciSpinBox(self.scale_page)
+        self.y_scale_spinbox = SciSpinBox(parent=self.scale_page)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.y_scale_spinbox.sizePolicy().hasHeightForWidth())
@@ -142,9 +141,9 @@ class Ui_shift_dialog(object):
         self.y_scale_spinbox.setProperty("value", 1.0)
         self.y_scale_spinbox.setObjectName("y_scale_spinbox")
         self.gridLayout.addWidget(self.y_scale_spinbox, 2, 2, 1, 1)
-        self.scale_table = QtWidgets.QTableWidget(self.scale_page)
+        self.scale_table = QtWidgets.QTableWidget(parent=self.scale_page)
-        self.scale_table.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
+        self.scale_table.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection)
-        self.scale_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.scale_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.scale_table.setObjectName("scale_table")
         self.scale_table.setColumnCount(3)
         self.scale_table.setRowCount(0)
@@ -157,13 +156,13 @@ class Ui_shift_dialog(object):
         self.scale_table.verticalHeader().setVisible(False)
         self.gridLayout.addWidget(self.scale_table, 0, 0, 1, 3)
         self.tabWidget.addTab(self.scale_page, "")
-        self.verticalFrame_2 = QtWidgets.QFrame(self.splitter)
+        self.verticalFrame_2 = QtWidgets.QFrame(parent=self.splitter)
         self.verticalFrame_2.setObjectName("verticalFrame_2")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.verticalFrame_2)
         self.verticalLayout_2.setSpacing(3)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.graphicsView = PlotWidget(self.verticalFrame_2)
+        self.graphicsView = NMRPlotWidget(parent=self.verticalFrame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.graphicsView.sizePolicy().hasHeightForWidth())
@@ -172,26 +171,26 @@ class Ui_shift_dialog(object):
         self.verticalLayout_2.addWidget(self.graphicsView)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
-        self.label_4 = QtWidgets.QLabel(self.verticalFrame_2)
+        self.label_4 = QtWidgets.QLabel(parent=self.verticalFrame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
         self.label_4.setSizePolicy(sizePolicy)
         self.label_4.setObjectName("label_4")
         self.horizontalLayout.addWidget(self.label_4)
-        self.xlog_checkbox = QtWidgets.QCheckBox(self.verticalFrame_2)
+        self.xlog_checkbox = QtWidgets.QCheckBox(parent=self.verticalFrame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.xlog_checkbox.sizePolicy().hasHeightForWidth())
         self.xlog_checkbox.setSizePolicy(sizePolicy)
         self.xlog_checkbox.setObjectName("xlog_checkbox")
         self.horizontalLayout.addWidget(self.xlog_checkbox)
-        self.ylog_checkbox = QtWidgets.QCheckBox(self.verticalFrame_2)
+        self.ylog_checkbox = QtWidgets.QCheckBox(parent=self.verticalFrame_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.ylog_checkbox.sizePolicy().hasHeightForWidth())
@@ -200,19 +199,19 @@ class Ui_shift_dialog(object):
         self.horizontalLayout.addWidget(self.ylog_checkbox)
         self.verticalLayout_2.addLayout(self.horizontalLayout)
         self.verticalLayout.addWidget(self.splitter)
-        self.line = QtWidgets.QFrame(shift_dialog)
+        self.line = QtWidgets.QFrame(parent=shift_dialog)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.verticalLayout.addWidget(self.line)
-        self.frame = QtWidgets.QFrame(shift_dialog)
+        self.frame = QtWidgets.QFrame(parent=shift_dialog)
         self.frame.setObjectName("frame")
         self.gridLayout_4 = QtWidgets.QGridLayout(self.frame)
         self.gridLayout_4.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_4.setSpacing(3)
         self.gridLayout_4.setObjectName("gridLayout_4")
-        self.value_checkbox = QtWidgets.QCheckBox(self.frame)
+        self.value_checkbox = QtWidgets.QCheckBox(parent=self.frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.value_checkbox.sizePolicy().hasHeightForWidth())
@@ -220,34 +219,34 @@ class Ui_shift_dialog(object):
         self.value_checkbox.setChecked(True)
         self.value_checkbox.setObjectName("value_checkbox")
         self.gridLayout_4.addWidget(self.value_checkbox, 0, 1, 1, 1)
-        self.overwrite_checkbox = QtWidgets.QCheckBox(self.frame)
+        self.overwrite_checkbox = QtWidgets.QCheckBox(parent=self.frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.overwrite_checkbox.sizePolicy().hasHeightForWidth())
         self.overwrite_checkbox.setSizePolicy(sizePolicy)
         self.overwrite_checkbox.setObjectName("overwrite_checkbox")
         self.gridLayout_4.addWidget(self.overwrite_checkbox, 0, 0, 1, 1)
-        self.data_newgraph = QtWidgets.QCheckBox(self.frame)
+        self.data_newgraph = QtWidgets.QCheckBox(parent=self.frame)
         self.data_newgraph.setChecked(True)
         self.data_newgraph.setObjectName("data_newgraph")
         self.gridLayout_4.addWidget(self.data_newgraph, 1, 0, 1, 1)
-        self.data_combobox = QtWidgets.QComboBox(self.frame)
+        self.data_combobox = QtWidgets.QComboBox(parent=self.frame)
         self.data_combobox.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.data_combobox.sizePolicy().hasHeightForWidth())
         self.data_combobox.setSizePolicy(sizePolicy)
         self.data_combobox.setObjectName("data_combobox")
         self.gridLayout_4.addWidget(self.data_combobox, 2, 0, 1, 1)
-        self.values_newgraph = QtWidgets.QCheckBox(self.frame)
+        self.values_newgraph = QtWidgets.QCheckBox(parent=self.frame)
         self.values_newgraph.setChecked(True)
         self.values_newgraph.setObjectName("values_newgraph")
         self.gridLayout_4.addWidget(self.values_newgraph, 1, 1, 1, 1)
-        self.values_combobox = QtWidgets.QComboBox(self.frame)
+        self.values_combobox = QtWidgets.QComboBox(parent=self.frame)
         self.values_combobox.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.values_combobox.sizePolicy().hasHeightForWidth())
@@ -255,9 +254,9 @@ class Ui_shift_dialog(object):
         self.values_combobox.setObjectName("values_combobox")
         self.gridLayout_4.addWidget(self.values_combobox, 2, 1, 1, 1)
         self.verticalLayout.addWidget(self.frame)
-        self.buttonBox = QtWidgets.QDialogButtonBox(shift_dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=shift_dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
         self.label.setBuddy(self.x_shift_spinbox)
@@ -267,8 +266,8 @@ class Ui_shift_dialog(object):
 
         self.retranslateUi(shift_dialog)
         self.tabWidget.setCurrentIndex(0)
-        self.buttonBox.accepted.connect(shift_dialog.accept)
+        self.buttonBox.accepted.connect(shift_dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(shift_dialog.reject)
+        self.buttonBox.rejected.connect(shift_dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(shift_dialog)
         shift_dialog.setTabOrder(self.tabWidget, self.shift_table)
         shift_dialog.setTabOrder(self.shift_table, self.x_shift_spinbox)
@@ -310,5 +309,5 @@ class Ui_shift_dialog(object):
         self.overwrite_checkbox.setText(_translate("shift_dialog", "Overwrite data"))
         self.data_newgraph.setText(_translate("shift_dialog", "New graph"))
         self.values_newgraph.setText(_translate("shift_dialog", "New graph"))
+from ..lib.graph_items import NMRPlotWidget
 from ..lib.spinboxes import SciSpinBox
-from pyqtgraph import PlotWidget

src/gui_qt/_py/skipdialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/skipdialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/skipdialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_SkipDialog(object):
@@ -17,43 +16,43 @@ class Ui_SkipDialog(object):
         SkipDialog.setWindowTitle("")
         self.gridLayout = QtWidgets.QGridLayout(SkipDialog)
         self.gridLayout.setObjectName("gridLayout")
-        self.label_2 = QtWidgets.QLabel(SkipDialog)
+        self.label_2 = QtWidgets.QLabel(parent=SkipDialog)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.gridLayout.addItem(spacerItem, 3, 0, 1, 1)
-        self.label_4 = QtWidgets.QLabel(SkipDialog)
+        self.label_4 = QtWidgets.QLabel(parent=SkipDialog)
         self.label_4.setObjectName("label_4")
         self.gridLayout.addWidget(self.label_4, 0, 0, 1, 4)
-        self.offset_spinbox = QtWidgets.QSpinBox(SkipDialog)
+        self.offset_spinbox = QtWidgets.QSpinBox(parent=SkipDialog)
         self.offset_spinbox.setMinimum(0)
         self.offset_spinbox.setMaximum(1)
         self.offset_spinbox.setProperty("value", 0)
         self.offset_spinbox.setObjectName("offset_spinbox")
         self.gridLayout.addWidget(self.offset_spinbox, 1, 3, 1, 1)
-        self.label = QtWidgets.QLabel(SkipDialog)
+        self.label = QtWidgets.QLabel(parent=SkipDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
         self.label.setSizePolicy(sizePolicy)
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 1, 2, 1, 1)
-        self.step_spinbox = QtWidgets.QSpinBox(SkipDialog)
+        self.step_spinbox = QtWidgets.QSpinBox(parent=SkipDialog)
         self.step_spinbox.setMinimum(2)
         self.step_spinbox.setObjectName("step_spinbox")
         self.gridLayout.addWidget(self.step_spinbox, 1, 1, 1, 1)
-        self.invert_check = QtWidgets.QCheckBox(SkipDialog)
+        self.invert_check = QtWidgets.QCheckBox(parent=SkipDialog)
-        self.invert_check.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.invert_check.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
         self.invert_check.setObjectName("invert_check")
         self.gridLayout.addWidget(self.invert_check, 1, 4, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(SkipDialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=SkipDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 4, 0, 1, 5)
-        self.hide_button = QtWidgets.QRadioButton(SkipDialog)
+        self.hide_button = QtWidgets.QRadioButton(parent=SkipDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.hide_button.sizePolicy().hasHeightForWidth())
@@ -64,8 +63,8 @@ class Ui_SkipDialog(object):
         self.buttonGroup.setObjectName("buttonGroup")
         self.buttonGroup.addButton(self.hide_button)
         self.gridLayout.addWidget(self.hide_button, 2, 0, 1, 2)
-        self.delete_button = QtWidgets.QRadioButton(SkipDialog)
+        self.delete_button = QtWidgets.QRadioButton(parent=SkipDialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.delete_button.sizePolicy().hasHeightForWidth())
@@ -77,8 +76,8 @@ class Ui_SkipDialog(object):
         self.label.setBuddy(self.offset_spinbox)
 
         self.retranslateUi(SkipDialog)
-        self.buttonBox.accepted.connect(SkipDialog.accept)
+        self.buttonBox.accepted.connect(SkipDialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(SkipDialog.reject)
+        self.buttonBox.rejected.connect(SkipDialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(SkipDialog)
         SkipDialog.setTabOrder(self.step_spinbox, self.offset_spinbox)
         SkipDialog.setTabOrder(self.offset_spinbox, self.invert_check)

src/gui_qt/_py/smoothdialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/smoothdialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/smoothdialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_SmoothDialog(object):
@@ -17,56 +16,64 @@ class Ui_SmoothDialog(object):
         self.gridLayout = QtWidgets.QGridLayout(SmoothDialog)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        self.frac_label = QtWidgets.QLabel(SmoothDialog)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.gridLayout.addItem(spacerItem, 7, 0, 1, 1)
+        self.frac_label = QtWidgets.QLabel(parent=SmoothDialog)
         self.frac_label.setObjectName("frac_label")
-        self.gridLayout.addWidget(self.frac_label, 1, 0, 1, 1)
+        self.gridLayout.addWidget(self.frac_label, 2, 0, 1, 1)
-        self.widget_2 = QtWidgets.QWidget(SmoothDialog)
+        self.line = QtWidgets.QFrame(parent=SmoothDialog)
-        self.widget_2.setObjectName("widget_2")
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.widget_2)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
-        self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout_3.setSpacing(3)
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.label_3 = QtWidgets.QLabel(self.widget_2)
-        self.label_3.setObjectName("label_3")
-        self.horizontalLayout_3.addWidget(self.label_3)
-        self.iter_spinBox = QtWidgets.QSpinBox(self.widget_2)
-        self.iter_spinBox.setMaximum(3)
-        self.iter_spinBox.setSingleStep(1)
-        self.iter_spinBox.setProperty("value", 1)
-        self.iter_spinBox.setObjectName("iter_spinBox")
-        self.horizontalLayout_3.addWidget(self.iter_spinBox)
-        self.gridLayout.addWidget(self.widget_2, 3, 0, 1, 2)
-        self.line = QtWidgets.QFrame(SmoothDialog)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
         self.line.setObjectName("line")
-        self.gridLayout.addWidget(self.line, 4, 0, 1, 2)
+        self.gridLayout.addWidget(self.line, 5, 0, 1, 2)
-        self.buttonBox = QtWidgets.QDialogButtonBox(SmoothDialog)
+        self.widget = QtWidgets.QWidget(parent=SmoothDialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 7, 0, 1, 2)
-        self.widget = QtWidgets.QWidget(SmoothDialog)
         self.widget.setObjectName("widget")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.widget)
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_2.setSpacing(3)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label = QtWidgets.QLabel(self.widget)
+        self.label = QtWidgets.QLabel(parent=self.widget)
         self.label.setObjectName("label")
         self.horizontalLayout_2.addWidget(self.label)
-        self.polynom_spinBox = QtWidgets.QSpinBox(self.widget)
+        self.polynom_spinBox = QtWidgets.QSpinBox(parent=self.widget)
         self.polynom_spinBox.setMinimum(1)
         self.polynom_spinBox.setMaximum(3)
         self.polynom_spinBox.setObjectName("polynom_spinBox")
         self.horizontalLayout_2.addWidget(self.polynom_spinBox)
-        self.gridLayout.addWidget(self.widget, 2, 0, 1, 2)
+        self.gridLayout.addWidget(self.widget, 3, 0, 1, 2)
-        self.frac_spinBox = QtWidgets.QSpinBox(SmoothDialog)
+        self.y_checkBox = QtWidgets.QCheckBox(parent=SmoothDialog)
+        self.y_checkBox.setObjectName("y_checkBox")
+        self.gridLayout.addWidget(self.y_checkBox, 6, 1, 1, 1)
+        self.x_checkBox = QtWidgets.QCheckBox(parent=SmoothDialog)
+        self.x_checkBox.setObjectName("x_checkBox")
+        self.gridLayout.addWidget(self.x_checkBox, 6, 0, 1, 1)
+        self.widget_2 = QtWidgets.QWidget(parent=SmoothDialog)
+        self.widget_2.setObjectName("widget_2")
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.widget_2)
+        self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_3.setSpacing(3)
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.label_3 = QtWidgets.QLabel(parent=self.widget_2)
+        self.label_3.setObjectName("label_3")
+        self.horizontalLayout_3.addWidget(self.label_3)
+        self.iter_spinBox = QtWidgets.QSpinBox(parent=self.widget_2)
+        self.iter_spinBox.setMaximum(3)
+        self.iter_spinBox.setSingleStep(1)
+        self.iter_spinBox.setProperty("value", 1)
+        self.iter_spinBox.setObjectName("iter_spinBox")
+        self.horizontalLayout_3.addWidget(self.iter_spinBox)
+        self.gridLayout.addWidget(self.widget_2, 4, 0, 1, 2)
+        self.frac_spinBox = QtWidgets.QSpinBox(parent=SmoothDialog)
         self.frac_spinBox.setMinimum(1)
         self.frac_spinBox.setMaximum(999)
         self.frac_spinBox.setObjectName("frac_spinBox")
-        self.gridLayout.addWidget(self.frac_spinBox, 1, 1, 1, 1)
+        self.gridLayout.addWidget(self.frac_spinBox, 2, 1, 1, 1)
-        self.comboBox = QtWidgets.QComboBox(SmoothDialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=SmoothDialog)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
+        self.buttonBox.setObjectName("buttonBox")
+        self.gridLayout.addWidget(self.buttonBox, 8, 0, 1, 2)
+        self.comboBox = QtWidgets.QComboBox(parent=SmoothDialog)
         self.comboBox.setObjectName("comboBox")
         self.comboBox.addItem("")
         self.comboBox.addItem("")
@@ -77,22 +84,17 @@ class Ui_SmoothDialog(object):
         self.comboBox.addItem("")
         self.comboBox.addItem("")
         self.comboBox.addItem("")
-        self.gridLayout.addWidget(self.comboBox, 0, 0, 1, 2)
+        self.gridLayout.addWidget(self.comboBox, 1, 0, 1, 2)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.label_2 = QtWidgets.QLabel(parent=SmoothDialog)
-        self.gridLayout.addItem(spacerItem, 6, 0, 1, 1)
+        self.label_2.setObjectName("label_2")
-        self.y_checkBox = QtWidgets.QCheckBox(SmoothDialog)
+        self.gridLayout.addWidget(self.label_2, 0, 0, 1, 2)
-        self.y_checkBox.setObjectName("y_checkBox")
-        self.gridLayout.addWidget(self.y_checkBox, 5, 1, 1, 1)
-        self.x_checkBox = QtWidgets.QCheckBox(SmoothDialog)
-        self.x_checkBox.setObjectName("x_checkBox")
-        self.gridLayout.addWidget(self.x_checkBox, 5, 0, 1, 1)
         self.frac_label.setBuddy(self.frac_spinBox)
-        self.label_3.setBuddy(self.iter_spinBox)
         self.label.setBuddy(self.polynom_spinBox)
+        self.label_3.setBuddy(self.iter_spinBox)
 
         self.retranslateUi(SmoothDialog)
-        self.buttonBox.accepted.connect(SmoothDialog.accept)
+        self.buttonBox.accepted.connect(SmoothDialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(SmoothDialog.reject)
+        self.buttonBox.rejected.connect(SmoothDialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(SmoothDialog)
         SmoothDialog.setTabOrder(self.comboBox, self.frac_spinBox)
         SmoothDialog.setTabOrder(self.frac_spinBox, self.polynom_spinBox)
@@ -104,9 +106,11 @@ class Ui_SmoothDialog(object):
         _translate = QtCore.QCoreApplication.translate
         SmoothDialog.setWindowTitle(_translate("SmoothDialog", "1D smoothing filter"))
         self.frac_label.setText(_translate("SmoothDialog", "Window length"))
-        self.label_3.setText(_translate("SmoothDialog", "Iterations"))
         self.label.setText(_translate("SmoothDialog", "Polynomial degree"))
         self.polynom_spinBox.setToolTip(_translate("SmoothDialog", "Deg"))
+        self.y_checkBox.setText(_translate("SmoothDialog", "y log-spaced?"))
+        self.x_checkBox.setText(_translate("SmoothDialog", "x log-spaced?"))
+        self.label_3.setText(_translate("SmoothDialog", "Iterations"))
         self.frac_spinBox.setToolTip(_translate("SmoothDialog", "<html><head/><body><p>Number of data points used as smoothing window.</p></body></html>"))
         self.comboBox.setItemText(0, _translate("SmoothDialog", "Moving mean"))
         self.comboBox.setItemText(1, _translate("SmoothDialog", "Savitzky-Golay"))
@@ -117,5 +121,4 @@ class Ui_SmoothDialog(object):
         self.comboBox.setItemText(6, _translate("SmoothDialog", "Moving maximum"))
         self.comboBox.setItemText(7, _translate("SmoothDialog", "Moving minimum"))
         self.comboBox.setItemText(8, _translate("SmoothDialog", "Moving sum"))
-        self.y_checkBox.setText(_translate("SmoothDialog", "y log-spaced?"))
+        self.label_2.setText(_translate("SmoothDialog", "<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> Sets must be sorted for correct results</p></body></html>"))
-        self.x_checkBox.setText(_translate("SmoothDialog", "x log-spaced?"))

src/gui_qt/_py/t1_calc_dialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/t1_calc_dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/t1_calc_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
@@ -16,25 +15,25 @@ class Ui_Dialog(object):
         Dialog.resize(582, 698)
         self.gridLayout_2 = QtWidgets.QGridLayout(Dialog)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.groupBox_2 = QtWidgets.QGroupBox(Dialog)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=Dialog)
         self.groupBox_2.setObjectName("groupBox_2")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_2)
         self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_2.setSpacing(0)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.specdens_combobox = QtWidgets.QComboBox(self.groupBox_2)
+        self.specdens_combobox = QtWidgets.QComboBox(parent=self.groupBox_2)
         self.specdens_combobox.setObjectName("specdens_combobox")
         self.verticalLayout_2.addWidget(self.specdens_combobox)
-        self.specdens_frame = QtWidgets.QFrame(self.groupBox_2)
+        self.specdens_frame = QtWidgets.QFrame(parent=self.groupBox_2)
         self.specdens_frame.setObjectName("specdens_frame")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.specdens_frame)
         self.verticalLayout_3.setSpacing(0)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.verticalLayout_2.addWidget(self.specdens_frame)
-        self.coupling_combobox = QtWidgets.QComboBox(self.groupBox_2)
+        self.coupling_combobox = QtWidgets.QComboBox(parent=self.groupBox_2)
         self.coupling_combobox.setObjectName("coupling_combobox")
         self.verticalLayout_2.addWidget(self.coupling_combobox)
-        self.coupling_frame = QtWidgets.QFrame(self.groupBox_2)
+        self.coupling_frame = QtWidgets.QFrame(parent=self.groupBox_2)
         self.coupling_frame.setObjectName("coupling_frame")
         self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.coupling_frame)
         self.verticalLayout_4.setContentsMargins(-1, -1, 1, 1)
@@ -42,43 +41,43 @@ class Ui_Dialog(object):
         self.verticalLayout_4.setObjectName("verticalLayout_4")
         self.verticalLayout_2.addWidget(self.coupling_frame)
         self.gridLayout_2.addWidget(self.groupBox_2, 1, 0, 1, 1)
-        self.groupBox_3 = QtWidgets.QGroupBox(Dialog)
+        self.groupBox_3 = QtWidgets.QGroupBox(parent=Dialog)
         self.groupBox_3.setObjectName("groupBox_3")
         self.gridLayout_4 = QtWidgets.QGridLayout(self.groupBox_3)
         self.gridLayout_4.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_4.setSpacing(3)
         self.gridLayout_4.setObjectName("gridLayout_4")
-        self.graph_combobox = QtWidgets.QComboBox(self.groupBox_3)
+        self.graph_combobox = QtWidgets.QComboBox(parent=self.groupBox_3)
         self.graph_combobox.setEnabled(False)
         self.graph_combobox.setObjectName("graph_combobox")
         self.gridLayout_4.addWidget(self.graph_combobox, 1, 1, 1, 1)
-        self.graph_checkbox = QtWidgets.QCheckBox(self.groupBox_3)
+        self.graph_checkbox = QtWidgets.QCheckBox(parent=self.groupBox_3)
         self.graph_checkbox.setChecked(True)
         self.graph_checkbox.setObjectName("graph_checkbox")
         self.gridLayout_4.addWidget(self.graph_checkbox, 1, 0, 1, 1)
-        self.relax_combox = QtWidgets.QComboBox(self.groupBox_3)
+        self.relax_combox = QtWidgets.QComboBox(parent=self.groupBox_3)
         self.relax_combox.setObjectName("relax_combox")
         self.relax_combox.addItem("")
         self.relax_combox.addItem("")
         self.gridLayout_4.addWidget(self.relax_combox, 0, 0, 1, 2)
         self.gridLayout_2.addWidget(self.groupBox_3, 2, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.gridLayout_2.addItem(spacerItem, 3, 0, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Apply|QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout_2.addWidget(self.buttonBox, 4, 0, 1, 1)
-        self.groupBox = QtWidgets.QGroupBox(Dialog)
+        self.groupBox = QtWidgets.QGroupBox(parent=Dialog)
         self.groupBox.setObjectName("groupBox")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.groupBox)
         self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_3.setSpacing(2)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.second_x_lineEdit = QtWidgets.QLineEdit(self.groupBox)
+        self.second_x_lineEdit = QtWidgets.QLineEdit(parent=self.groupBox)
         self.second_x_lineEdit.setObjectName("second_x_lineEdit")
         self.gridLayout_3.addWidget(self.second_x_lineEdit, 10, 1, 1, 1)
-        self.x_input_combobox = QtWidgets.QComboBox(self.groupBox)
+        self.x_input_combobox = QtWidgets.QComboBox(parent=self.groupBox)
         self.x_input_combobox.setObjectName("x_input_combobox")
         self.x_input_combobox.addItem("")
         self.x_input_combobox.addItem("")
@@ -86,85 +85,85 @@ class Ui_Dialog(object):
         self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_4.setSpacing(2)
         self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.radioButton = QtWidgets.QRadioButton(self.groupBox)
+        self.radioButton = QtWidgets.QRadioButton(parent=self.groupBox)
         self.radioButton.setChecked(True)
         self.radioButton.setObjectName("radioButton")
         self.buttonGroup = QtWidgets.QButtonGroup(Dialog)
         self.buttonGroup.setObjectName("buttonGroup")
         self.buttonGroup.addButton(self.radioButton)
         self.horizontalLayout_4.addWidget(self.radioButton)
-        self.radioButton_2 = QtWidgets.QRadioButton(self.groupBox)
+        self.radioButton_2 = QtWidgets.QRadioButton(parent=self.groupBox)
         self.radioButton_2.setObjectName("radioButton_2")
         self.buttonGroup.addButton(self.radioButton_2)
         self.horizontalLayout_4.addWidget(self.radioButton_2)
-        self.radioButton_4 = QtWidgets.QRadioButton(self.groupBox)
+        self.radioButton_4 = QtWidgets.QRadioButton(parent=self.groupBox)
         self.radioButton_4.setObjectName("radioButton_4")
         self.buttonGroup.addButton(self.radioButton_4)
         self.horizontalLayout_4.addWidget(self.radioButton_4)
-        self.radioButton_3 = QtWidgets.QRadioButton(self.groupBox)
+        self.radioButton_3 = QtWidgets.QRadioButton(parent=self.groupBox)
         self.radioButton_3.setObjectName("radioButton_3")
         self.buttonGroup.addButton(self.radioButton_3)
         self.horizontalLayout_4.addWidget(self.radioButton_3)
         self.gridLayout_3.addLayout(self.horizontalLayout_4, 0, 0, 1, 2)
-        self.label_7 = QtWidgets.QLabel(self.groupBox)
+        self.label_7 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_7.setObjectName("label_7")
         self.gridLayout_3.addWidget(self.label_7, 10, 0, 1, 1)
-        self.line = QtWidgets.QFrame(self.groupBox)
+        self.line = QtWidgets.QFrame(parent=self.groupBox)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line.setObjectName("line")
         self.gridLayout_3.addWidget(self.line, 9, 0, 1, 2)
-        self.line_2 = QtWidgets.QFrame(self.groupBox)
+        self.line_2 = QtWidgets.QFrame(parent=self.groupBox)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.gridLayout_3.addWidget(self.line_2, 7, 0, 1, 2)
-        self.range_widget = QtWidgets.QWidget(self.groupBox)
+        self.range_widget = QtWidgets.QWidget(parent=self.groupBox)
         self.range_widget.setObjectName("range_widget")
         self.gridLayout = QtWidgets.QGridLayout(self.range_widget)
         self.gridLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout.setObjectName("gridLayout")
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.gridLayout.addItem(spacerItem1, 0, 0, 1, 1)
-        self.stop_lineEdit = QtWidgets.QLineEdit(self.range_widget)
+        self.stop_lineEdit = QtWidgets.QLineEdit(parent=self.range_widget)
         self.stop_lineEdit.setObjectName("stop_lineEdit")
         self.gridLayout.addWidget(self.stop_lineEdit, 0, 3, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.range_widget)
+        self.label_4 = QtWidgets.QLabel(parent=self.range_widget)
         self.label_4.setObjectName("label_4")
         self.gridLayout.addWidget(self.label_4, 0, 2, 1, 1)
-        self.spinBox = QtWidgets.QSpinBox(self.range_widget)
+        self.spinBox = QtWidgets.QSpinBox(parent=self.range_widget)
         self.spinBox.setProperty("value", 50)
         self.spinBox.setObjectName("spinBox")
         self.gridLayout.addWidget(self.spinBox, 0, 5, 1, 1)
-        self.start_lineEdit = QtWidgets.QLineEdit(self.range_widget)
+        self.start_lineEdit = QtWidgets.QLineEdit(parent=self.range_widget)
         self.start_lineEdit.setObjectName("start_lineEdit")
         self.gridLayout.addWidget(self.start_lineEdit, 0, 1, 1, 1)
-        self.checkBox = QtWidgets.QCheckBox(self.range_widget)
+        self.checkBox = QtWidgets.QCheckBox(parent=self.range_widget)
         self.checkBox.setObjectName("checkBox")
         self.gridLayout.addWidget(self.checkBox, 0, 6, 1, 1)
         self.gridLayout_3.addWidget(self.range_widget, 2, 0, 1, 2)
-        self.data_widget = QtWidgets.QWidget(self.groupBox)
+        self.data_widget = QtWidgets.QWidget(parent=self.groupBox)
         self.data_widget.setObjectName("data_widget")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.data_widget)
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_2.setSpacing(2)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.tau_graph_combobox = QtWidgets.QComboBox(self.data_widget)
+        self.tau_graph_combobox = QtWidgets.QComboBox(parent=self.data_widget)
         self.tau_graph_combobox.setObjectName("tau_graph_combobox")
         self.horizontalLayout_2.addWidget(self.tau_graph_combobox)
-        self.tau_set_combobox = QtWidgets.QComboBox(self.data_widget)
+        self.tau_set_combobox = QtWidgets.QComboBox(parent=self.data_widget)
         self.tau_set_combobox.setObjectName("tau_set_combobox")
         self.horizontalLayout_2.addWidget(self.tau_set_combobox)
-        self.label_10 = QtWidgets.QLabel(self.data_widget)
+        self.label_10 = QtWidgets.QLabel(parent=self.data_widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_10.sizePolicy().hasHeightForWidth())
         self.label_10.setSizePolicy(sizePolicy)
         self.label_10.setObjectName("label_10")
         self.horizontalLayout_2.addWidget(self.label_10)
-        self.x_radioButton = QtWidgets.QRadioButton(self.data_widget)
+        self.x_radioButton = QtWidgets.QRadioButton(parent=self.data_widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.x_radioButton.sizePolicy().hasHeightForWidth())
@@ -174,8 +173,8 @@ class Ui_Dialog(object):
         self.buttonGroup_2.setObjectName("buttonGroup_2")
         self.buttonGroup_2.addButton(self.x_radioButton)
         self.horizontalLayout_2.addWidget(self.x_radioButton)
-        self.y_radioButton = QtWidgets.QRadioButton(self.data_widget)
+        self.y_radioButton = QtWidgets.QRadioButton(parent=self.data_widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.y_radioButton.sizePolicy().hasHeightForWidth())
@@ -185,67 +184,67 @@ class Ui_Dialog(object):
         self.buttonGroup_2.addButton(self.y_radioButton)
         self.horizontalLayout_2.addWidget(self.y_radioButton)
         self.gridLayout_3.addWidget(self.data_widget, 3, 0, 1, 2)
-        self.temp_widget = QtWidgets.QWidget(self.groupBox)
+        self.temp_widget = QtWidgets.QWidget(parent=self.groupBox)
         self.temp_widget.setObjectName("temp_widget")
         self.gridLayout_5 = QtWidgets.QGridLayout(self.temp_widget)
         self.gridLayout_5.setContentsMargins(0, 0, 0, 0)
         self.gridLayout_5.setHorizontalSpacing(6)
         self.gridLayout_5.setVerticalSpacing(0)
         self.gridLayout_5.setObjectName("gridLayout_5")
-        self.arr_widget = QtWidgets.QWidget(self.temp_widget)
+        self.arr_widget = QtWidgets.QWidget(parent=self.temp_widget)
         self.arr_widget.setObjectName("arr_widget")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.arr_widget)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setSpacing(2)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem2)
-        self.label = QtWidgets.QLabel(self.arr_widget)
+        self.label = QtWidgets.QLabel(parent=self.arr_widget)
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
-        self.tau0_lineEdit = QtWidgets.QLineEdit(self.arr_widget)
+        self.tau0_lineEdit = QtWidgets.QLineEdit(parent=self.arr_widget)
         self.tau0_lineEdit.setObjectName("tau0_lineEdit")
         self.horizontalLayout.addWidget(self.tau0_lineEdit)
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem3)
-        self.label_2 = QtWidgets.QLabel(self.arr_widget)
+        self.label_2 = QtWidgets.QLabel(parent=self.arr_widget)
         self.label_2.setObjectName("label_2")
         self.horizontalLayout.addWidget(self.label_2)
-        self.ea_lineEdit = QtWidgets.QLineEdit(self.arr_widget)
+        self.ea_lineEdit = QtWidgets.QLineEdit(parent=self.arr_widget)
         self.ea_lineEdit.setObjectName("ea_lineEdit")
         self.horizontalLayout.addWidget(self.ea_lineEdit)
         self.gridLayout_5.addWidget(self.arr_widget, 0, 1, 1, 1)
-        self.vft_widget = QtWidgets.QWidget(self.temp_widget)
+        self.vft_widget = QtWidgets.QWidget(parent=self.temp_widget)
         self.vft_widget.setObjectName("vft_widget")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.vft_widget)
         self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_3.setSpacing(2)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.label_3 = QtWidgets.QLabel(self.vft_widget)
+        self.label_3 = QtWidgets.QLabel(parent=self.vft_widget)
         self.label_3.setObjectName("label_3")
         self.horizontalLayout_3.addWidget(self.label_3)
-        self.tau0_vft_lineEdit = QtWidgets.QLineEdit(self.vft_widget)
+        self.tau0_vft_lineEdit = QtWidgets.QLineEdit(parent=self.vft_widget)
         self.tau0_vft_lineEdit.setObjectName("tau0_vft_lineEdit")
         self.horizontalLayout_3.addWidget(self.tau0_vft_lineEdit)
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_3.addItem(spacerItem4)
-        self.label_5 = QtWidgets.QLabel(self.vft_widget)
+        self.label_5 = QtWidgets.QLabel(parent=self.vft_widget)
         self.label_5.setObjectName("label_5")
         self.horizontalLayout_3.addWidget(self.label_5)
-        self.b_vft_lineEdit = QtWidgets.QLineEdit(self.vft_widget)
+        self.b_vft_lineEdit = QtWidgets.QLineEdit(parent=self.vft_widget)
         self.b_vft_lineEdit.setObjectName("b_vft_lineEdit")
         self.horizontalLayout_3.addWidget(self.b_vft_lineEdit)
-        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_3.addItem(spacerItem5)
-        self.label_6 = QtWidgets.QLabel(self.vft_widget)
+        self.label_6 = QtWidgets.QLabel(parent=self.vft_widget)
         self.label_6.setObjectName("label_6")
         self.horizontalLayout_3.addWidget(self.label_6)
-        self.t0_vft_lineEdit = QtWidgets.QLineEdit(self.vft_widget)
+        self.t0_vft_lineEdit = QtWidgets.QLineEdit(parent=self.vft_widget)
         self.t0_vft_lineEdit.setObjectName("t0_vft_lineEdit")
         self.horizontalLayout_3.addWidget(self.t0_vft_lineEdit)
         self.gridLayout_5.addWidget(self.vft_widget, 1, 1, 1, 1)
-        self.temp_combobox = QtWidgets.QComboBox(self.temp_widget)
+        self.temp_combobox = QtWidgets.QComboBox(parent=self.temp_widget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.temp_combobox.sizePolicy().hasHeightForWidth())
@@ -255,24 +254,24 @@ class Ui_Dialog(object):
         self.temp_combobox.addItem("")
         self.gridLayout_5.addWidget(self.temp_combobox, 0, 0, 2, 1)
         self.gridLayout_3.addWidget(self.temp_widget, 4, 0, 1, 2)
-        self.xtype_combobox = QtWidgets.QComboBox(self.groupBox)
+        self.xtype_combobox = QtWidgets.QComboBox(parent=self.groupBox)
         self.xtype_combobox.setObjectName("xtype_combobox")
         self.xtype_combobox.addItem("")
         self.xtype_combobox.addItem("")
         self.xtype_combobox.addItem("")
         self.xtype_combobox.addItem("")
         self.gridLayout_3.addWidget(self.xtype_combobox, 8, 1, 1, 1)
-        self.label_8 = QtWidgets.QLabel(self.groupBox)
+        self.label_8 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_8.setObjectName("label_8")
         self.gridLayout_3.addWidget(self.label_8, 8, 0, 1, 1)
-        self.label_9 = QtWidgets.QLabel(self.groupBox)
+        self.label_9 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_9.setObjectName("label_9")
         self.gridLayout_3.addWidget(self.label_9, 1, 0, 1, 1)
         self.gridLayout_2.addWidget(self.groupBox, 0, 0, 1, 1)
 
         self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject)
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):

src/gui_qt/_py/t1_dock.py

@@ -1,258 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/t1_dock.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_t1dialog(object):
-    def setupUi(self, t1dialog):
-        t1dialog.setObjectName("t1dialog")
-        t1dialog.resize(295, 771)
-        self.dockWidgetContents = QtWidgets.QWidget()
-        self.dockWidgetContents.setObjectName("dockWidgetContents")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.dockWidgetContents)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.scrollArea = QtWidgets.QScrollArea(self.dockWidgetContents)
-        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.scrollArea.setWidgetResizable(True)
-        self.scrollArea.setObjectName("scrollArea")
-        self.scrollAreaWidgetContents = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 279, 727))
-        self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
-        self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
-        self.verticalLayout_7.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_7.setSpacing(0)
-        self.verticalLayout_7.setObjectName("verticalLayout_7")
-        self.groupBox_1 = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox_1.setObjectName("groupBox_1")
-        self.gridLayout_3 = QtWidgets.QGridLayout(self.groupBox_1)
-        self.gridLayout_3.setVerticalSpacing(0)
-        self.gridLayout_3.setObjectName("gridLayout_3")
-        self.comboBox_3 = QtWidgets.QComboBox(self.groupBox_1)
-        self.comboBox_3.setObjectName("comboBox_3")
-        self.comboBox_3.addItem("")
-        self.comboBox_3.addItem("")
-        self.comboBox_3.addItem("")
-        self.comboBox_3.addItem("")
-        self.gridLayout_3.addWidget(self.comboBox_3, 0, 1, 1, 1)
-        self.label_6 = QtWidgets.QLabel(self.groupBox_1)
-        self.label_6.setObjectName("label_6")
-        self.gridLayout_3.addWidget(self.label_6, 0, 0, 1, 1)
-        self.comboBox_2 = QtWidgets.QComboBox(self.groupBox_1)
-        self.comboBox_2.setObjectName("comboBox_2")
-        self.comboBox_2.addItem("")
-        self.comboBox_2.addItem("")
-        self.comboBox_2.addItem("")
-        self.gridLayout_3.addWidget(self.comboBox_2, 1, 1, 1, 1)
-        self.label_5 = QtWidgets.QLabel(self.groupBox_1)
-        self.label_5.setObjectName("label_5")
-        self.gridLayout_3.addWidget(self.label_5, 1, 0, 1, 1)
-        self.verticalLayout_7.addWidget(self.groupBox_1)
-        self.groupBox_5 = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox_5.setObjectName("groupBox_5")
-        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.groupBox_5)
-        self.verticalLayout_6.setSpacing(0)
-        self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.comboBox_6 = QtWidgets.QComboBox(self.groupBox_5)
-        self.comboBox_6.setObjectName("comboBox_6")
-        self.comboBox_6.addItem("")
-        self.comboBox_6.addItem("")
-        self.comboBox_6.addItem("")
-        self.comboBox_6.addItem("")
-        self.verticalLayout_6.addWidget(self.comboBox_6)
-        self.frame = QtWidgets.QFrame(self.groupBox_5)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.frame.setObjectName("frame")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame)
-        self.horizontalLayout.setContentsMargins(0, 6, 0, 0)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label_9 = QtWidgets.QLabel(self.frame)
-        self.label_9.setObjectName("label_9")
-        self.horizontalLayout.addWidget(self.label_9)
-        self.lineEdit_2 = QtWidgets.QLineEdit(self.frame)
-        self.lineEdit_2.setObjectName("lineEdit_2")
-        self.horizontalLayout.addWidget(self.lineEdit_2)
-        self.label_10 = QtWidgets.QLabel(self.frame)
-        self.label_10.setObjectName("label_10")
-        self.horizontalLayout.addWidget(self.label_10)
-        self.lineEdit_3 = QtWidgets.QLineEdit(self.frame)
-        self.lineEdit_3.setObjectName("lineEdit_3")
-        self.horizontalLayout.addWidget(self.lineEdit_3)
-        self.checkBox = QtWidgets.QCheckBox(self.frame)
-        self.checkBox.setObjectName("checkBox")
-        self.horizontalLayout.addWidget(self.checkBox)
-        self.verticalLayout_6.addWidget(self.frame)
-        self.frame_2 = QtWidgets.QFrame(self.groupBox_5)
-        self.frame_2.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.frame_2.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.frame_2.setObjectName("frame_2")
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.frame_2)
-        self.horizontalLayout_2.setContentsMargins(0, 6, 0, 0)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label_11 = QtWidgets.QLabel(self.frame_2)
-        self.label_11.setObjectName("label_11")
-        self.horizontalLayout_2.addWidget(self.label_11)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem)
-        self.label_13 = QtWidgets.QLabel(self.frame_2)
-        self.label_13.setObjectName("label_13")
-        self.horizontalLayout_2.addWidget(self.label_13)
-        self.label_12 = QtWidgets.QLabel(self.frame_2)
-        self.label_12.setObjectName("label_12")
-        self.horizontalLayout_2.addWidget(self.label_12)
-        self.pushButton_2 = QtWidgets.QPushButton(self.frame_2)
-        self.pushButton_2.setObjectName("pushButton_2")
-        self.horizontalLayout_2.addWidget(self.pushButton_2)
-        self.verticalLayout_6.addWidget(self.frame_2)
-        self.verticalLayout_7.addWidget(self.groupBox_5)
-        self.groupBox_2 = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.gridLayout = QtWidgets.QGridLayout(self.groupBox_2)
-        self.gridLayout.setVerticalSpacing(0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.label_3 = QtWidgets.QLabel(self.groupBox_2)
-        self.label_3.setObjectName("label_3")
-        self.gridLayout.addWidget(self.label_3, 0, 0, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.groupBox_2)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout.addWidget(self.label_2, 0, 3, 1, 1)
-        self.t1_min_edit = QtWidgets.QLineEdit(self.groupBox_2)
-        self.t1_min_edit.setObjectName("t1_min_edit")
-        self.gridLayout.addWidget(self.t1_min_edit, 0, 4, 1, 1)
-        self.label_7 = QtWidgets.QLabel(self.groupBox_2)
-        self.label_7.setObjectName("label_7")
-        self.gridLayout.addWidget(self.label_7, 0, 5, 1, 1)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem1, 0, 1, 1, 1)
-        self.t1_pos_edit = QtWidgets.QLineEdit(self.groupBox_2)
-        self.t1_pos_edit.setObjectName("t1_pos_edit")
-        self.gridLayout.addWidget(self.t1_pos_edit, 0, 2, 1, 1)
-        self.label = QtWidgets.QLabel(self.groupBox_2)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
-        self.label_8 = QtWidgets.QLabel(self.groupBox_2)
-        self.label_8.setObjectName("label_8")
-        self.gridLayout.addWidget(self.label_8, 1, 5, 1, 1)
-        self.lineEdit = QtWidgets.QLineEdit(self.groupBox_2)
-        self.lineEdit.setInputMethodHints(QtCore.Qt.ImhDigitsOnly|QtCore.Qt.ImhFormattedNumbersOnly|QtCore.Qt.ImhPreferNumbers)
-        self.lineEdit.setObjectName("lineEdit")
-        self.gridLayout.addWidget(self.lineEdit, 1, 4, 1, 1)
-        self.verticalLayout_7.addWidget(self.groupBox_2)
-        self.groupBox = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox.setObjectName("groupBox")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
-        self.verticalLayout_2.setSpacing(0)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.comboBox_4 = QtWidgets.QComboBox(self.groupBox)
-        self.comboBox_4.setObjectName("comboBox_4")
-        self.verticalLayout_2.addWidget(self.comboBox_4)
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.verticalLayout_2.addLayout(self.verticalLayout_3)
-        self.label_14 = QtWidgets.QLabel(self.groupBox)
-        self.label_14.setObjectName("label_14")
-        self.verticalLayout_2.addWidget(self.label_14)
-        self.verticalLayout_7.addWidget(self.groupBox)
-        self.groupBox_4 = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox_4.setObjectName("groupBox_4")
-        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_4)
-        self.verticalLayout_5.setSpacing(0)
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.comboBox_5 = QtWidgets.QComboBox(self.groupBox_4)
-        self.comboBox_5.setObjectName("comboBox_5")
-        self.verticalLayout_5.addWidget(self.comboBox_5)
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_4.setContentsMargins(-1, -1, 0, 0)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.verticalLayout_5.addLayout(self.verticalLayout_4)
-        self.verticalLayout_7.addWidget(self.groupBox_4)
-        self.groupBox_3 = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox_3.setObjectName("groupBox_3")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox_3)
-        self.gridLayout_2.setContentsMargins(-1, 1, -1, -1)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.comboBox = QtWidgets.QComboBox(self.groupBox_3)
-        self.comboBox.setObjectName("comboBox")
-        self.comboBox.addItem("")
-        self.comboBox.addItem("")
-        self.comboBox.addItem("")
-        self.comboBox.addItem("")
-        self.gridLayout_2.addWidget(self.comboBox, 0, 1, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.groupBox_3)
-        self.label_4.setObjectName("label_4")
-        self.gridLayout_2.addWidget(self.label_4, 0, 0, 1, 1)
-        self.checkBox_interpol = QtWidgets.QCheckBox(self.groupBox_3)
-        self.checkBox_interpol.setObjectName("checkBox_interpol")
-        self.gridLayout_2.addWidget(self.checkBox_interpol, 1, 1, 1, 1)
-        self.verticalLayout_7.addWidget(self.groupBox_3)
-        self.pushButton = QtWidgets.QPushButton(self.scrollAreaWidgetContents)
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.pushButton.setFont(font)
-        self.pushButton.setObjectName("pushButton")
-        self.verticalLayout_7.addWidget(self.pushButton)
-        spacerItem2 = QtWidgets.QSpacerItem(17, 423, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_7.addItem(spacerItem2)
-        self.scrollArea.setWidget(self.scrollAreaWidgetContents)
-        self.verticalLayout.addWidget(self.scrollArea)
-        t1dialog.setWidget(self.dockWidgetContents)
-
-        self.retranslateUi(t1dialog)
-        QtCore.QMetaObject.connectSlotsByName(t1dialog)
-
-    def retranslateUi(self, t1dialog):
-        _translate = QtCore.QCoreApplication.translate
-        t1dialog.setWindowTitle(_translate("t1dialog", "Evaluate T1 (temperature)"))
-        self.groupBox_1.setTitle(_translate("t1dialog", "Axes"))
-        self.comboBox_3.setItemText(0, _translate("t1dialog", "T1"))
-        self.comboBox_3.setItemText(1, _translate("t1dialog", "1/T1"))
-        self.comboBox_3.setItemText(2, _translate("t1dialog", "log10(T1)"))
-        self.comboBox_3.setItemText(3, _translate("t1dialog", "log10(1/T1)"))
-        self.label_6.setText(_translate("t1dialog", "Relaxation in"))
-        self.comboBox_2.setItemText(0, _translate("t1dialog", "T"))
-        self.comboBox_2.setItemText(1, _translate("t1dialog", "1000/T"))
-        self.comboBox_2.setItemText(2, _translate("t1dialog", "1/T"))
-        self.label_5.setText(_translate("t1dialog", "Temperature in"))
-        self.groupBox_5.setTitle(_translate("t1dialog", "T1 minimon"))
-        self.comboBox_6.setItemText(0, _translate("t1dialog", "Data minimum"))
-        self.comboBox_6.setItemText(1, _translate("t1dialog", "Parabola"))
-        self.comboBox_6.setItemText(2, _translate("t1dialog", "Cubic spline"))
-        self.comboBox_6.setItemText(3, _translate("t1dialog", "Pchip"))
-        self.label_9.setText(_translate("t1dialog", "start (K)"))
-        self.lineEdit_2.setPlaceholderText(_translate("t1dialog", "1"))
-        self.label_10.setText(_translate("t1dialog", " end (K)"))
-        self.lineEdit_3.setPlaceholderText(_translate("t1dialog", "2"))
-        self.checkBox.setText(_translate("t1dialog", "Show?"))
-        self.label_11.setText(_translate("t1dialog", "Minimon"))
-        self.label_13.setText(_translate("t1dialog", "x value"))
-        self.label_12.setText(_translate("t1dialog", "y value"))
-        self.pushButton_2.setText(_translate("t1dialog", "Use"))
-        self.groupBox_2.setTitle(_translate("t1dialog", "Parameter"))
-        self.label_3.setText(_translate("t1dialog", "<html><head/><body><p>T<span style=\" vertical-align:sub;\">1</span> minimum</p></body></html>"))
-        self.label_2.setText(_translate("t1dialog", "K"))
-        self.t1_min_edit.setPlaceholderText(_translate("t1dialog", "1e-3"))
-        self.label_7.setText(_translate("t1dialog", "s"))
-        self.t1_pos_edit.setPlaceholderText(_translate("t1dialog", "100"))
-        self.label.setText(_translate("t1dialog", "frequency"))
-        self.label_8.setText(_translate("t1dialog", "Hz"))
-        self.lineEdit.setPlaceholderText(_translate("t1dialog", "100e6"))
-        self.groupBox.setTitle(_translate("t1dialog", "Spectral density"))
-        self.label_14.setText(_translate("t1dialog", "Calculated minimum:"))
-        self.groupBox_4.setTitle(_translate("t1dialog", "Coupling"))
-        self.groupBox_3.setTitle(_translate("t1dialog", "Result"))
-        self.comboBox.setStatusTip(_translate("t1dialog", "NOTE: Mean values are not available for all spectral densities. For more information ask someone."))
-        self.comboBox.setItemText(0, _translate("t1dialog", "Fit parameter: τ"))
-        self.comboBox.setItemText(1, _translate("t1dialog", "Peak time: τₚ"))
-        self.comboBox.setItemText(2, _translate("t1dialog", "Arithmetic mean: ⟨τ⟩"))
-        self.comboBox.setItemText(3, _translate("t1dialog", "Geometric mean: exp(⟨ln τ⟩)"))
-        self.label_4.setText(_translate("t1dialog", "Result as"))
-        self.checkBox_interpol.setText(_translate("t1dialog", "Use interpolation"))
-        self.pushButton.setText(_translate("t1dialog", "Calculate"))

src/gui_qt/_py/t1_tau_calculation.py

@@ -1,215 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/t1_tau_calculation.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
-    def setupUi(self, Form):
-        Form.setObjectName("Form")
-        Form.resize(400, 799)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.groupBox_2 = QtWidgets.QGroupBox(Form)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox_2)
-        self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout_2.setHorizontalSpacing(3)
-        self.gridLayout_2.setVerticalSpacing(1)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.freq_spinbox = QtWidgets.QDoubleSpinBox(self.groupBox_2)
-        self.freq_spinbox.setMaximum(999.99)
-        self.freq_spinbox.setProperty("value", 100.0)
-        self.freq_spinbox.setObjectName("freq_spinbox")
-        self.gridLayout_2.addWidget(self.freq_spinbox, 0, 0, 1, 1)
-        self.freq_combox = QtWidgets.QComboBox(self.groupBox_2)
-        self.freq_combox.setObjectName("freq_combox")
-        self.freq_combox.addItem("")
-        self.freq_combox.addItem("")
-        self.freq_combox.addItem("")
-        self.gridLayout_2.addWidget(self.freq_combox, 0, 1, 1, 1)
-        self.verticalLayout.addWidget(self.groupBox_2)
-        self.scrollArea = QtWidgets.QScrollArea(Form)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.scrollArea.sizePolicy().hasHeightForWidth())
-        self.scrollArea.setSizePolicy(sizePolicy)
-        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.scrollArea.setWidgetResizable(True)
-        self.scrollArea.setObjectName("scrollArea")
-        self.scrollAreaWidgetContents = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 388, 713))
-        self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
-        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
-        self.verticalLayout_5.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_5.setSpacing(3)
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.groupBox_6 = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox_6.setObjectName("groupBox_6")
-        self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.groupBox_6)
-        self.verticalLayout_7.setContentsMargins(3, 3, 3, 3)
-        self.verticalLayout_7.setSpacing(1)
-        self.verticalLayout_7.setObjectName("verticalLayout_7")
-        self.comboBox_7 = QtWidgets.QComboBox(self.groupBox_6)
-        self.comboBox_7.setObjectName("comboBox_7")
-        self.comboBox_7.addItem("")
-        self.comboBox_7.addItem("")
-        self.comboBox_7.addItem("")
-        self.verticalLayout_7.addWidget(self.comboBox_7)
-        self.arr_frame = QtWidgets.QFrame(self.groupBox_6)
-        self.arr_frame.setObjectName("arr_frame")
-        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.arr_frame)
-        self.verticalLayout_6.setContentsMargins(0, 0, 0, 0)
-        self.verticalLayout_6.setSpacing(1)
-        self.verticalLayout_6.setObjectName("verticalLayout_6")
-        self.verticalLayout_7.addWidget(self.arr_frame)
-        self.temp_frame = QtWidgets.QFrame(self.groupBox_6)
-        self.temp_frame.setObjectName("temp_frame")
-        self.gridLayout = QtWidgets.QGridLayout(self.temp_frame)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.lineEdit_3 = QtWidgets.QLineEdit(self.temp_frame)
-        self.lineEdit_3.setObjectName("lineEdit_3")
-        self.gridLayout.addWidget(self.lineEdit_3, 0, 1, 1, 1)
-        self.checkBox = QtWidgets.QCheckBox(self.temp_frame)
-        self.checkBox.setObjectName("checkBox")
-        self.gridLayout.addWidget(self.checkBox, 0, 7, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.temp_frame)
-        self.label_4.setObjectName("label_4")
-        self.gridLayout.addWidget(self.label_4, 0, 2, 1, 1)
-        self.lineEdit_4 = QtWidgets.QLineEdit(self.temp_frame)
-        self.lineEdit_4.setObjectName("lineEdit_4")
-        self.gridLayout.addWidget(self.lineEdit_4, 0, 3, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem, 0, 4, 1, 1)
-        self.spinBox = QtWidgets.QSpinBox(self.temp_frame)
-        self.spinBox.setProperty("value", 50)
-        self.spinBox.setObjectName("spinBox")
-        self.gridLayout.addWidget(self.spinBox, 0, 5, 1, 1)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem1, 0, 6, 1, 1)
-        self.verticalLayout_7.addWidget(self.temp_frame)
-        self.data_frame = QtWidgets.QFrame(self.groupBox_6)
-        self.data_frame.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.data_frame.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.data_frame.setObjectName("data_frame")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.data_frame)
-        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout.setSpacing(1)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.tau_graph_combobox = QtWidgets.QComboBox(self.data_frame)
-        self.tau_graph_combobox.setObjectName("tau_graph_combobox")
-        self.horizontalLayout.addWidget(self.tau_graph_combobox)
-        self.tau_set_combobox = QtWidgets.QComboBox(self.data_frame)
-        self.tau_set_combobox.setObjectName("tau_set_combobox")
-        self.horizontalLayout.addWidget(self.tau_set_combobox)
-        self.verticalLayout_7.addWidget(self.data_frame)
-        self.comboBox = QtWidgets.QComboBox(self.groupBox_6)
-        self.comboBox.setObjectName("comboBox")
-        self.comboBox.addItem("")
-        self.comboBox.addItem("")
-        self.comboBox.addItem("")
-        self.comboBox.addItem("")
-        self.verticalLayout_7.addWidget(self.comboBox)
-        self.verticalLayout_5.addWidget(self.groupBox_6)
-        self.groupBox = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox.setObjectName("groupBox")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
-        self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
-        self.verticalLayout_2.setSpacing(0)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.specdens_combobox = QtWidgets.QComboBox(self.groupBox)
-        self.specdens_combobox.setObjectName("specdens_combobox")
-        self.verticalLayout_2.addWidget(self.specdens_combobox)
-        self.specdens_frame = QtWidgets.QFrame(self.groupBox)
-        self.specdens_frame.setObjectName("specdens_frame")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.specdens_frame)
-        self.verticalLayout_3.setSpacing(0)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.verticalLayout_2.addWidget(self.specdens_frame)
-        self.coupling_combobox = QtWidgets.QComboBox(self.groupBox)
-        self.coupling_combobox.setObjectName("coupling_combobox")
-        self.verticalLayout_2.addWidget(self.coupling_combobox)
-        self.coupling_frame = QtWidgets.QFrame(self.groupBox)
-        self.coupling_frame.setObjectName("coupling_frame")
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.coupling_frame)
-        self.verticalLayout_4.setContentsMargins(-1, -1, 1, 1)
-        self.verticalLayout_4.setSpacing(0)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.verticalLayout_2.addWidget(self.coupling_frame)
-        self.verticalLayout_5.addWidget(self.groupBox)
-        self.groupBox_3 = QtWidgets.QGroupBox(self.scrollAreaWidgetContents)
-        self.groupBox_3.setObjectName("groupBox_3")
-        self.gridLayout_4 = QtWidgets.QGridLayout(self.groupBox_3)
-        self.gridLayout_4.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout_4.setSpacing(3)
-        self.gridLayout_4.setObjectName("gridLayout_4")
-        self.tau_combox = QtWidgets.QComboBox(self.groupBox_3)
-        self.tau_combox.setObjectName("tau_combox")
-        self.tau_combox.addItem("")
-        self.tau_combox.addItem("")
-        self.tau_combox.addItem("")
-        self.tau_combox.addItem("")
-        self.gridLayout_4.addWidget(self.tau_combox, 0, 0, 1, 2)
-        self.graph_checkbox = QtWidgets.QCheckBox(self.groupBox_3)
-        self.graph_checkbox.setChecked(True)
-        self.graph_checkbox.setObjectName("graph_checkbox")
-        self.gridLayout_4.addWidget(self.graph_checkbox, 1, 0, 1, 1)
-        self.graph_combobox = QtWidgets.QComboBox(self.groupBox_3)
-        self.graph_combobox.setEnabled(True)
-        self.graph_combobox.setObjectName("graph_combobox")
-        self.gridLayout_4.addWidget(self.graph_combobox, 1, 1, 1, 1)
-        self.verticalLayout_5.addWidget(self.groupBox_3)
-        self.pushButton = QtWidgets.QPushButton(self.scrollAreaWidgetContents)
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.pushButton.setFont(font)
-        self.pushButton.setObjectName("pushButton")
-        self.verticalLayout_5.addWidget(self.pushButton)
-        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_5.addItem(spacerItem2)
-        self.scrollArea.setWidget(self.scrollAreaWidgetContents)
-        self.verticalLayout.addWidget(self.scrollArea)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        _translate = QtCore.QCoreApplication.translate
-        Form.setWindowTitle(_translate("Form", "Form"))
-        self.groupBox_2.setTitle(_translate("Form", "Frequency"))
-        self.freq_combox.setItemText(0, _translate("Form", "MHz"))
-        self.freq_combox.setItemText(1, _translate("Form", "kHz"))
-        self.freq_combox.setItemText(2, _translate("Form", "Hz"))
-        self.groupBox_6.setTitle(_translate("Form", "Correlation times"))
-        self.comboBox_7.setItemText(0, _translate("Form", "Arrhenius"))
-        self.comboBox_7.setItemText(1, _translate("Form", "VFT"))
-        self.comboBox_7.setItemText(2, _translate("Form", "Data"))
-        self.lineEdit_3.setPlaceholderText(_translate("Form", "1 K"))
-        self.checkBox.setText(_translate("Form", "1000/T"))
-        self.label_4.setText(_translate("Form", "–"))
-        self.lineEdit_4.setPlaceholderText(_translate("Form", "100 K"))
-        self.spinBox.setSuffix(_translate("Form", " pts."))
-        self.comboBox.setItemText(0, _translate("Form", "Fit parameter: τ"))
-        self.comboBox.setItemText(1, _translate("Form", "Peak time: τₚ"))
-        self.comboBox.setItemText(2, _translate("Form", "Arithmetic mean: ⟨τ⟩"))
-        self.comboBox.setItemText(3, _translate("Form", "Geometric mean: exp(⟨ln τ⟩)"))
-        self.groupBox.setTitle(_translate("Form", "Model"))
-        self.groupBox_3.setTitle(_translate("Form", "Result"))
-        self.tau_combox.setStatusTip(_translate("Form", "NOTE: Mean values are not available for all spectral densities. For more information ask someone."))
-        self.tau_combox.setItemText(0, _translate("Form", "Fit parameter: τ"))
-        self.tau_combox.setItemText(1, _translate("Form", "Peak time: τₚ"))
-        self.tau_combox.setItemText(2, _translate("Form", "Arithmetic mean: ⟨τ⟩"))
-        self.tau_combox.setItemText(3, _translate("Form", "Geometric mean: exp(⟨ln τ⟩)"))
-        self.graph_checkbox.setText(_translate("Form", "New graph?"))
-        self.pushButton.setText(_translate("Form", "Calculate"))

src/gui_qt/_py/t1dialog.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/t1dialog.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/t1dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_t1dialog(object):
@@ -17,68 +16,68 @@ class Ui_t1dialog(object):
         self.gridLayout_2 = QtWidgets.QGridLayout(t1dialog)
         self.gridLayout_2.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.groupBox_1 = QtWidgets.QGroupBox(t1dialog)
+        self.groupBox_1 = QtWidgets.QGroupBox(parent=t1dialog)
         self.groupBox_1.setObjectName("groupBox_1")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.groupBox_1)
         self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_3.setHorizontalSpacing(3)
         self.gridLayout_3.setVerticalSpacing(0)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.t1_combobox = QtWidgets.QComboBox(self.groupBox_1)
+        self.t1_combobox = QtWidgets.QComboBox(parent=self.groupBox_1)
         self.t1_combobox.setObjectName("t1_combobox")
         self.t1_combobox.addItem("")
         self.t1_combobox.addItem("")
         self.gridLayout_3.addWidget(self.t1_combobox, 1, 1, 1, 1)
-        self.temp_combobox = QtWidgets.QComboBox(self.groupBox_1)
+        self.temp_combobox = QtWidgets.QComboBox(parent=self.groupBox_1)
         self.temp_combobox.setObjectName("temp_combobox")
         self.temp_combobox.addItem("")
         self.temp_combobox.addItem("")
         self.temp_combobox.addItem("")
         self.gridLayout_3.addWidget(self.temp_combobox, 1, 0, 1, 1)
         self.gridLayout_2.addWidget(self.groupBox_1, 0, 0, 1, 1)
-        self.groupBox_2 = QtWidgets.QGroupBox(t1dialog)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=t1dialog)
         self.groupBox_2.setObjectName("groupBox_2")
         self.gridLayout = QtWidgets.QGridLayout(self.groupBox_2)
         self.gridLayout.setContentsMargins(3, 3, 3, 3)
         self.gridLayout.setHorizontalSpacing(3)
         self.gridLayout.setVerticalSpacing(1)
         self.gridLayout.setObjectName("gridLayout")
-        self.freq_combox = QtWidgets.QComboBox(self.groupBox_2)
+        self.freq_combox = QtWidgets.QComboBox(parent=self.groupBox_2)
         self.freq_combox.setObjectName("freq_combox")
         self.freq_combox.addItem("")
         self.freq_combox.addItem("")
         self.freq_combox.addItem("")
         self.gridLayout.addWidget(self.freq_combox, 0, 1, 1, 1)
-        self.freq_spinbox = QtWidgets.QDoubleSpinBox(self.groupBox_2)
+        self.freq_spinbox = QtWidgets.QDoubleSpinBox(parent=self.groupBox_2)
         self.freq_spinbox.setMaximum(999.99)
         self.freq_spinbox.setProperty("value", 100.0)
         self.freq_spinbox.setObjectName("freq_spinbox")
         self.gridLayout.addWidget(self.freq_spinbox, 0, 0, 1, 1)
         self.gridLayout_2.addWidget(self.groupBox_2, 1, 0, 1, 1)
-        self.groupBox = QtWidgets.QGroupBox(t1dialog)
+        self.groupBox = QtWidgets.QGroupBox(parent=t1dialog)
         self.groupBox.setObjectName("groupBox")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
         self.verticalLayout_2.setContentsMargins(3, 3, 3, -1)
         self.verticalLayout_2.setSpacing(2)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.specdens_combobox = QtWidgets.QComboBox(self.groupBox)
+        self.specdens_combobox = QtWidgets.QComboBox(parent=self.groupBox)
         self.specdens_combobox.setObjectName("specdens_combobox")
         self.verticalLayout_2.addWidget(self.specdens_combobox)
-        self.sd_frame = QtWidgets.QFrame(self.groupBox)
+        self.sd_frame = QtWidgets.QFrame(parent=self.groupBox)
-        self.sd_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
+        self.sd_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
-        self.sd_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.sd_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.sd_frame.setObjectName("sd_frame")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.sd_frame)
         self.verticalLayout_3.setContentsMargins(1, 1, 1, 1)
         self.verticalLayout_3.setSpacing(0)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.verticalLayout_2.addWidget(self.sd_frame)
-        self.coupling_combobox = QtWidgets.QComboBox(self.groupBox)
+        self.coupling_combobox = QtWidgets.QComboBox(parent=self.groupBox)
         self.coupling_combobox.setObjectName("coupling_combobox")
         self.verticalLayout_2.addWidget(self.coupling_combobox)
-        self.cp_frame = QtWidgets.QFrame(self.groupBox)
+        self.cp_frame = QtWidgets.QFrame(parent=self.groupBox)
-        self.cp_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
+        self.cp_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
-        self.cp_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.cp_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.cp_frame.setObjectName("cp_frame")
         self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.cp_frame)
         self.verticalLayout_4.setContentsMargins(1, 1, 1, 1)
@@ -86,97 +85,98 @@ class Ui_t1dialog(object):
         self.verticalLayout_4.setObjectName("verticalLayout_4")
         self.verticalLayout_2.addWidget(self.cp_frame)
         self.gridLayout_2.addWidget(self.groupBox, 3, 0, 1, 1)
-        self.groupBox_5 = QtWidgets.QGroupBox(t1dialog)
+        self.groupBox_5 = QtWidgets.QGroupBox(parent=t1dialog)
         self.groupBox_5.setObjectName("groupBox_5")
         self.gridLayout_5 = QtWidgets.QGridLayout(self.groupBox_5)
         self.gridLayout_5.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_5.setHorizontalSpacing(2)
         self.gridLayout_5.setObjectName("gridLayout_5")
-        self.interpol_combobox = QtWidgets.QComboBox(self.groupBox_5)
+        self.interpol_combobox = QtWidgets.QComboBox(parent=self.groupBox_5)
         self.interpol_combobox.setObjectName("interpol_combobox")
         self.interpol_combobox.addItem("")
         self.interpol_combobox.addItem("")
         self.interpol_combobox.addItem("")
         self.interpol_combobox.addItem("")
         self.gridLayout_5.addWidget(self.interpol_combobox, 0, 0, 1, 1)
-        self.frame = QtWidgets.QFrame(self.groupBox_5)
+        self.frame = QtWidgets.QFrame(parent=self.groupBox_5)
-        self.frame.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.frame.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
         self.frame.setObjectName("frame")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label_9 = QtWidgets.QLabel(self.frame)
+        self.label_9 = QtWidgets.QLabel(parent=self.frame)
         self.label_9.setObjectName("label_9")
         self.horizontalLayout.addWidget(self.label_9)
-        self.lineEdit_2 = QtWidgets.QLineEdit(self.frame)
+        self.lineEdit_2 = QtWidgets.QLineEdit(parent=self.frame)
         self.lineEdit_2.setObjectName("lineEdit_2")
         self.horizontalLayout.addWidget(self.lineEdit_2)
-        self.label_10 = QtWidgets.QLabel(self.frame)
+        self.label_10 = QtWidgets.QLabel(parent=self.frame)
         self.label_10.setObjectName("label_10")
         self.horizontalLayout.addWidget(self.label_10)
-        self.lineEdit_3 = QtWidgets.QLineEdit(self.frame)
+        self.lineEdit_3 = QtWidgets.QLineEdit(parent=self.frame)
         self.lineEdit_3.setObjectName("lineEdit_3")
         self.horizontalLayout.addWidget(self.lineEdit_3)
         self.gridLayout_5.addWidget(self.frame, 1, 0, 1, 2)
-        self.frame_2 = QtWidgets.QFrame(self.groupBox_5)
+        self.frame_2 = QtWidgets.QFrame(parent=self.groupBox_5)
-        self.frame_2.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.frame_2.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.frame_2.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.frame_2.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
         self.frame_2.setObjectName("frame_2")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.frame_2)
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label_11 = QtWidgets.QLabel(self.frame_2)
+        self.label_11 = QtWidgets.QLabel(parent=self.frame_2)
         self.label_11.setObjectName("label_11")
         self.horizontalLayout_2.addWidget(self.label_11)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_2.addItem(spacerItem)
-        self.label_13 = QtWidgets.QLabel(self.frame_2)
+        self.label_13 = QtWidgets.QLabel(parent=self.frame_2)
         self.label_13.setObjectName("label_13")
         self.horizontalLayout_2.addWidget(self.label_13)
-        self.label_12 = QtWidgets.QLabel(self.frame_2)
+        self.label_12 = QtWidgets.QLabel(parent=self.frame_2)
         self.label_12.setObjectName("label_12")
         self.horizontalLayout_2.addWidget(self.label_12)
         self.gridLayout_5.addWidget(self.frame_2, 2, 0, 1, 2)
-        self.t1min_toolButton = QtWidgets.QToolButton(self.groupBox_5)
+        self.t1min_toolButton = QtWidgets.QToolButton(parent=self.groupBox_5)
         self.t1min_toolButton.setObjectName("t1min_toolButton")
         self.gridLayout_5.addWidget(self.t1min_toolButton, 0, 1, 1, 1)
         self.gridLayout_2.addWidget(self.groupBox_5, 2, 0, 1, 1)
-        self.groupBox_3 = QtWidgets.QGroupBox(t1dialog)
+        self.groupBox_3 = QtWidgets.QGroupBox(parent=t1dialog)
         self.groupBox_3.setObjectName("groupBox_3")
         self.gridLayout_4 = QtWidgets.QGridLayout(self.groupBox_3)
         self.gridLayout_4.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_4.setSpacing(3)
         self.gridLayout_4.setObjectName("gridLayout_4")
-        self.graph_combobox = QtWidgets.QComboBox(self.groupBox_3)
+        self.graph_combobox = QtWidgets.QComboBox(parent=self.groupBox_3)
         self.graph_combobox.setEnabled(False)
         self.graph_combobox.setObjectName("graph_combobox")
         self.gridLayout_4.addWidget(self.graph_combobox, 3, 1, 1, 1)
-        self.tau_combox = QtWidgets.QComboBox(self.groupBox_3)
+        self.tau_combox = QtWidgets.QComboBox(parent=self.groupBox_3)
         self.tau_combox.setObjectName("tau_combox")
         self.tau_combox.addItem("")
         self.tau_combox.addItem("")
         self.tau_combox.addItem("")
         self.tau_combox.addItem("")
         self.gridLayout_4.addWidget(self.tau_combox, 1, 0, 1, 2)
-        self.checkBox_interpol = QtWidgets.QCheckBox(self.groupBox_3)
+        self.checkBox_interpol = QtWidgets.QCheckBox(parent=self.groupBox_3)
+        self.checkBox_interpol.setEnabled(False)
         self.checkBox_interpol.setObjectName("checkBox_interpol")
         self.gridLayout_4.addWidget(self.checkBox_interpol, 2, 0, 1, 2)
-        self.graph_checkbox = QtWidgets.QCheckBox(self.groupBox_3)
+        self.graph_checkbox = QtWidgets.QCheckBox(parent=self.groupBox_3)
         self.graph_checkbox.setChecked(True)
         self.graph_checkbox.setObjectName("graph_checkbox")
         self.gridLayout_4.addWidget(self.graph_checkbox, 3, 0, 1, 1)
-        self.label = QtWidgets.QLabel(self.groupBox_3)
+        self.label = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label.setObjectName("label")
         self.gridLayout_4.addWidget(self.label, 0, 0, 1, 1)
-        self.label_t1min = QtWidgets.QLabel(self.groupBox_3)
+        self.label_t1min = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label_t1min.setText("")
         self.label_t1min.setObjectName("label_t1min")
         self.gridLayout_4.addWidget(self.label_t1min, 0, 1, 1, 1)
         self.gridLayout_2.addWidget(self.groupBox_3, 4, 0, 1, 1)
-        spacerItem1 = QtWidgets.QSpacerItem(17, 19, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem1 = QtWidgets.QSpacerItem(17, 19, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.gridLayout_2.addItem(spacerItem1, 6, 0, 1, 1)
-        self.calc_pushButton = QtWidgets.QPushButton(t1dialog)
+        self.calc_pushButton = QtWidgets.QPushButton(parent=t1dialog)
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)

src/gui_qt/_py/tnmh_dialog.py

@@ -0,0 +1,251 @@
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/tnmh_dialog.ui'
+#
+# Created by: PyQt6 UI code generator 6.7.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_DSCEvalDialog(object):
+    def setupUi(self, DSCEvalDialog):
+        DSCEvalDialog.setObjectName("DSCEvalDialog")
+        DSCEvalDialog.resize(996, 712)
+        self.gridLayout = QtWidgets.QGridLayout(DSCEvalDialog)
+        self.gridLayout.setObjectName("gridLayout")
+        self.listWidget = QListWidgetSelect(parent=DSCEvalDialog)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
+        self.listWidget.setSizePolicy(sizePolicy)
+        self.listWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.listWidget.setObjectName("listWidget")
+        self.gridLayout.addWidget(self.listWidget, 0, 0, 1, 1)
+        self.stackedWidget = QtWidgets.QStackedWidget(parent=DSCEvalDialog)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.stackedWidget.sizePolicy().hasHeightForWidth())
+        self.stackedWidget.setSizePolicy(sizePolicy)
+        self.stackedWidget.setFrameShape(QtWidgets.QFrame.Shape.Box)
+        self.stackedWidget.setObjectName("stackedWidget")
+        self.page = QtWidgets.QWidget()
+        self.page.setObjectName("page")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.page)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.gridLayout_9 = QtWidgets.QGridLayout()
+        self.gridLayout_9.setObjectName("gridLayout_9")
+        self.tg_export_check = QtWidgets.QCheckBox(parent=self.page)
+        self.tg_export_check.setChecked(True)
+        self.tg_export_check.setObjectName("tg_export_check")
+        self.gridLayout_9.addWidget(self.tg_export_check, 0, 0, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.gridLayout_9.addItem(spacerItem, 3, 0, 1, 1)
+        self.tglines_export_check = QtWidgets.QCheckBox(parent=self.page)
+        self.tglines_export_check.setChecked(True)
+        self.tglines_export_check.setObjectName("tglines_export_check")
+        self.gridLayout_9.addWidget(self.tglines_export_check, 0, 1, 1, 1)
+        self.tg_export_button = QtWidgets.QPushButton(parent=self.page)
+        self.tg_export_button.setObjectName("tg_export_button")
+        self.gridLayout_9.addWidget(self.tg_export_button, 2, 0, 1, 2)
+        self.gridLayout_2.addLayout(self.gridLayout_9, 2, 1, 1, 1)
+        self.tg_tree = QtWidgets.QTreeWidget(parent=self.page)
+        self.tg_tree.setObjectName("tg_tree")
+        self.tg_tree.headerItem().setText(0, "1")
+        self.tg_tree.header().setVisible(False)
+        self.gridLayout_2.addWidget(self.tg_tree, 2, 0, 1, 1)
+        self.dsc_plot = NMRPlotWidget(parent=self.page)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.dsc_plot.sizePolicy().hasHeightForWidth())
+        self.dsc_plot.setSizePolicy(sizePolicy)
+        self.dsc_plot.setObjectName("dsc_plot")
+        self.gridLayout_2.addWidget(self.dsc_plot, 1, 0, 1, 2)
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.label = QtWidgets.QLabel(parent=self.page)
+        self.label.setObjectName("label")
+        self.horizontalLayout_4.addWidget(self.label)
+        self.calctg_button = QtWidgets.QPushButton(parent=self.page)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.calctg_button.sizePolicy().hasHeightForWidth())
+        self.calctg_button.setSizePolicy(sizePolicy)
+        self.calctg_button.setObjectName("calctg_button")
+        self.horizontalLayout_4.addWidget(self.calctg_button)
+        self.gridLayout_2.addLayout(self.horizontalLayout_4, 0, 0, 1, 2)
+        self.stackedWidget.addWidget(self.page)
+        self.page_2 = QtWidgets.QWidget()
+        self.page_2.setObjectName("page_2")
+        self.gridLayout_3 = QtWidgets.QGridLayout(self.page_2)
+        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.label_4 = QtWidgets.QLabel(parent=self.page_2)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout_3.addWidget(self.label_4, 2, 0, 1, 1)
+        self.tghodge_graph = NMRPlotWidget(parent=self.page_2)
+        self.tghodge_graph.setObjectName("tghodge_graph")
+        self.gridLayout_3.addWidget(self.tghodge_graph, 1, 0, 1, 1)
+        self.tau_plot = NMRPlotWidget(parent=self.page_2)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.tau_plot.sizePolicy().hasHeightForWidth())
+        self.tau_plot.setSizePolicy(sizePolicy)
+        self.tau_plot.setObjectName("tau_plot")
+        self.gridLayout_3.addWidget(self.tau_plot, 1, 1, 1, 1)
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.label_2 = QtWidgets.QLabel(parent=self.page_2)
+        self.label_2.setObjectName("label_2")
+        self.horizontalLayout_3.addWidget(self.label_2)
+        self.hodge_button = QtWidgets.QPushButton(parent=self.page_2)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.hodge_button.sizePolicy().hasHeightForWidth())
+        self.hodge_button.setSizePolicy(sizePolicy)
+        self.hodge_button.setObjectName("hodge_button")
+        self.horizontalLayout_3.addWidget(self.hodge_button)
+        self.gridLayout_3.addLayout(self.horizontalLayout_3, 0, 0, 1, 2)
+        self.export_hodge_button = QtWidgets.QPushButton(parent=self.page_2)
+        self.export_hodge_button.setObjectName("export_hodge_button")
+        self.gridLayout_3.addWidget(self.export_hodge_button, 5, 1, 1, 1)
+        self.hodge_graph_combo = QtWidgets.QComboBox(parent=self.page_2)
+        self.hodge_graph_combo.setEnabled(False)
+        self.hodge_graph_combo.setObjectName("hodge_graph_combo")
+        self.gridLayout_3.addWidget(self.hodge_graph_combo, 4, 1, 1, 1)
+        self.hodge_graph_check = QtWidgets.QCheckBox(parent=self.page_2)
+        self.hodge_graph_check.setChecked(True)
+        self.hodge_graph_check.setObjectName("hodge_graph_check")
+        self.gridLayout_3.addWidget(self.hodge_graph_check, 4, 0, 1, 1)
+        self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
+        self.onset_check = QtWidgets.QCheckBox(parent=self.page_2)
+        self.onset_check.setChecked(True)
+        self.onset_check.setObjectName("onset_check")
+        self.horizontalLayout_5.addWidget(self.onset_check)
+        self.mid_check = QtWidgets.QCheckBox(parent=self.page_2)
+        self.mid_check.setChecked(True)
+        self.mid_check.setObjectName("mid_check")
+        self.horizontalLayout_5.addWidget(self.mid_check)
+        self.end_check = QtWidgets.QCheckBox(parent=self.page_2)
+        self.end_check.setChecked(True)
+        self.end_check.setObjectName("end_check")
+        self.horizontalLayout_5.addWidget(self.end_check)
+        self.inflection_check = QtWidgets.QCheckBox(parent=self.page_2)
+        self.inflection_check.setChecked(True)
+        self.inflection_check.setObjectName("inflection_check")
+        self.horizontalLayout_5.addWidget(self.inflection_check)
+        self.fictive_check = QtWidgets.QCheckBox(parent=self.page_2)
+        self.fictive_check.setChecked(True)
+        self.fictive_check.setObjectName("fictive_check")
+        self.horizontalLayout_5.addWidget(self.fictive_check)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_5.addItem(spacerItem1)
+        self.gridLayout_3.addLayout(self.horizontalLayout_5, 3, 0, 1, 2)
+        self.stackedWidget.addWidget(self.page_2)
+        self.page_3 = QtWidgets.QWidget()
+        self.page_3.setObjectName("page_3")
+        self.gridLayout_6 = QtWidgets.QGridLayout(self.page_3)
+        self.gridLayout_6.setObjectName("gridLayout_6")
+        self.tnmh_graphics = NMRPlotWidget(parent=self.page_3)
+        self.tnmh_graphics.setObjectName("tnmh_graphics")
+        self.gridLayout_6.addWidget(self.tnmh_graphics, 1, 0, 1, 2)
+        self.tnmh_tree = QtWidgets.QTreeWidget(parent=self.page_3)
+        self.tnmh_tree.setObjectName("tnmh_tree")
+        self.tnmh_tree.headerItem().setText(0, "1")
+        self.tnmh_tree.header().setVisible(False)
+        self.gridLayout_6.addWidget(self.tnmh_tree, 2, 0, 1, 1)
+        self.gridLayout_5 = QtWidgets.QGridLayout()
+        self.gridLayout_5.setObjectName("gridLayout_5")
+        self.tnmh_graph_check = QtWidgets.QCheckBox(parent=self.page_3)
+        self.tnmh_graph_check.setChecked(True)
+        self.tnmh_graph_check.setObjectName("tnmh_graph_check")
+        self.gridLayout_5.addWidget(self.tnmh_graph_check, 1, 0, 1, 1)
+        self.tnmhfit_export_check = QtWidgets.QCheckBox(parent=self.page_3)
+        self.tnmhfit_export_check.setChecked(True)
+        self.tnmhfit_export_check.setObjectName("tnmhfit_export_check")
+        self.gridLayout_5.addWidget(self.tnmhfit_export_check, 0, 0, 1, 1)
+        self.tnmh_export_button = QtWidgets.QPushButton(parent=self.page_3)
+        self.tnmh_export_button.setObjectName("tnmh_export_button")
+        self.gridLayout_5.addWidget(self.tnmh_export_button, 2, 0, 1, 2)
+        self.fictive_export_check = QtWidgets.QCheckBox(parent=self.page_3)
+        self.fictive_export_check.setChecked(True)
+        self.fictive_export_check.setObjectName("fictive_export_check")
+        self.gridLayout_5.addWidget(self.fictive_export_check, 0, 1, 1, 1)
+        self.tnmh_graph_combo = QtWidgets.QComboBox(parent=self.page_3)
+        self.tnmh_graph_combo.setEnabled(False)
+        self.tnmh_graph_combo.setObjectName("tnmh_graph_combo")
+        self.gridLayout_5.addWidget(self.tnmh_graph_combo, 1, 1, 1, 1)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.gridLayout_5.addItem(spacerItem2, 3, 0, 1, 1)
+        self.gridLayout_6.addLayout(self.gridLayout_5, 2, 1, 1, 1)
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.label_3 = QtWidgets.QLabel(parent=self.page_3)
+        self.label_3.setObjectName("label_3")
+        self.horizontalLayout_2.addWidget(self.label_3)
+        self.tnhm_fitbutton = QtWidgets.QPushButton(parent=self.page_3)
+        self.tnhm_fitbutton.setObjectName("tnhm_fitbutton")
+        self.horizontalLayout_2.addWidget(self.tnhm_fitbutton)
+        self.gridLayout_6.addLayout(self.horizontalLayout_2, 0, 0, 1, 2)
+        self.stackedWidget.addWidget(self.page_3)
+        self.gridLayout.addWidget(self.stackedWidget, 0, 1, 1, 1)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout.addItem(spacerItem3)
+        self.back_button = QtWidgets.QToolButton(parent=DSCEvalDialog)
+        self.back_button.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
+        self.back_button.setArrowType(QtCore.Qt.ArrowType.LeftArrow)
+        self.back_button.setObjectName("back_button")
+        self.horizontalLayout.addWidget(self.back_button)
+        self.next_button = QtWidgets.QToolButton(parent=DSCEvalDialog)
+        self.next_button.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
+        self.next_button.setArrowType(QtCore.Qt.ArrowType.RightArrow)
+        self.next_button.setObjectName("next_button")
+        self.horizontalLayout.addWidget(self.next_button)
+        self.close_button = QtWidgets.QPushButton(parent=DSCEvalDialog)
+        self.close_button.setObjectName("close_button")
+        self.horizontalLayout.addWidget(self.close_button)
+        self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 2)
+
+        self.retranslateUi(DSCEvalDialog)
+        self.stackedWidget.setCurrentIndex(0)
+        self.close_button.clicked.connect(DSCEvalDialog.close) # type: ignore
+        QtCore.QMetaObject.connectSlotsByName(DSCEvalDialog)
+
+    def retranslateUi(self, DSCEvalDialog):
+        _translate = QtCore.QCoreApplication.translate
+        DSCEvalDialog.setWindowTitle(_translate("DSCEvalDialog", "To boldly go where no man has gone before"))
+        self.tg_export_check.setText(_translate("DSCEvalDialog", "Export Tg"))
+        self.tglines_export_check.setText(_translate("DSCEvalDialog", "Export lines"))
+        self.tg_export_button.setText(_translate("DSCEvalDialog", "Export"))
+        self.label.setText(_translate("DSCEvalDialog", "<html><head/><body><p><span style=\" font-weight:600;\">Glass transition</span></p></body></html>"))
+        self.calctg_button.setText(_translate("DSCEvalDialog", "Calculate Tg"))
+        self.label_4.setText(_translate("DSCEvalDialog", "Export tau:"))
+        self.label_2.setText(_translate("DSCEvalDialog", "<html><head/><body><p><span style=\" font-weight:600;\">Hodge tau</span></p></body></html>"))
+        self.hodge_button.setText(_translate("DSCEvalDialog", "Make it so."))
+        self.export_hodge_button.setText(_translate("DSCEvalDialog", "Export"))
+        self.hodge_graph_check.setText(_translate("DSCEvalDialog", "New graph"))
+        self.onset_check.setText(_translate("DSCEvalDialog", "Onset"))
+        self.mid_check.setText(_translate("DSCEvalDialog", "Midpoint"))
+        self.end_check.setText(_translate("DSCEvalDialog", "End"))
+        self.inflection_check.setText(_translate("DSCEvalDialog", "Inflection"))
+        self.fictive_check.setText(_translate("DSCEvalDialog", "Fictive"))
+        self.tnmh_graph_check.setText(_translate("DSCEvalDialog", "New graph"))
+        self.tnmhfit_export_check.setText(_translate("DSCEvalDialog", "Export fit"))
+        self.tnmh_export_button.setText(_translate("DSCEvalDialog", "Export"))
+        self.fictive_export_check.setText(_translate("DSCEvalDialog", "Export dTf / dT"))
+        self.label_3.setText(_translate("DSCEvalDialog", "<html><head/><body><p><span style=\" font-weight:600;\">dTf/dT and TNMH </span></p></body></html>"))
+        self.tnhm_fitbutton.setText(_translate("DSCEvalDialog", "Engage!"))
+        self.back_button.setText(_translate("DSCEvalDialog", "Back"))
+        self.next_button.setText(_translate("DSCEvalDialog", "Next"))
+        self.close_button.setText(_translate("DSCEvalDialog", "Close"))
+from ..lib.graph_items import NMRPlotWidget
+from ..lib.listwidget import QListWidgetSelect

src/gui_qt/_py/tntdialog.py

@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/tntdialog.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_tntdialog(object):
-    def setupUi(self, tntdialog):
-        tntdialog.setObjectName("tntdialog")
-        tntdialog.resize(373, 482)
-        self.gridLayout = QtWidgets.QGridLayout(tntdialog)
-        self.gridLayout.setObjectName("gridLayout")
-        self.widget_3 = QDelayWidget(tntdialog)
-        self.widget_3.setObjectName("widget_3")
-        self.gridLayout.addWidget(self.widget_3, 3, 1, 1, 2)
-        self.label_3 = QtWidgets.QLabel(tntdialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
-        self.label_3.setSizePolicy(sizePolicy)
-        self.label_3.setObjectName("label_3")
-        self.gridLayout.addWidget(self.label_3, 0, 2, 1, 1)
-        self.widget = QDelayWidget(tntdialog)
-        self.widget.setObjectName("widget")
-        self.gridLayout.addWidget(self.widget, 1, 1, 1, 2)
-        self.label_2 = QtWidgets.QLabel(tntdialog)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout.addWidget(self.label_2, 0, 1, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout.addItem(spacerItem, 6, 1, 1, 1)
-        self.widget_2 = QDelayWidget(tntdialog)
-        self.widget_2.setObjectName("widget_2")
-        self.gridLayout.addWidget(self.widget_2, 2, 1, 1, 2)
-        self.buttonBox = QtWidgets.QDialogButtonBox(tntdialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 9, 1, 1, 2)
-        self.frame = QtWidgets.QFrame(tntdialog)
-        self.frame.setObjectName("frame")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.frame)
-        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout_2.setSpacing(0)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.checkBox_2 = QtWidgets.QCheckBox(self.frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.checkBox_2.sizePolicy().hasHeightForWidth())
-        self.checkBox_2.setSizePolicy(sizePolicy)
-        self.checkBox_2.setObjectName("checkBox_2")
-        self.gridLayout_2.addWidget(self.checkBox_2, 3, 0, 1, 1)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label_5 = QtWidgets.QLabel(self.frame)
-        self.label_5.setObjectName("label_5")
-        self.horizontalLayout_2.addWidget(self.label_5)
-        self.start_lineedit = QtWidgets.QLineEdit(self.frame)
-        self.start_lineedit.setObjectName("start_lineedit")
-        self.horizontalLayout_2.addWidget(self.start_lineedit)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem1)
-        self.label_6 = QtWidgets.QLabel(self.frame)
-        self.label_6.setObjectName("label_6")
-        self.horizontalLayout_2.addWidget(self.label_6)
-        self.end_lineedit = QtWidgets.QLineEdit(self.frame)
-        self.end_lineedit.setFrame(True)
-        self.end_lineedit.setObjectName("end_lineedit")
-        self.horizontalLayout_2.addWidget(self.end_lineedit)
-        self.gridLayout_2.addLayout(self.horizontalLayout_2, 1, 0, 1, 2)
-        self.label = QtWidgets.QLabel(self.frame)
-        self.label.setObjectName("label")
-        self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1)
-        self.lineEdit = QtWidgets.QLineEdit(self.frame)
-        self.lineEdit.setObjectName("lineEdit")
-        self.gridLayout_2.addWidget(self.lineEdit, 0, 1, 1, 1)
-        self.spinBox = QtWidgets.QSpinBox(self.frame)
-        self.spinBox.setObjectName("spinBox")
-        self.gridLayout_2.addWidget(self.spinBox, 3, 1, 1, 1)
-        self.checkBox = QtWidgets.QCheckBox(self.frame)
-        self.checkBox.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.checkBox.setObjectName("checkBox")
-        self.gridLayout_2.addWidget(self.checkBox, 4, 0, 1, 1)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setContentsMargins(25, -1, -1, -1)
-        self.horizontalLayout.setSpacing(0)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.pushButton = QtWidgets.QPushButton(self.frame)
-        self.pushButton.setObjectName("pushButton")
-        self.horizontalLayout.addWidget(self.pushButton)
-        self.pushButton_2 = QtWidgets.QPushButton(self.frame)
-        self.pushButton_2.setObjectName("pushButton_2")
-        self.horizontalLayout.addWidget(self.pushButton_2)
-        self.gridLayout_2.addLayout(self.horizontalLayout, 4, 1, 1, 1)
-        self.gridLayout.addWidget(self.frame, 8, 1, 1, 2)
-        self.frame_2 = QtWidgets.QFrame(tntdialog)
-        self.frame_2.setObjectName("frame_2")
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.frame_2)
-        self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.label_4 = QtWidgets.QLabel(self.frame_2)
-        self.label_4.setObjectName("label_4")
-        self.horizontalLayout_3.addWidget(self.label_4)
-        self.unknown_delay_combobox = QtWidgets.QComboBox(self.frame_2)
-        self.unknown_delay_combobox.setObjectName("unknown_delay_combobox")
-        self.horizontalLayout_3.addWidget(self.unknown_delay_combobox)
-        self.gridLayout.addWidget(self.frame_2, 4, 1, 1, 2)
-
-        self.retranslateUi(tntdialog)
-        self.buttonBox.accepted.connect(tntdialog.accept)
-        self.buttonBox.rejected.connect(tntdialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(tntdialog)
-
-    def retranslateUi(self, tntdialog):
-        _translate = QtCore.QCoreApplication.translate
-        tntdialog.setWindowTitle(_translate("tntdialog", "Read tnt file"))
-        self.label_3.setText(_translate("tntdialog", "TextLabel"))
-        self.label_2.setText(_translate("tntdialog", "Dimensions"))
-        self.checkBox_2.setText(_translate("tntdialog", "Staggered range"))
-        self.label_5.setText(_translate("tntdialog", "Start"))
-        self.start_lineedit.setPlaceholderText(_translate("tntdialog", "0"))
-        self.label_6.setText(_translate("tntdialog", "End"))
-        self.end_lineedit.setPlaceholderText(_translate("tntdialog", "1"))
-        self.label.setText(_translate("tntdialog", "Name"))
-        self.checkBox.setToolTip(_translate("tntdialog", "NOTE: There is no inspection if start and end are valid values."))
-        self.checkBox.setText(_translate("tntdialog", "Logarithmic scale"))
-        self.pushButton.setText(_translate("tntdialog", "Apply"))
-        self.pushButton_2.setText(_translate("tntdialog", "Cancel"))
-        self.label_4.setText(_translate("tntdialog", "Unassigned lists"))
-from widgets.subwidgets import QDelayWidget

src/gui_qt/_py/typeconversion.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/typeconversion.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/typeconversion.ui'
 #
-# Created by: PyQt5 UI code generator 5.12.3
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
@@ -18,46 +17,46 @@ class Ui_Dialog(object):
         self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout_2.setSpacing(3)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.label_4 = QtWidgets.QLabel(Dialog)
+        self.label_4 = QtWidgets.QLabel(parent=Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
         self.label_4.setSizePolicy(sizePolicy)
-        self.label_4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.label_4.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.label_4.setObjectName("label_4")
         self.verticalLayout_2.addWidget(self.label_4)
-        self.splitter = QtWidgets.QSplitter(Dialog)
+        self.splitter = QtWidgets.QSplitter(parent=Dialog)
-        self.splitter.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setOrientation(QtCore.Qt.Orientation.Horizontal)
         self.splitter.setObjectName("splitter")
-        self.set_list = QtWidgets.QListWidget(self.splitter)
+        self.set_list = QtWidgets.QListWidget(parent=self.splitter)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.set_list.sizePolicy().hasHeightForWidth())
         self.set_list.setSizePolicy(sizePolicy)
         self.set_list.setDragEnabled(True)
-        self.set_list.setDragDropMode(QtWidgets.QAbstractItemView.DragOnly)
+        self.set_list.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.DragOnly)
         self.set_list.setObjectName("set_list")
-        self.verticalLayoutWidget = QtWidgets.QWidget(self.splitter)
+        self.verticalLayoutWidget = QtWidgets.QWidget(parent=self.splitter)
         self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
         self.gridLayout = QtWidgets.QGridLayout(self.verticalLayoutWidget)
         self.gridLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout.setHorizontalSpacing(0)
         self.gridLayout.setVerticalSpacing(2)
         self.gridLayout.setObjectName("gridLayout")
-        self.simple_button = QtWidgets.QRadioButton(self.verticalLayoutWidget)
+        self.simple_button = QtWidgets.QRadioButton(parent=self.verticalLayoutWidget)
         self.simple_button.setChecked(True)
         self.simple_button.setObjectName("simple_button")
         self.buttonGroup = QtWidgets.QButtonGroup(Dialog)
         self.buttonGroup.setObjectName("buttonGroup")
         self.buttonGroup.addButton(self.simple_button)
         self.gridLayout.addWidget(self.simple_button, 0, 0, 1, 1)
-        self.merge_button = QtWidgets.QRadioButton(self.verticalLayoutWidget)
+        self.merge_button = QtWidgets.QRadioButton(parent=self.verticalLayoutWidget)
         self.merge_button.setObjectName("merge_button")
         self.buttonGroup.addButton(self.merge_button)
         self.gridLayout.addWidget(self.merge_button, 0, 1, 1, 1)
-        self.stackedWidget = QtWidgets.QStackedWidget(self.verticalLayoutWidget)
+        self.stackedWidget = QtWidgets.QStackedWidget(parent=self.verticalLayoutWidget)
         self.stackedWidget.setObjectName("stackedWidget")
         self.page_1 = QtWidgets.QWidget()
         self.page_1.setObjectName("page_1")
@@ -65,13 +64,13 @@ class Ui_Dialog(object):
         self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_3.setSpacing(0)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.simple_table = QtWidgets.QTableWidget(self.page_1)
+        self.simple_table = QtWidgets.QTableWidget(parent=self.page_1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.simple_table.sizePolicy().hasHeightForWidth())
         self.simple_table.setSizePolicy(sizePolicy)
-        self.simple_table.setDragDropMode(QtWidgets.QAbstractItemView.DropOnly)
+        self.simple_table.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.DropOnly)
         self.simple_table.setObjectName("simple_table")
         self.simple_table.setColumnCount(2)
         self.simple_table.setRowCount(0)
@@ -88,15 +87,15 @@ class Ui_Dialog(object):
         self.verticalLayout_5.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_5.setSpacing(0)
         self.verticalLayout_5.setObjectName("verticalLayout_5")
-        self.merge_table = QtWidgets.QTableWidget(self.page_2)
+        self.merge_table = QtWidgets.QTableWidget(parent=self.page_2)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.merge_table.sizePolicy().hasHeightForWidth())
         self.merge_table.setSizePolicy(sizePolicy)
-        self.merge_table.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.merge_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
-        self.merge_table.setDragDropMode(QtWidgets.QAbstractItemView.DropOnly)
+        self.merge_table.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.DropOnly)
-        self.merge_table.setDefaultDropAction(QtCore.Qt.CopyAction)
+        self.merge_table.setDefaultDropAction(QtCore.Qt.DropAction.CopyAction)
         self.merge_table.setObjectName("merge_table")
         self.merge_table.setColumnCount(3)
         self.merge_table.setRowCount(0)
@@ -111,9 +110,9 @@ class Ui_Dialog(object):
         self.stackedWidget.addWidget(self.page_2)
         self.gridLayout.addWidget(self.stackedWidget, 1, 0, 1, 2)
         self.verticalLayout_2.addWidget(self.splitter)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Close|QtWidgets.QDialogButtonBox.StandardButton.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout_2.addWidget(self.buttonBox)
 

src/gui_qt/_py/untitled.py

@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/untitled.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_MainWindow(object):
-    def setupUi(self, MainWindow):
-        MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(800, 600)
-        self.centralwidget = QtWidgets.QWidget(MainWindow)
-        self.centralwidget.setObjectName("centralwidget")
-        self.toolButton = QtWidgets.QToolButton(self.centralwidget)
-        self.toolButton.setGeometry(QtCore.QRect(0, 0, 31, 34))
-        self.toolButton.setObjectName("toolButton")
-        MainWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtWidgets.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 30))
-        self.menubar.setObjectName("menubar")
-        self.menuDfgdfg = QtWidgets.QMenu(self.menubar)
-        self.menuDfgdfg.setObjectName("menuDfgdfg")
-        MainWindow.setMenuBar(self.menubar)
-        self.statusbar = QtWidgets.QStatusBar(MainWindow)
-        self.statusbar.setObjectName("statusbar")
-        MainWindow.setStatusBar(self.statusbar)
-        self.toolBar = QtWidgets.QToolBar(MainWindow)
-        self.toolBar.setObjectName("toolBar")
-        MainWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar)
-        self.actionAsdasd = QtWidgets.QAction(MainWindow)
-        self.actionAsdasd.setObjectName("actionAsdasd")
-        self.menuDfgdfg.addAction(self.actionAsdasd)
-        self.menubar.addAction(self.menuDfgdfg.menuAction())
-        self.toolBar.addSeparator()
-
-        self.retranslateUi(MainWindow)
-        QtCore.QMetaObject.connectSlotsByName(MainWindow)
-
-    def retranslateUi(self, MainWindow):
-        _translate = QtCore.QCoreApplication.translate
-        MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
-        self.toolButton.setText(_translate("MainWindow", "..."))
-        self.menuDfgdfg.setTitle(_translate("MainWindow", "dfgdfg"))
-        self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar"))
-        self.actionAsdasd.setText(_translate("MainWindow", "asdasd"))

src/gui_qt/_py/userfitassist.py

@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/userfitassist.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Dialog(object):
-    def setupUi(self, Dialog):
-        Dialog.setObjectName("Dialog")
-        Dialog.resize(675, 682)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.label_3 = QtWidgets.QLabel(Dialog)
-        self.label_3.setIndent(4)
-        self.label_3.setObjectName("label_3")
-        self.verticalLayout.addWidget(self.label_3)
-        self.lineEdit_2 = QtWidgets.QLineEdit(Dialog)
-        self.lineEdit_2.setObjectName("lineEdit_2")
-        self.verticalLayout.addWidget(self.lineEdit_2)
-        self.label_4 = QtWidgets.QLabel(Dialog)
-        self.label_4.setIndent(4)
-        self.label_4.setObjectName("label_4")
-        self.verticalLayout.addWidget(self.label_4)
-        self.lineEdit_3 = QtWidgets.QLineEdit(Dialog)
-        self.lineEdit_3.setObjectName("lineEdit_3")
-        self.verticalLayout.addWidget(self.lineEdit_3)
-        self.label_2 = QtWidgets.QLabel(Dialog)
-        self.label_2.setIndent(4)
-        self.label_2.setObjectName("label_2")
-        self.verticalLayout.addWidget(self.label_2)
-        self.lineEdit = QtWidgets.QLineEdit(Dialog)
-        self.lineEdit.setText("")
-        self.lineEdit.setObjectName("lineEdit")
-        self.verticalLayout.addWidget(self.lineEdit)
-        self.parameterLabel = QtWidgets.QLabel(Dialog)
-        self.parameterLabel.setIndent(4)
-        self.parameterLabel.setObjectName("parameterLabel")
-        self.verticalLayout.addWidget(self.parameterLabel)
-        self.parameterLineEdit = QtWidgets.QLineEdit(Dialog)
-        self.parameterLineEdit.setObjectName("parameterLineEdit")
-        self.verticalLayout.addWidget(self.parameterLineEdit)
-        self.checkBox = QtWidgets.QCheckBox(Dialog)
-        self.checkBox.setObjectName("checkBox")
-        self.verticalLayout.addWidget(self.checkBox)
-        self.externalParametersLineEdit = QtWidgets.QLineEdit(Dialog)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.externalParametersLineEdit.sizePolicy().hasHeightForWidth())
-        self.externalParametersLineEdit.setSizePolicy(sizePolicy)
-        self.externalParametersLineEdit.setObjectName("externalParametersLineEdit")
-        self.verticalLayout.addWidget(self.externalParametersLineEdit)
-        self.checkBox_2 = QtWidgets.QCheckBox(Dialog)
-        self.checkBox_2.setObjectName("checkBox_2")
-        self.verticalLayout.addWidget(self.checkBox_2)
-        self.tableWidget = QtWidgets.QTableWidget(Dialog)
-        self.tableWidget.setObjectName("tableWidget")
-        self.tableWidget.setColumnCount(0)
-        self.tableWidget.setRowCount(0)
-        self.verticalLayout.addWidget(self.tableWidget)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Save)
-        self.buttonBox.setObjectName("buttonBox")
-        self.verticalLayout.addWidget(self.buttonBox)
-        self.label_3.setBuddy(self.lineEdit_2)
-        self.label_4.setBuddy(self.lineEdit_3)
-        self.label_2.setBuddy(self.lineEdit)
-        self.parameterLabel.setBuddy(self.parameterLineEdit)
-
-        self.retranslateUi(Dialog)
-        self.buttonBox.accepted.connect(Dialog.accept)
-        self.buttonBox.rejected.connect(Dialog.reject)
-        QtCore.QMetaObject.connectSlotsByName(Dialog)
-
-    def retranslateUi(self, Dialog):
-        _translate = QtCore.QCoreApplication.translate
-        Dialog.setWindowTitle(_translate("Dialog", "Dialog"))
-        self.label_3.setText(_translate("Dialog", "Name"))
-        self.lineEdit_2.setPlaceholderText(_translate("Dialog", "Name of function, e.g. Hopperbagger"))
-        self.label_4.setText(_translate("Dialog", "Group"))
-        self.lineEdit_3.setPlaceholderText(_translate("Dialog", "Type of function, e.g., Relaxation, Diffusion, Dredge,..."))
-        self.label_2.setText(_translate("Dialog", "Equation"))
-        self.lineEdit.setPlaceholderText(_translate("Dialog", "\\alpha + B*exp(x*C_{33}) + D"))
-        self.parameterLabel.setText(_translate("Dialog", "Parameters"))
-        self.parameterLineEdit.setPlaceholderText(_translate("Dialog", "\\alpha B C_{33}"))
-        self.checkBox.setText(_translate("Dialog", "Fixed parameter"))
-        self.externalParametersLineEdit.setPlaceholderText(_translate("Dialog", "D"))
-        self.checkBox_2.setText(_translate("Dialog", "Selection"))
-        self.buttonBox.setToolTip(_translate("Dialog", "Fit model is saved in myfitmodels.py and ready to use without restart."))

src/gui_qt/_py/usermodeleditor.py

@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'resources/_ui/usermodeleditor.ui'
-#
-# Created by: PyQt5 UI code generator 5.12.3
-#
-# WARNING! All changes made in this file will be lost!
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_MainWindow(object):
-    def setupUi(self, MainWindow):
-        MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(800, 600)
-        self.centralwidget = QtWidgets.QWidget(MainWindow)
-        self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget)
-        self.verticalLayout.setContentsMargins(3, 3, 3, 3)
-        self.verticalLayout.setSpacing(3)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.edit_field = CodeEditor(self.centralwidget)
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.edit_field.setFont(font)
-        self.edit_field.setObjectName("edit_field")
-        self.verticalLayout.addWidget(self.edit_field)
-        MainWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtWidgets.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 30))
-        self.menubar.setObjectName("menubar")
-        self.menuFile = QtWidgets.QMenu(self.menubar)
-        self.menuFile.setObjectName("menuFile")
-        MainWindow.setMenuBar(self.menubar)
-        self.statusbar = QtWidgets.QStatusBar(MainWindow)
-        self.statusbar.setObjectName("statusbar")
-        MainWindow.setStatusBar(self.statusbar)
-        self.actionOpen = QtWidgets.QAction(MainWindow)
-        self.actionOpen.setObjectName("actionOpen")
-        self.actionSave = QtWidgets.QAction(MainWindow)
-        self.actionSave.setObjectName("actionSave")
-        self.actionSave_as = QtWidgets.QAction(MainWindow)
-        self.actionSave_as.setObjectName("actionSave_as")
-        self.actionClose = QtWidgets.QAction(MainWindow)
-        self.actionClose.setObjectName("actionClose")
-        self.menuFile.addAction(self.actionOpen)
-        self.menuFile.addAction(self.actionSave)
-        self.menuFile.addAction(self.actionSave_as)
-        self.menuFile.addAction(self.actionClose)
-        self.menubar.addAction(self.menuFile.menuAction())
-
-        self.retranslateUi(MainWindow)
-        QtCore.QMetaObject.connectSlotsByName(MainWindow)
-
-    def retranslateUi(self, MainWindow):
-        _translate = QtCore.QCoreApplication.translate
-        MainWindow.setWindowTitle(_translate("MainWindow", "Editor"))
-        self.menuFile.setTitle(_translate("MainWindow", "File"))
-        self.actionOpen.setText(_translate("MainWindow", "Open..."))
-        self.actionSave.setText(_translate("MainWindow", "Save"))
-        self.actionSave_as.setText(_translate("MainWindow", "Save as..."))
-        self.actionClose.setText(_translate("MainWindow", "Close"))
-from ..lib.codeeditor import CodeEditor

src/gui_qt/_py/valueeditor.py

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/valueeditor.ui'
-
-# Form implementation generated from reading ui file 'resources/_ui/valueeditor.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt6 UI code generator 6.7.1
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_MaskDialog(object):
@@ -19,73 +17,73 @@ class Ui_MaskDialog(object):
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.graph_combobox = QtWidgets.QComboBox(MaskDialog)
+        self.graph_combobox = QtWidgets.QComboBox(parent=MaskDialog)
         self.graph_combobox.setObjectName("graph_combobox")
         self.verticalLayout.addWidget(self.graph_combobox)
-        self.set_combobox = QtWidgets.QComboBox(MaskDialog)
+        self.set_combobox = QtWidgets.QComboBox(parent=MaskDialog)
         self.set_combobox.setObjectName("set_combobox")
         self.verticalLayout.addWidget(self.set_combobox)
-        self.tableView = QtWidgets.QTableView(MaskDialog)
+        self.tableView = QtWidgets.QTableView(parent=MaskDialog)
-        self.tableView.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.tableView.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.tableView.setObjectName("tableView")
         self.verticalLayout.addWidget(self.tableView)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label = QtWidgets.QLabel(MaskDialog)
+        self.label = QtWidgets.QLabel(parent=MaskDialog)
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
-        self.spinBox = QtWidgets.QSpinBox(MaskDialog)
+        self.spinBox = QtWidgets.QSpinBox(parent=MaskDialog)
         self.spinBox.setMinimum(1)
         self.spinBox.setObjectName("spinBox")
         self.horizontalLayout.addWidget(self.spinBox)
-        self.toolButton = QtWidgets.QToolButton(MaskDialog)
+        self.toolButton = QtWidgets.QToolButton(parent=MaskDialog)
-        self.toolButton.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.toolButton.setToolButtonStyle(QtCore.Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
         self.toolButton.setAutoRaise(True)
-        self.toolButton.setArrowType(QtCore.Qt.RightArrow)
+        self.toolButton.setArrowType(QtCore.Qt.ArrowType.RightArrow)
         self.toolButton.setObjectName("toolButton")
         self.horizontalLayout.addWidget(self.toolButton)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
         self.verticalLayout.addLayout(self.horizontalLayout)
-        self.line = QtWidgets.QFrame(MaskDialog)
+        self.line = QtWidgets.QFrame(parent=MaskDialog)
-        self.line.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
         self.line.setLineWidth(3)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
         self.line.setObjectName("line")
         self.verticalLayout.addWidget(self.line)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout_2.setSpacing(3)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.add_button = QtWidgets.QPushButton(MaskDialog)
+        self.add_button = QtWidgets.QPushButton(parent=MaskDialog)
         icon = QtGui.QIcon.fromTheme("list-add")
         self.add_button.setIcon(icon)
         self.add_button.setObjectName("add_button")
         self.horizontalLayout_2.addWidget(self.add_button)
-        self.delete_button = QtWidgets.QPushButton(MaskDialog)
+        self.delete_button = QtWidgets.QPushButton(parent=MaskDialog)
         icon = QtGui.QIcon.fromTheme("list-remove")
         self.delete_button.setIcon(icon)
         self.delete_button.setObjectName("delete_button")
         self.horizontalLayout_2.addWidget(self.delete_button)
-        self.split_button = QtWidgets.QPushButton(MaskDialog)
+        self.split_button = QtWidgets.QPushButton(parent=MaskDialog)
         self.split_button.setObjectName("split_button")
         self.horizontalLayout_2.addWidget(self.split_button)
         self.verticalLayout.addLayout(self.horizontalLayout_2)
-        self.line_2 = QtWidgets.QFrame(MaskDialog)
+        self.line_2 = QtWidgets.QFrame(parent=MaskDialog)
         self.line_2.setLineWidth(3)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine)
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.line_2.setObjectName("line_2")
         self.verticalLayout.addWidget(self.line_2)
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_3.setContentsMargins(-1, 0, -1, -1)
         self.horizontalLayout_3.setSpacing(3)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.mask_button = QtWidgets.QPushButton(MaskDialog)
+        self.mask_button = QtWidgets.QPushButton(parent=MaskDialog)
         self.mask_button.setObjectName("mask_button")
         self.horizontalLayout_3.addWidget(self.mask_button)
-        self.unmaskbutton = QtWidgets.QPushButton(MaskDialog)
+        self.unmaskbutton = QtWidgets.QPushButton(parent=MaskDialog)
         self.unmaskbutton.setObjectName("unmaskbutton")
         self.horizontalLayout_3.addWidget(self.unmaskbutton)
         self.verticalLayout.addLayout(self.horizontalLayout_3)

src/gui_qt/data/container.py

@@ -8,12 +8,14 @@ from pyqtgraph import mkPen
 
 from nmreval.data.points import Points
 from nmreval.data.signals import Signal
+from nmreval.lib.logger import logger
 from nmreval.utils.text import convert
 from nmreval.data.bds import BDS
-from nmreval.lib.colors import BaseColor, TUColors
+from nmreval.data.dsc import DSC
-from nmreval.lib.lines import LineStyle
-from nmreval.lib.symbols import SymbolStyle, symbolcycle
 from nmreval.data.nmr import Spectrum, FID
+from nmreval.lib.colors import BaseColor, TUColors
+from ..lib.lines import LineStyle
+from ..lib.symbols import SymbolStyle, symbolcycle
 
 from ..Qt import QtCore, QtGui
 from ..io.exporters import GraceExporter
@@ -32,6 +34,7 @@ class ExperimentContainer(QtCore.QObject):
         self.id = str(identifier)
 
         self._fits = []
+        self._relations = kwargs.get('relations', {})
         self._data = data
         self._manager = kwargs.get('manager')
         self.graph = ''
@@ -44,6 +47,7 @@ class ExperimentContainer(QtCore.QObject):
         self.actions = {}
         self._update_actions()
 
+    @plot_update
     def _init_plot(self):
         raise NotImplementedError
 
@@ -226,6 +230,8 @@ class ExperimentContainer(QtCore.QObject):
         return self.plot_real, self.plot_imag, self.plot_error
 
     def get_state(self):
+        # TODO preserve relationships
+
         ret_dic = {
             'id': self.id,
             'data': self._data.get_state(),
@@ -267,11 +273,39 @@ class ExperimentContainer(QtCore.QObject):
         else:
             self._fits.extend(value)
 
+    def has_relation(self, relation_type):
+        return relation_type in self._relations
+
+    def get_relation(self, relation_type: int):
+        return self._relations.get(relation_type, [])
+
+    def add_relation(self, relation_type: int, value: str):
+        if relation_type not in self._relations:
+            self._relations[relation_type] = []
+
+        self._relations[relation_type].append(value)
+
+    def remove_relation(self, relation_type: int, value: str):
+        if relation_type not in self._relations:
+            raise ValueError(f'Relationship {relation_type!r} with id {value!r} doe not exist for {self.name}')
+
+        related_id_value = self._relations[relation_type]
+
+        idx = related_id_value.index(value)
+        if idx == -1:
+            raise ValueError(f'Relationship {relation_type!r} with id {value!r} doe not exist for {self.name}')
+
+        related_id_value.pop(idx)
+        if len(related_id_value) == 0:
+            self._relations.pop(relation_type)
+
     def _update_actions(self):
-        self.actions.update({'sort': self._data.sort,
+        self.actions.update({
-                             'cut': self._data.cut,
+            'sort': self._data.sort,
-                             'norm': self._data.normalize,
+            'cut': self._data.cut,
-                             'center': self.center})
+            'norm': self._data.normalize,
+            'center': self.center,
+        })
 
     @plot_update
     def update(self, opts: dict):
@@ -279,9 +313,11 @@ class ExperimentContainer(QtCore.QObject):
 
     def get_properties(self) -> dict:
         props = OrderedDict()
-        props['General'] = OrderedDict([('Name', self.name),
+        props['General'] = OrderedDict([
-                                        ('Value', str(self.value)),
+            ('Name', self.name),
-                                        ('Group', str(self.group))])
+            ('Value', str(self.value)),
+            ('Group', str(self.group)),
+        ])
         props['Symbol'] = OrderedDict()
         props['Line'] = OrderedDict()
 
@@ -312,12 +348,10 @@ class ExperimentContainer(QtCore.QObject):
                 err_pen.setColor(QtGui.QColor(*self.plot_real.symbolcolor.rgb()))
                 self.plot_error.setData(pen=err_pen)
 
-        elif mode == 'imag' and self.plot_imag is not None:
+        if mode in ['imag', 'all'] and self.plot_imag is not None:
             self.plot_imag.set_color(color, symbol=symbol, line=line)
-        else:
-            print('Updating color failed for ' + str(self.id))
 
-    def setSymbol(self, symbol=None, color=None, size=None, mode='real'):
+    def setSymbol(self, *, symbol=None, color=None, size=None, mode='real'):
         if mode in ['real', 'all']:
             self.plot_real.set_symbol(symbol=symbol, size=size, color=color)
             if color is not None and self.plot_error is not None and self.plot_real.symbol != SymbolStyle.No:
@@ -327,9 +361,9 @@ class ExperimentContainer(QtCore.QObject):
         elif mode in ['imag', 'all'] and self.plot_imag is not None:
             self.plot_imag.set_symbol(symbol=symbol, size=size, color=color)
         else:
-            print('Updating symbol failed for ' + str(self.id))
+            logger.warning(f'Updating symbol failed for {self.id}')
 
-    def setLine(self, width=None, style=None, color=None, mode='real'):
+    def setLine(self, *, width=None, style=None, color=None, mode='real'):
         if mode in ['real', 'all']:
             self.plot_real.set_line(width=width, style=style, color=color)
             if color is not None and self.plot_error is not None and self.plot_real.symbol == SymbolStyle.No:
@@ -339,7 +373,7 @@ class ExperimentContainer(QtCore.QObject):
         elif mode in ['imag', 'all'] and self.plot_imag is not None:
             self.plot_imag.set_line(width=width, style=style, color=color)
         else:
-            print('Updating line failed for ' + str(self.id))
+            logger.warning(f'Updating line failed for {self.id}')
 
     def update_property(self, key1: str, key2: str, value: Any):
         keykey = key2.split()
@@ -434,16 +468,28 @@ class ExperimentContainer(QtCore.QObject):
 
         return offset
 
+    @plot_update
+    def shift_scale(self, shift_factor: tuple[float, float], scaling_factor: tuple[float, float]):
+        scale_x, scale_y = scaling_factor
+        shift_x, shift_y = shift_factor
+        self.data.x = self.data.x * scale_x + shift_x
+        self.data.y = self.data.y * scale_y + shift_y
+        self.data.y_err = self.data.y_err * scale_y
+
+        self.update({'shift': scaling_factor, 'scale': shift_factor})
+
     def get_namespace(self, i: int = None, j: int = None) -> dict:
         if (i is None) and (j is None):
             prefix = ''
         else:
-            prefix = 'g[%i].s[%i].' % (i, j)
+            prefix = f'g[{i}].s[{j}].'
 
-        namespace = {prefix + 'x': (self.x, 'x values'),
+        namespace = {
-                     prefix + 'y': [self.y, 'y values'],
+            prefix + 'x': (self.x, 'x values'),
-                     prefix + 'y_err': (self.y_err, 'y error values'),
+            prefix + 'y': [self.y, 'y values'],
-                     prefix + 'value': (self.value, str(self.value))}
+            prefix + 'y_err': (self.y_err, 'y error values'),
+            prefix + 'value': (self.value, str(self.value)),
+        }
 
         if len(self._fits) == 1:
             namespace.update({
@@ -459,27 +505,50 @@ class ExperimentContainer(QtCore.QObject):
 
         return namespace
 
-    def eval_expression(self, cmds, namespace):
+    def eval_expression(self, cmds, namespace, i=None, j=None):
-        namespace.update({'x': self.x, 'y': self.y, 'y_err': self.y_err, 'value': self.value})
+        if i is not None:
+            namespace['i'] = i
 
-        if len(self._fits) == 1:
+        if j is not None:
-            namespace.update({"fit['%s']" % (convert(pname, old='tex', new='str')): pvalue.value
+            namespace['j'] = j
-                              for (pname, pvalue) in self._manager[self._fits[0]].parameter.items()})
+
+        namespace.update({'x': self._data.x, 'y': self._data.y, 'y_err': self._data.y_err, 'value': self.value})
+        namespace['fit'] = {}
+
+        if isinstance(self, FitContainer):
+            namespace['fit'].update({
+                '%s' % convert(pname, old='latex', new='plain'): pvalue.value
+                for (pname, pvalue) in self._data.parameter.items()
+            })
+
+        elif len(self._fits) == 1:
+            namespace['fit'].update({
+                '%s' % convert(pname, old='tex', new='str'): pvalue.value
+                for (pname, pvalue) in self._manager[self._fits[0]].parameter.items()
+            })
         else:
             for k, f in enumerate(self._fits):
-                namespace.update({"fit['%s_%i']" % (convert(pname, old='tex', new='str'), k): pvalue.value
+                namespace['fit'].update({
-                                  for (pname, pvalue) in self._manager[f].parameter.items()})
+                    "%s_%i" % (convert(pname, old='tex', new='str'), k): pvalue.value
+                    for (pname, pvalue) in self._manager[f].parameter.items()
+                })
 
         new_data = self.copy()
         for c in cmds:
             if c:
                 exec(c, globals(), namespace)
 
-        new_data.set_data(x=namespace['x'], y=namespace['y'], y_err=namespace['y_err'])
+        new_data.set_data(x=namespace['x'], y=namespace['y'], y_err=namespace['y_err'], replace_mask=False)
         new_data.value = namespace['value']
 
         return new_data
 
+    def binning(self, digits: float):
+        new_data = self.copy(full=True)
+        new_data.data = self._data.binning(value=digits)
+
+        return new_data
+
 
 class PointContainer(ExperimentContainer):
     symbols = symbolcycle()
@@ -490,6 +559,9 @@ class PointContainer(ExperimentContainer):
         self.mode = 'pts'
         self._init_plot(**kwargs)
 
+        if isinstance(self._data, DSC):
+            self.mode = 'dsc'
+
     def _init_plot(self, **kwargs):
         self.plot_imag = None
 
@@ -526,17 +598,17 @@ class PointContainer(ExperimentContainer):
                 line_kwargs['style'] = LineStyle.No
                 sym_kwargs['symbol'] = next(PointContainer.symbols)
 
-        self.plot_real = PlotItem(x=self._data.x, y=self._data.y, name=self.name,
+        self.plot_real = PlotItem(x=self.x, y=self.y, name=self.name,
                                   symbol=None, pen=None, connect='finite')
 
         self.setSymbol(mode='real', **sym_kwargs)
         self.setLine(mode='real', **line_kwargs)
 
         if sym_kwargs['symbol'] != SymbolStyle.No:
-            self.plot_error = ErrorBars(x=self._data.x, y=self._data.y, top=self._data.y_err, bottom=self._data.y_err,
+            self.plot_error = ErrorBars(x=self.x, y=self.y, top=self.y_err, bottom=self.y_err,
                                         pen=mkPen({'color': self.plot_real.symbolcolor.rgb()}))
         else:
-            self.plot_error = ErrorBars(x=self._data.x, y=self._data.y, top=self._data.y_err, bottom=self._data.y_err,
+            self.plot_error = ErrorBars(x=self.x, y=self.y, top=self.y_err, bottom=self.y_err,
                                         pen=mkPen({'color': self.plot_real.linecolor.rgb()}))
 
 
@@ -559,12 +631,12 @@ class FitContainer(ExperimentContainer):
         if isinstance(color, BaseColor):
             color = color.rgb()
 
-        self.plot_real = PlotItem(x=self._data.x, y=self._data.y.real, name=self.name,
+        self.plot_real = PlotItem(x=self.x, y=self.y.real, name=self.name,
                                   pen=mkPen({'color': color}),
                                   connect='finite', symbol=None)
 
         if np.iscomplexobj(self._data.y):
-            self.plot_imag = PlotItem(x=self._data.x, y=self._data.y.imag, name=self.name,
+            self.plot_imag = PlotItem(x=self.x, y=self.y.imag, name=self.name,
                                       pen=mkPen({'color': color}),
                                       connect='finite', symbol=None)
 
@@ -597,9 +669,9 @@ class SignalContainer(ExperimentContainer):
         self._init_plot(symbol=symbol, **kwargs)
 
     def _init_plot(self, **kwargs):
-        self.plot_real = PlotItem(x=self._data.x, y=self._data.y.real, name=self.name,
+        self.plot_real = PlotItem(x=self.x, y=self.y.real, name=self.name,
                                   symbol=None, pen=None, connect='finite')
-        self.plot_imag = PlotItem(x=self._data.x, y=self._data.y.imag, name=self.name,
+        self.plot_imag = PlotItem(x=self.x, y=self.y.imag, name=self.name,
                                   symbol=None, pen=None, connect='finite')
 
         color = kwargs.get('color', None)
@@ -683,3 +755,46 @@ class SignalContainer(ExperimentContainer):
         self._update_actions()
 
         return self
+
+    @plot_update
+    def edit_signal(
+            self: SignalContainer,
+            baseline: tuple[None | bool],
+            leftshift: tuple[None | float, str],
+            zerofill: tuple[None, int],
+            apod: tuple[None, list[float], type[object]],
+            phase: tuple[None | float, float, float],
+            fourier: tuple[None | bool]
+    ):
+        """
+        Function for EditUndoCommand to call if a timesignal or spectra must be worked on.
+        This avoids to update the plot for every action we do and makes it slightly faster.
+        """
+
+        if baseline[0] is not None:
+            self._data.baseline()
+
+        if leftshift[0] is not None:
+            self._data.shift(*leftshift)
+
+        if zerofill[0] is not None:
+            self._data.zerofill(*zerofill)
+
+        if apod[0] is not None:
+            self._data.apod(*apod)
+
+        # ft with three options: None, True, False
+        if fourier[0] is None:
+            # ft None -> only phase correct
+            if phase[0] is not None:
+                self._data.manual_phase(*phase)
+        elif fourier[0] == True:
+            # ft True -> first phase correct then fft
+            if phase[0] is not None:
+                self._data.manual_phase(*phase)
+            self.fourier()
+        else:
+            # ft False -> first fft then phase correct
+            self.fourier()
+            if phase[0] is not None:
+                self._data.manual_phase(*phase)

src/gui_qt/data/conversion.py

@@ -32,16 +32,16 @@ class ConversionDialog(QtWidgets.QDialog, Ui_Dialog):
                 item_name = set_name + ' (' + graph[1] + ')'
 
                 item1 = QtWidgets.QListWidgetItem(item_name)
-                item1.setData(QtCore.Qt.UserRole, set_id)
+                item1.setData(QtCore.Qt.ItemDataRole.UserRole, set_id)
-                item1.setData(QtCore.Qt.UserRole+1, graph[0])
+                item1.setData(QtCore.Qt.ItemDataRole.UserRole+1, graph[0])
                 self.set_list.addItem(item1)
 
     def eventFilter(self, src: QtCore.QObject, evt: QtCore.QEvent):
-        if evt.type() in [QtCore.QEvent.DragEnter, QtCore.QEvent.DragMove]:
+        if evt.type() in [QtCore.QEvent.Type.DragEnter, QtCore.QEvent.Type.DragMove]:
             evt.accept()
             return True
 
-        if evt.type() == QtCore.QEvent.KeyPress and evt.key() == QtCore.Qt.Key_Delete:
+        if evt.type() == QtCore.QEvent.Type.KeyPress and evt.key() == QtCore.Qt.Key.Key_Delete:
             if src == self.simple_table:
                 type_idx = 1
             else:
@@ -113,8 +113,8 @@ class ConversionDialog(QtWidgets.QDialog, Ui_Dialog):
         src_sets = []
         for row in range(self.simple_table.rowCount()):
             item = self.simple_table.item(row, 0)
-            set_id = item.data(QtCore.Qt.UserRole)
+            set_id = item.data(QtCore.Qt.ItemDataRole.UserRole)
-            graph_id = item.data(QtCore.Qt.UserRole+1)
+            graph_id = item.data(QtCore.Qt.ItemDataRole.UserRole+1)
             type_idx = self.simple_table.cellWidget(row, 1).currentIndex()
 
             src_sets.append((set_id, graph_id, type_idx))
@@ -123,15 +123,15 @@ class ConversionDialog(QtWidgets.QDialog, Ui_Dialog):
             item = self.merge_table.item(row, 0)
             graph_id = ''
             if item is not None:
-                set_id_real = item.data(QtCore.Qt.UserRole)
+                set_id_real = item.data(QtCore.Qt.ItemDataRole.UserRole)
-                graph_id = item.data(QtCore.Qt.UserRole+1)
+                graph_id = item.data(QtCore.Qt.ItemDataRole.UserRole+1)
             else:
                 set_id_real = ''
 
             item = self.merge_table.item(row, 1)
             if item is not None:
-                set_id_imag = item.data(QtCore.Qt.UserRole)
+                set_id_imag = item.data(QtCore.Qt.ItemDataRole.UserRole)
-                graph_id = item.data(QtCore.Qt.UserRole+1) if graph_id == '' else graph_id
+                graph_id = item.data(QtCore.Qt.ItemDataRole.UserRole+1) if graph_id == '' else graph_id
             else:
                 set_id_imag = ''
             type_idx = self.merge_table.cellWidget(row, 2).currentIndex() + 1

src/gui_qt/data/datawidget/datawidget.py

@@ -5,7 +5,7 @@ from nmreval.lib.colors import available_cycles
 from .properties import PropWidget
 from ...Qt import QtWidgets, QtGui, QtCore
 from ..._py.datawidget import Ui_DataWidget
-from ...lib import make_action_icons
+from ...lib.iconloading import make_action_icons
 from ...lib.delegates import HeaderDelegate
 
 
@@ -17,42 +17,47 @@ class DataTree(QtWidgets.QTreeWidget):
     moveItem = QtCore.pyqtSignal(list, str, str, int)  # items, from, to, new row
     copyItem = QtCore.pyqtSignal(list, str)
     saveFits = QtCore.pyqtSignal(list)
-    extendFits = QtCore.pyqtSignal(list)
+    extendFits = QtCore.pyqtSignal(list, bool)
 
     def __init__(self, parent=None):
         super().__init__(parent=parent)
 
-        self.invisibleRootItem().setFlags(self.invisibleRootItem().flags() ^ QtCore.Qt.ItemIsDropEnabled)
+        self.invisibleRootItem().setFlags(self.invisibleRootItem().flags() ^ QtCore.Qt.ItemFlag.ItemIsDropEnabled)
 
         self.itemChanged.connect(self.data_change)
         self.itemClicked.connect(self.new_selection)
 
         self.setColumnCount(2)
 
-        self.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
+        self.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.setDragDropMode(QtWidgets.QTreeView.InternalMove)
+        self.setDragDropMode(QtWidgets.QTreeView.DragDropMode.InternalMove)
-        self.setDefaultDropAction(QtCore.Qt.IgnoreAction)
+        self.setDefaultDropAction(QtCore.Qt.DropAction.IgnoreAction)
-        self.setSelectionMode(QtWidgets.QTreeView.ExtendedSelection)
+        self.setSelectionMode(QtWidgets.QTreeView.SelectionMode.ExtendedSelection)
-        self.setSelectionBehavior(QtWidgets.QTreeView.SelectRows)
+        self.setSelectionBehavior(QtWidgets.QTreeView.SelectionBehavior.SelectRows)
 
         self._checked_graphs = set()
         self._checked_sets = set()
         self.management = None
 
-        header = QtWidgets.QHeaderView(QtCore.Qt.Horizontal, self)
+        header = QtWidgets.QHeaderView(QtCore.Qt.Orientation.Horizontal, self)
         self.setHeader(header)
-        header.setSectionResizeMode(0, QtWidgets.QHeaderView.Stretch)
+        header.setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeMode.Stretch)
         header.setVisible(False)
         header.moveSection(1, 0)
         self.setItemDelegateForColumn(1, HeaderDelegate())
 
     def add_graph(self, idd: str, name: str):
         item = QtWidgets.QTreeWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsDropEnabled | QtCore.Qt.ItemIsEditable |
+        item.setFlags(
-                      QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsUserCheckable)
+            QtCore.Qt.ItemFlag.ItemIsSelectable |
+            QtCore.Qt.ItemFlag.ItemIsDropEnabled |
+            QtCore.Qt.ItemFlag.ItemIsEditable |
+            QtCore.Qt.ItemFlag.ItemIsEnabled |
+            QtCore.Qt.ItemFlag.ItemIsUserCheckable
+        )
         item.setText(0, name)
-        item.setData(0, QtCore.Qt.UserRole, idd)
+        item.setData(0, QtCore.Qt.ItemDataRole.UserRole, idd)
-        item.setCheckState(0, QtCore.Qt.Checked)
+        item.setCheckState(0, QtCore.Qt.CheckState.Checked)
 
         self.addTopLevelItem(item)
         self._checked_graphs.add(idd)
@@ -60,31 +65,37 @@ class DataTree(QtWidgets.QTreeWidget):
 
         self.update_indexes()
 
-    def add_item(self, items: (tuple | list[tuple]), gid: str):
+    def add_item(self, items: (tuple | list[tuple]), gid: str, update: bool = True):
         if isinstance(items, tuple):
             items = [items]
 
         for row in range(self.invisibleRootItem().childCount()):
             graph = self.invisibleRootItem().child(row)
-            if graph.data(0, QtCore.Qt.UserRole) == gid:
+            if graph.data(0, QtCore.Qt.ItemDataRole.UserRole) == gid:
-                for (idd, name) in items:
+                for (idd, name, value) in items:
                     item = QtWidgets.QTreeWidgetItem([name])
-                    item.setData(0, QtCore.Qt.UserRole, idd)
+                    item.setToolTip(0, f'Value: {value}')
-                    item.setCheckState(0, QtCore.Qt.Checked)
+                    item.setData(0, QtCore.Qt.ItemDataRole.UserRole, idd)
-                    item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsEditable |
+                    item.setCheckState(0, QtCore.Qt.CheckState.Checked)
-                                  QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsUserCheckable)
+                    item.setFlags(
+                        QtCore.Qt.ItemFlag.ItemIsSelectable |
+                        QtCore.Qt.ItemFlag.ItemIsDragEnabled |
+                        QtCore.Qt.ItemFlag.ItemIsEditable |
+                        QtCore.Qt.ItemFlag.ItemIsEnabled |
+                        QtCore.Qt.ItemFlag.ItemIsUserCheckable
+                    )
                     graph.addChild(item)
                     self._checked_sets.add(idd)
 
                 self.resizeColumnToContents(0)
                 break
-
+        if update:
-        self.update_indexes()
+            self.update_indexes()
 
     @QtCore.pyqtSlot(QtWidgets.QTreeWidgetItem)
-    def data_change(self, item: QtWidgets.QTreeWidgetItem) -> tuple[set, set]:
+    def data_change(self, item: QtWidgets.QTreeWidgetItem, emit: bool = True) -> tuple[set, set]:
-        idd = item.data(0, QtCore.Qt.UserRole)
+        idd = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
-        is_selected = item.checkState(0) == QtCore.Qt.Checked
+        is_selected = item.checkState(0) == QtCore.Qt.CheckState.Checked
         to_be_hidden = set()
         to_be_shown = set()
 
@@ -102,9 +113,9 @@ class DataTree(QtWidgets.QTreeWidget):
                     self.blockSignals(True)
                     for i in range(item.childCount()):
                         child = item.child(i)
-                        child.setCheckState(0, QtCore.Qt.Checked)
+                        child.setCheckState(0, QtCore.Qt.CheckState.Checked)
-                        to_be_shown.add(child.data(0, QtCore.Qt.UserRole))
+                        to_be_shown.add(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
-                        self._checked_sets.add(child.data(0, QtCore.Qt.UserRole))
+                        self._checked_sets.add(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
                     self.blockSignals(False)
 
                 # check state change to unchecked
@@ -113,10 +124,10 @@ class DataTree(QtWidgets.QTreeWidget):
                     self.blockSignals(True)
                     for i in range(item.childCount()):
                         child = item.child(i)
-                        child.setCheckState(0, QtCore.Qt.Unchecked)
+                        child.setCheckState(0, QtCore.Qt.CheckState.Unchecked)
-                        to_be_hidden.add(child.data(0, QtCore.Qt.UserRole))
+                        to_be_hidden.add(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
                         try:
-                            self._checked_sets.remove(child.data(0, QtCore.Qt.UserRole))
+                            self._checked_sets.remove(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
                         except KeyError:
                             pass
                     self.blockSignals(False)
@@ -140,9 +151,10 @@ class DataTree(QtWidgets.QTreeWidget):
                         pass
 
             else:
-                self.keyChanged.emit(idd, item.text(0))
+                if emit:
+                    self.keyChanged.emit(idd, item.text(0))
 
-        if to_be_shown or to_be_hidden:
+        if (to_be_shown or to_be_hidden) and emit:
             self.stateChanged.emit(list(to_be_shown), list(to_be_hidden))
 
         return to_be_shown, to_be_hidden
@@ -150,7 +162,7 @@ class DataTree(QtWidgets.QTreeWidget):
     @QtCore.pyqtSlot(QtWidgets.QTreeWidgetItem)
     def new_selection(self, item: QtWidgets.QTreeWidgetItem):
         if item.parent() is None:
-            self.management.select_window(item.data(0, QtCore.Qt.UserRole))
+            self.management.select_window(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
 
     def dropEvent(self, evt: QtGui.QDropEvent):
         dropped_index = self.indexAt(evt.pos())
@@ -176,7 +188,7 @@ class DataTree(QtWidgets.QTreeWidget):
 
             from_parent.removeChild(it)
             tobemoved.append(it)
-            take_from.append(from_parent.data(0, QtCore.Qt.UserRole))
+            take_from.append(from_parent.data(0, QtCore.Qt.ItemDataRole.UserRole))
 
         pos = QtCore.QModelIndex(persistent_drop)
         if self.dropIndicatorPosition() == QtWidgets.QAbstractItemView.BelowItem:
@@ -188,8 +200,8 @@ class DataTree(QtWidgets.QTreeWidget):
         else:
             to_parent.insertChildren(row, tobemoved)
 
-        self.management.move_sets([it.data(0, QtCore.Qt.UserRole) for it in tobemoved],
+        self.management.move_sets([it.data(0, QtCore.Qt.ItemDataRole.UserRole) for it in tobemoved],
-                                  to_parent.data(0, QtCore.Qt.UserRole), take_from,
+                                  to_parent.data(0, QtCore.Qt.ItemDataRole.UserRole), take_from,
                                   pos=-1 if append else row)
 
         self.update_indexes()
@@ -204,7 +216,7 @@ class DataTree(QtWidgets.QTreeWidget):
         while iterator.value():
             item = iterator.value()
             if item is not None:
-                data = item.data(0, QtCore.Qt.UserRole)
+                data = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
                 if data == gid_out:
                     from_parent = item
 
@@ -228,8 +240,8 @@ class DataTree(QtWidgets.QTreeWidget):
         self.blockSignals(False)
 
     def sort(self, graph_item: QtWidgets.QTreeWidgetItem, mode: str = 'value'):
-        graph_id = graph_item.data(0, QtCore.Qt.UserRole)
+        graph_id = graph_item.data(0, QtCore.Qt.ItemDataRole.UserRole)
-        sets  = self.management.get_attributes(graph_id, mode)
+        sets = self.management.get_attributes(graph_id, mode)
         sets = [el[0] for el in sorted(sets.items(), key=lambda x: x[1])]
 
         self.management.move_sets(sets, graph_id, graph_id, pos=-1)
@@ -240,18 +252,18 @@ class DataTree(QtWidgets.QTreeWidget):
 
         for s in sets:
             for c in children:
-                if c.data(0, QtCore.Qt.UserRole) == s:
+                if c.data(0, QtCore.Qt.ItemDataRole.UserRole) == s:
                     graph_item.addChild(c)
 
         self.update_indexes()
 
         self.blockSignals(False)
 
-
     def update_indexes(self):
         graph_cnt = -1
         set_cnt = 0
         iterator = QtWidgets.QTreeWidgetItemIterator(self)
+        self.blockSignals(True)
         while iterator.value():
             item = iterator.value()
             if item is not None:
@@ -266,13 +278,14 @@ class DataTree(QtWidgets.QTreeWidget):
             iterator += 1
 
         self.resizeColumnToContents(1)
+        self.blockSignals(False)
 
     def set_name(self, sid, name):
         iterator = QtWidgets.QTreeWidgetItemIterator(self)
         while iterator.value():
             item = iterator.value()
             if item is not None:
-                data = item.data(0, QtCore.Qt.UserRole)
+                data = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
                 if data == sid:
                     if name != item.text(0):
                         item.setText(0, name)
@@ -281,24 +294,31 @@ class DataTree(QtWidgets.QTreeWidget):
                 iterator += 1
 
     def keyPressEvent(self, evt: QtGui.QKeyEvent):
-        if evt.key() == QtCore.Qt.Key_Delete:
+        if evt.key() == QtCore.Qt.Key.Key_Delete:
             rm_sets = []
             rm_graphs = []
             for idx in self.selectedIndexes():
                 if idx.column() == 1:
                     continue
+
                 item = self.itemFromIndex(idx)
                 if item.parent() is None:
                     for c_i in range(item.childCount()):
-                        rm_sets.append(item.child(c_i).data(0, QtCore.Qt.UserRole))
+                        # add sets inside graph to removal
-                    rm_graphs.append(item.data(0, QtCore.Qt.UserRole))
+                        child_data = item.child(c_i).data(0, QtCore.Qt.ItemDataRole.UserRole)
+                        if child_data not in rm_sets:
+                            rm_sets.append(child_data)
+                    rm_graphs.append(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
+
                 else:
-                    rm_sets.append(item.data(0, QtCore.Qt.UserRole))
+                    item_data = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
+                    if item_data not in rm_sets:
+                        rm_sets.append(item_data)
 
             # self.deleteItem.emit(rm_sets+rm_graphs)
             self.management.delete_sets(rm_sets+rm_graphs)
 
-        elif evt.key() == QtCore.Qt.Key_Space:
+        elif evt.key() == QtCore.Qt.Key.Key_Space:
             sets = []
             from_parent = []
 
@@ -306,26 +326,24 @@ class DataTree(QtWidgets.QTreeWidget):
                 if idx.column() != 0:
                     continue
                 item = self.itemFromIndex(idx)
-
                 if item.parent() is None:
-                    is_selected = item.checkState(0)
-                    self.blockSignals(True)
                     for i in range(item.childCount()):
                         child = item.child(i)
                         from_parent.append(child)
-                    self.blockSignals(False)
+                sets.append(item)
-                    if is_selected == QtCore.Qt.Checked:
-                        item.setCheckState(0, QtCore.Qt.Unchecked)
-                    else:
-                        item.setCheckState(0, QtCore.Qt.Checked)
-
-                else:
-                    sets.append(item)
 
+            to_be_hidden = set()
+            to_be_shown = set()
+            self.blockSignals(True)
             for it in sets:
                 if it in from_parent:
                     continue
-                it.setCheckState(0, QtCore.Qt.Unchecked if it.checkState(0) == QtCore.Qt.Checked else QtCore.Qt.Checked)
+                it.setCheckState(0, QtCore.Qt.CheckState.Unchecked if it.checkState(0) == QtCore.Qt.CheckState.Checked else QtCore.Qt.CheckState.Checked)
+                s1, s2 = self.data_change(it, emit=False)
+                to_be_hidden |= s2
+                to_be_shown |= s1
+            self.blockSignals(False)
+            self.stateChanged.emit(list(to_be_shown), list(to_be_hidden))
         else:
             super().keyPressEvent(evt)
 
@@ -335,27 +353,47 @@ class DataTree(QtWidgets.QTreeWidget):
         self.setDragEnabled(idx.column() == 0)
         super().mousePressEvent(evt)
 
-    def remove_item(self, ids: list):
+    def remove_item(self, ids: list[str]):
         iterator = QtWidgets.QTreeWidgetItemIterator(self)
+
+        toberemoved = []
+        graph_removal = []
+
+        # find all items that have to be removed
         while iterator.value():
             item = iterator.value()
-            _id = item.data(0, QtCore.Qt.UserRole)
+            _id = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
             if _id in ids:
                 try:
-                    if item.parent() is None:
+                    item_parent = item.parent()
+                    if item_parent is None:
                         raise AttributeError
 
-                    idx = item.parent().indexOfChild(item)
+                    idx = item_parent.indexOfChild(item)
-                    item.parent().takeChild(idx)
+                    # item.parent().takeChild(idx)
+
+                    toberemoved.append((item_parent, idx))
+
                     if _id in self._checked_sets:
                         self._checked_sets.remove(_id)
+
                 except AttributeError:
                     idx = self.invisibleRootItem().indexOfChild(item)
-                    self.invisibleRootItem().takeChild(idx)
+                    # self.invisibleRootItem().takeChild(idx)
-                    self._checked_graphs.remove(_id)
+
+                    graph_removal.append(idx)
+
+                    if _id in self._checked_graphs:
+                        self._checked_graphs.remove(_id)
 
             iterator += 1
 
+        for (item, set_idx) in sorted(toberemoved, key=lambda x: x[1], reverse=True):
+            item.takeChild(set_idx)
+
+        for graph_idx in sorted(graph_removal, reverse=True):
+            self.invisibleRootItem().takeChild(graph_idx)
+
         self.update_indexes()
 
     def contextMenuEvent(self, evt):
@@ -381,6 +419,7 @@ class DataTree(QtWidgets.QTreeWidget):
             self.ctx_sets(evt, menu)
 
     def ctx_graphs(self, evt, menu):
+        copy_action = menu.addAction('Replicate graph!')
         del_action = menu.addAction('Exterminate graph!')
 
         sort_menu = menu.addMenu('Sort sets')
@@ -401,12 +440,16 @@ class DataTree(QtWidgets.QTreeWidget):
             if i.column() == 0:
                 continue
             items.append(self.itemFromIndex(i))
-            graphs.append(self.itemFromIndex(i).data(0, QtCore.Qt.UserRole))
+            graphs.append(self.itemFromIndex(i).data(0, QtCore.Qt.ItemDataRole.UserRole))
 
         if action == del_action:
             for gid in graphs:
                 self.management.delete_graph(gid)
 
+        elif action == copy_action:
+            for gid in graphs:
+                self.management.copy_graph(gid)
+
         elif action.parent() == col_menu:
             for gid in graphs:
                 self.management.set_cycle(self.management.graphs[gid].sets, action.text())
@@ -421,7 +464,7 @@ class DataTree(QtWidgets.QTreeWidget):
         del_action = menu.addAction('Exterminate sets')
         cp_action = menu.addAction('Replicate sets')
         cat_action = menu.addAction('Join us!')
-        plt_action = save_action = extend_action = None
+        plt_action = save_action = extend_action = subfit_action = None
         menu.addSeparator()
         col_menu = menu.addMenu('Color cycle')
         for c in available_cycles.keys():
@@ -439,12 +482,12 @@ class DataTree(QtWidgets.QTreeWidget):
                 continue
 
             else:
-                graph_id = parent.data(0, QtCore.Qt.UserRole)
+                graph_id = parent.data(0, QtCore.Qt.ItemDataRole.UserRole)
                 if graph_id not in idx:
                     idx[graph_id] = []
                 # collect sets in their graph
-                idx[graph_id].append(item.data(0, QtCore.Qt.UserRole))
+                idx[graph_id].append(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
-                data = self.management[item.data(0, QtCore.Qt.UserRole)]
+                data = self.management[item.data(0, QtCore.Qt.ItemDataRole.UserRole)]
                 if data.mode == 'fit':
                     has_fits = True
 
@@ -453,6 +496,7 @@ class DataTree(QtWidgets.QTreeWidget):
             plt_action = menu.addAction('Plot fit parameter')
             save_action = menu.addAction('Save fit parameter')
             extend_action = menu.addAction('Extrapolate fit')
+            subfit_action = menu.addAction('Plot partial functions')
 
         action = menu.exec(evt.globalPos())
 
@@ -460,6 +504,9 @@ class DataTree(QtWidgets.QTreeWidget):
         for gid, sets in idx.items():
             s.extend(sets)
 
+        if action is None:
+            return
+
         if action == del_action:
             self.management.delete_sets(s)
 
@@ -477,7 +524,10 @@ class DataTree(QtWidgets.QTreeWidget):
             self.saveFits.emit(s)
 
         elif action == extend_action:
-            self.extendFits.emit(s)
+            self.extendFits.emit(s, False)
+
+        elif action == subfit_action:
+            self.extendFits.emit(s, True)
 
         elif action.parent() == col_menu:
             self.management.set_cycle(s, action.text())
@@ -489,7 +539,7 @@ class DataTree(QtWidgets.QTreeWidget):
         while iterator.value():
             item = iterator.value()
             if item is not None:
-                if item.data(0, QtCore.Qt.UserRole) == gid:
+                if item.data(0, QtCore.Qt.ItemDataRole.UserRole) == gid:
                     item.setBackground(0, QtGui.QBrush(QtGui.QColor('gray')))
                 else:
                     item.setBackground(0, QtGui.QBrush())
@@ -498,11 +548,14 @@ class DataTree(QtWidgets.QTreeWidget):
     def uncheck_sets(self, sets: list[str]):
         self.blockSignals(True)
         iterator = QtWidgets.QTreeWidgetItemIterator(self)
+        self._checked_sets = set()
         while iterator.value():
             item = iterator.value()
             if item is not None:
-                if item.data(0, QtCore.Qt.UserRole) in sets:
+                if item.data(0, QtCore.Qt.ItemDataRole.UserRole) in sets:
-                    item.setCheckState(0, QtCore.Qt.Unchecked)
+                    item.setCheckState(0, QtCore.Qt.CheckState.Unchecked)
+                else:
+                    self._checked_sets.add(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
                 iterator += 1
         self.blockSignals(False)
 
@@ -519,6 +572,7 @@ class DataWidget(QtWidgets.QWidget, Ui_DataWidget):
         self.setupUi(self)
         self.tree = DataTree(self)
         self.verticalLayout.addWidget(self.tree)
+        # noinspection PyUnresolvedReferences
         self.tree.selectionModel().selectionChanged.connect(lambda x, y: self.show_property(x))
 
         self.tree.keyChanged.connect(lambda x, y: self.keyChanged.emit(x, y))
@@ -529,6 +583,8 @@ class DataWidget(QtWidgets.QWidget, Ui_DataWidget):
         self.propwidget.expansionChanged.connect(self.show_property)
         self.proptable.propertyChanged.connect(self.change_property)
 
+        self.pokemon_toolbutton.clicked.connect(self.catchthemall)
+
         make_action_icons(self)
 
     def add_graph(self, idd: str, name: str):
@@ -536,9 +592,9 @@ class DataWidget(QtWidgets.QWidget, Ui_DataWidget):
         self.tree.add_graph(idd, name)
         self.tree.blockSignals(False)
 
-    def add_item(self, idd: str, name: str, gid: str):
+    def add_item(self, idd: str, name: str, value: str, gid: str, update: bool= True):
         self.tree.blockSignals(True)
-        self.tree.add_item((idd, name), gid)
+        self.tree.add_item((idd, name, value), gid, update=update)
         self.tree.blockSignals(False)
 
     def add_item_list(self, loi: list, gid: str):
@@ -546,7 +602,7 @@ class DataWidget(QtWidgets.QWidget, Ui_DataWidget):
         self.tree.add_item(loi, gid)
         self.tree.blockSignals(False)
 
-    def remove_item(self, key):
+    def remove_item(self, key: list[str]):
         self.tree.remove_item(key)
 
     def show_property(self, _: QtCore.QModelIndex = None):
@@ -556,7 +612,7 @@ class DataWidget(QtWidgets.QWidget, Ui_DataWidget):
         sid = []
         for i in self.tree.selectedIndexes():
             if i.column() == 0:
-                sid.append(i.data(role=QtCore.Qt.UserRole))
+                sid.append(i.data(role=QtCore.Qt.ItemDataRole.UserRole))
 
         self.startShowProperty.emit(sid)
 
@@ -565,15 +621,23 @@ class DataWidget(QtWidgets.QWidget, Ui_DataWidget):
         self.proptable.populate(props)
 
     def change_property(self, key1, key2, value):
-        ids = [item.data(0, QtCore.Qt.UserRole) for item in self.tree.selectedItems()]
         if key2 == 'Value':
             try:
                 value = float(value)
             except ValueError:
-                QtWidgets.QMessageBox.warning(self, 'Invalid entry',
+                QtWidgets.QMessageBox.warning(
-                                              'Value %r is not a valid number for `value`.' % value)
+                    self,
+                    'Invalid entry',
+                    f'Value {value!r} is not a valid number for `value`.')
                 return
 
+            ids = []
+            for item in self.tree.selectedItems():
+                ids.append(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
+                item.setToolTip(0, str(value))
+        else:
+            ids = [item.data(0, QtCore.Qt.ItemDataRole.UserRole) for item in self.tree.selectedItems()]
+
         self.propertyChanged.emit(ids, key1, key2, value)
 
     def uncheck_sets(self, sets: list[str]):
@@ -582,6 +646,12 @@ class DataWidget(QtWidgets.QWidget, Ui_DataWidget):
     def set_name(self, sid, value):
         self.tree.set_name(sid, value)
 
+    def catchthemall(self):
+        from gui_qt.lib.pokemon import QPoke
+
+        dialog = QPoke( parent=self)
+        dialog.exec()
+
     @property
     def management(self):
         return self.tree.management

src/gui_qt/data/datawidget/properties.py

@@ -41,7 +41,7 @@ class PropWidget(QtWidgets.QWidget):
         idx = table.indexFromItem(item)
         self.propertyChanged.emit(self.tab.tabText(tab_idx),
                                   table.item(idx.row(), idx.column()-1).text(),
-                                  item.data(QtCore.Qt.DisplayRole))
+                                  item.data(QtCore.Qt.ItemDataRole.DisplayRole))
 
     @QtCore.pyqtSlot(int)
     def tab_change(self, idx: int):
@@ -57,8 +57,8 @@ class PropTable(QtWidgets.QTableWidget):
         self.horizontalHeader().setStretchLastSection(True)
         self.verticalHeader().setVisible(False)
         self.horizontalHeader().setVisible(False)
-        self.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
-        self.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
 
     def populate(self, prop: dict):
         self.clear()
@@ -66,10 +66,10 @@ class PropTable(QtWidgets.QTableWidget):
         self.blockSignals(True)
         for k, v in prop.items():
             value_item = QtWidgets.QTableWidgetItem('')
-            value_item.setData(QtCore.Qt.DisplayRole, v)
+            value_item.setData(QtCore.Qt.ItemDataRole.DisplayRole, v)
 
             key_item = QtWidgets.QTableWidgetItem(k)
-            key_item.setFlags(QtCore.Qt.NoItemFlags)
+            key_item.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
             key_item.setForeground(QtGui.QBrush(QtGui.QColor(0, 0, 0)))
 
             self.setRowCount(self.rowCount()+1)

src/gui_qt/data/integral_widget.py

@@ -1,7 +1,7 @@
 from itertools import cycle
 
 import pyqtgraph as pg
-from numpy import nanmax, nanmin, inf, argsort, where
+from numpy import nanmax, nanmin, inf
 
 from nmreval.lib.colors import Tab10
 from ..lib.pg_objects import PlotItem, RegionItem
@@ -42,6 +42,8 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
         self.max_y = inf
         self.min_y = -inf
 
+        self.treeWidget.itemChanged.connect(self._update_by_tree)
+
     def __call__(self, graph_name, items):
         self.label_2.setText(f'Connected to {graph_name}\nChanging tab will remove all integration limits.')
 
@@ -61,7 +63,7 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
         return self
 
     def keyPressEvent(self, e):
-        if e.key() == QtCore.Qt.Key_Delete:
+        if e.key() == QtCore.Qt.Key.Key_Delete:
             self.remove_integral()
         else:
             super().keyPressEvent(e)
@@ -77,7 +79,6 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
         for idx, rnge in enumerate(self.ranges):
             self._update_values(idx, rnge)
 
-
     def add(self, pos):
         x = pos[0]
         self.ranges.append((x, x*1.1))
@@ -108,7 +109,10 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
         item_list = []
         for text, val in [('Start', pts_i[0]), ('Stop', pts_i[1]), ('Areas', 0), ('Ratio', 1.)]:
             child = QtWidgets.QTreeWidgetItem()
-            child.setFlags(QtCore.Qt.NoItemFlags)
+            if text.startswith('S'):
+                child.setFlags(child.flags() | QtCore.Qt.ItemFlag.ItemIsEditable)
+            else:
+                child.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
             child.setText(0, f'{text}: {val:.5g}')
             child.setForeground(0, QtGui.QBrush(QtGui.QColor('black')))
 
@@ -121,8 +125,27 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
 
         self._update_values(len(self.ranges) - 1, pts_i)
 
+    def _update_by_tree(self, item: QtWidgets.QTreeWidgetItem) -> None:
+        parent_item = item.parent()
+        idx = self.treeWidget.invisibleRootItem().indexOfChild(parent_item)
+
+        is_left_border = parent_item.indexOfChild(item) == 0
+        current_region = self.lines[idx][0]
+        current_limits = current_region.getRegion()
+
+        new_value = item.text(0)
+        try:
+            new_value = float(new_value)
+            if is_left_border:
+                current_region.setRegion((new_value, current_limits[1]))
+            else:
+                current_region.setRegion((current_limits[0], new_value))
+        except ValueError:
+            self._update_values(idx, current_limits)
+
     def _update_integral(self):
         idx = None
+        reg = None
         sender = self.sender()
         for i, (reg, _) in enumerate(self.lines):
             if sender == reg:
@@ -132,19 +155,20 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
         if idx is None:
             return
 
-        self._update_values(idx, sender.getRegion())
+        self._update_values(idx, reg.getRegion())
 
     def _update_values(self, idx, new_range):
         self.ranges[idx] = new_range
 
         area = self.make_integral(idx, *new_range)
 
+        self.treeWidget.blockSignals(True)
+
         item = self.treeWidget.topLevelItem(idx)
         item.child(0).setText(0, f'Start: {new_range[0]:.5g}')
         item.child(1).setText(0, f'Stop: {new_range[1]:.5g}')
 
         if area is not None:
-            self.areas[idx] = area
             item.child(2).setText(0, f'Area: {area:.5g}')
             if self.max_area > 0:
                 self._set_ratios(idx, self.max_area)
@@ -157,9 +181,12 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
                     self._set_ratios(i, curr_max)
             self.max_area = curr_max
 
+        self.treeWidget.blockSignals(False)
+
     def _set_ratios(self, idx, max_value):
         item = self.treeWidget.invisibleRootItem().child(idx)
         area_i = self.areas[idx]
+
         item.child(3).setText(0, f'Ratio: {area_i / max_value:.3g}')
 
         integral_line = self.lines[idx][1]
@@ -176,7 +203,9 @@ class IntegralWidget(QtWidgets.QWidget, Ui_Form):
         if integral.size != 0:
             area = integral[-1, 1]
             scale = (self.max_y-self.min_y) / area
-            self.lines[idx][1].setData(x=integral[:, 0], y=integral[:, 1]*scale  + self.min_y)
+            self.lines[idx][1].setData(x=integral[:, 0], y=integral[:, 1]*scale + self.min_y)
+
+            self.areas[idx] = area
 
             return area
 

src/gui_qt/data/point_select.py

@@ -33,9 +33,9 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
         self.peaktable.itemDoubleClicked.connect(self.editing_started)
 
     def keyPressEvent(self, e):
-        if e.key() == QtCore.Qt.Key_Delete:
+        if e.key() == QtCore.Qt.Key.Key_Delete:
             self.remove_points()
-        elif e.key() == QtCore.Qt.Key_F2:
+        elif e.key() == QtCore.Qt.Key.Key_F2:
             self.editing_started()
         else:
             super().keyPressEvent(e)
@@ -91,7 +91,7 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
             item = QtWidgets.QListWidgetItem(f'{self.pts[-1][0]:.5g} - {self.pts[-1][1]:.5g}')
         else:
             item = QtWidgets.QListWidgetItem(f'{self.pts[-1]:.5g}')
-        item.setFlags(item.flags() ^ QtCore.Qt.ItemIsEditable)
+        item.setFlags(item.flags() ^ QtCore.Qt.ItemFlag.ItemIsEditable)
         self.peaktable.blockSignals(True)
         self.peaktable.addItem(item)
         self.peaktable.blockSignals(False)
@@ -103,7 +103,7 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
     @QtCore.pyqtSlot()
     def apply(self) -> dict:
         ret_dic = {'avg_range': [self.left_pt.value(), self.right_pt.value()],
-                   'avg_mode': {0: 'mean', 1: 'sum', 2: 'integral'}[self.average_combobox.currentIndex()],
+                   'avg_mode': {0: 'mean', 1: 'sum', 2: 'integral', 3: 'std'}[self.average_combobox.currentIndex()],
                    'special': None, 'idx': None,
                    'xy': (self.xbutton.isChecked(), self.ybutton.isChecked())}
 
@@ -177,7 +177,7 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
                     it.setText(f'{pos[0]:.5g} - {pos[1]:.5g}')
                     self.peaktable.blockSignals(False)
                     it_pts.blockSignals(True)
-                    it_pts.setRegion(pos)
+                    it_pts.setRegion(pos, use_log=True)
                     it_pts.blockSignals(False)
                 undo = False
 
@@ -187,10 +187,16 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
             self.peaktable.blockSignals(False)
 
     def set_graphs(self, graphs: list):
+        last_graph = self.graph_combobox.currentData()
         self.graph_combobox.clear()
-        for g in graphs:
+        idx = 0
+        for i, g in enumerate(graphs):
             self.graph_combobox.addItem(g[1], userData=g[0])
+            if g[0] == last_graph:
+                idx = i
+
+        self.graph_combobox.setCurrentIndex(idx)
 
     @QtCore.pyqtSlot(int, name='on_graph_checkbox_stateChanged')
     def changed_state(self, checked):
-        self.graph_combobox.setEnabled(checked!=QtCore.Qt.Checked)
+        self.graph_combobox.setEnabled(checked != QtCore.Qt.CheckState.Checked)

src/gui_qt/data/shift_graphs.py

@@ -1,7 +1,7 @@
 import numpy as np
 from itertools import cycle
 
-from pyqtgraph import mkColor, mkPen
+from pyqtgraph import mkColor, mkPen, mkBrush
 
 from nmreval.lib.colors import Tab10
 
@@ -42,11 +42,17 @@ class QShift(QtWidgets.QDialog, Ui_shift_dialog):
 
     def add_item(self, idx, name, x, y):
         color = mkColor(next(self._colors).rgb())
-        if np.iscomplexobj(y):
+
-            pl = [PlotItem(x=x, y=y.real, name=name, pen=mkPen(color=color)),
+        if len(y) == 1:
-                  PlotItem(x=x, y=y.imag, name=name, pen=mkPen(color=color))]
+            sym_kwds = {'symbol': 'o', 'symbolBrush': mkBrush(color=color), 'symbolPen': mkPen(color=color)}
         else:
-            pl = [PlotItem(x=x, y=y, name=name, pen=mkPen(color=color))]
+            sym_kwds = {'symbol': None, 'symbolBrush': mkBrush(color=color), 'symbolPen': mkPen(color=color)}
+
+        if np.iscomplexobj(y):
+            pl = [PlotItem(x=x, y=y.real, name=name, pen=mkPen(color=color), **sym_kwds),
+                  PlotItem(x=x, y=y.imag, name=name, pen=mkPen(color=color), **sym_kwds)]
+        else:
+            pl = [PlotItem(x=x, y=y, name=name, pen=mkPen(color=color), **sym_kwds)]
 
         self.data[idx] = (pl, x, y)
 
@@ -60,9 +66,9 @@ class QShift(QtWidgets.QDialog, Ui_shift_dialog):
 
             item = QtWidgets.QTableWidgetItem(name)
             item.setForeground(QtGui.QBrush(color))
-            item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsUserCheckable | QtCore.Qt.ItemIsEnabled)
+            item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsUserCheckable | QtCore.Qt.ItemFlag.ItemIsEnabled)
-            item.setCheckState(QtCore.Qt.Checked)
+            item.setCheckState(QtCore.Qt.CheckState.Checked)
-            item.setData(QtCore.Qt.UserRole, idx)
+            item.setData(QtCore.Qt.ItemDataRole.UserRole, idx)
             tw.setItem(row, 0, item)
 
             tw.setItem(row, 1, QtWidgets.QTableWidgetItem(str(i)))
@@ -79,7 +85,7 @@ class QShift(QtWidgets.QDialog, Ui_shift_dialog):
 
     def glob_shift_scale(self, widget: QtWidgets.QTableWidget, mode: int, col: int, value: float):
         for row in range(widget.rowCount()):
-            if widget.item(row, 0).checkState() == QtCore.Qt.Checked:
+            if widget.item(row, 0).checkState() == QtCore.Qt.CheckState.Checked:
                 item = widget.item(row, col)
                 item.setText(str(value))
                 self.shift_scale(widget, mode, row, col-1, value)
@@ -103,7 +109,7 @@ class QShift(QtWidgets.QDialog, Ui_shift_dialog):
     def shift_scale(self, widget: QtWidgets.QTableWidget, mode: int,
                     row: int, col: int, value: float):
         item = widget.item(row, 0)
-        key = item.data(QtCore.Qt.UserRole)
+        key = item.data(QtCore.Qt.ItemDataRole.UserRole)
         self.movements[key][mode][col] = value
 
         (x_off, y_off), (x_scale, y_scale) = self.movements[key]
@@ -140,18 +146,18 @@ class QShift(QtWidgets.QDialog, Ui_shift_dialog):
         self.graphicsView.enableAutoRange()
 
     def on_overwrite_checkbox_stateChanged(self, state: int):
-        self.data_newgraph.setVisible(state != QtCore.Qt.Checked)
+        self.data_newgraph.setVisible(state != QtCore.Qt.CheckState.Checked)
-        self.data_combobox.setVisible(state != QtCore.Qt.Checked)
+        self.data_combobox.setVisible(state != QtCore.Qt.CheckState.Checked)
 
     def on_value_checkbox_stateChanged(self, state: int):
-        self.values_newgraph.setVisible(state == QtCore.Qt.Checked)
+        self.values_newgraph.setVisible(state == QtCore.Qt.CheckState.Checked)
-        self.values_combobox.setVisible(state == QtCore.Qt.Checked)
+        self.values_combobox.setVisible(state == QtCore.Qt.CheckState.Checked)
 
     def on_data_newgraph_stateChanged(self, state: int):
-        self.data_combobox.setEnabled(state != QtCore.Qt.Checked)
+        self.data_combobox.setEnabled(state != QtCore.Qt.CheckState.Checked)
 
     def on_values_newgraph_stateChanged(self, state: int):
-        self.values_combobox.setEnabled(state != QtCore.Qt.Checked)
+        self.values_combobox.setEnabled(state != QtCore.Qt.CheckState.Checked)
 
     def accept(self):
         data_saving = None

src/gui_qt/data/signaledit/__init__.py

@@ -1,2 +1,2 @@
-from .phase_dialog import QApodDialog, QPhasedialog
+from .phase_dialog import QPreviewDialog
 from .baseline_dialog import QBaselineDialog

src/gui_qt/data/signaledit/baseline_dialog.py

@@ -82,7 +82,7 @@ class QBaselineDialog(QtWidgets.QDialog, Ui_SignalEdit):
             self.graph_corr.setData(x=x, y=y.real-bl)
 
     def keyPressEvent(self, evt):
-        if self.listWidget.hasFocus() and evt.key() == QtCore.Qt.Key_Delete:
+        if self.listWidget.hasFocus() and evt.key() == QtCore.Qt.Key.Key_Delete:
             r = self.listWidget.currentRow()
             self.anchors.pop(r+1)
             listitem = self.listWidget.takeItem(r)

src/gui_qt/data/signaledit/editsignalwidget.py

@@ -1,3 +1,4 @@
+from nmreval.lib.logger import logger
 from nmreval.math import apodization
 from nmreval.lib.importer import find_models
 from nmreval.utils.text import convert
@@ -46,7 +47,7 @@ class EditSignalWidget(QtWidgets.QWidget, Ui_Form):
                 stype = 'pts'
             else:
                 try:
-                    _nop = float(self.lineEdit.text())
+                    _nop = float(self.ls_lineEdit.text())
                 except ValueError:
                     _nop = 0.0
                 stype = 'time'
@@ -67,7 +68,7 @@ class EditSignalWidget(QtWidgets.QWidget, Ui_Form):
                 self.do_something.emit(sender, (ph0, ph1, pvt))
 
         else:
-            print('You should never reach this by accident.')
+            logger.warning(f'You should never reach this by accident, invalid sender {sender!r}')
 
     @QtCore.pyqtSlot(int, name='on_apodcombobox_currentIndexChanged')
     def change_apodization(self, index):

src/gui_qt/data/signaledit/phase_dialog.py

@@ -1,119 +1,43 @@
 from __future__ import annotations
 
-import numpy as np
 from pyqtgraph import mkPen
-from numpy import inf, linspace
+import numpy as np
-from numpy.fft import fft, fftfreq, fftshift
+from numpy import pi
+from numpy.fft import fft, fftshift, fftfreq
 
+from nmreval.data import FID, Spectrum
 from ...lib.pg_objects import PlotItem, LogInfiniteLine
 from nmreval.lib.importer import find_models
 from nmreval.math import apodization as apodization
 from nmreval.utils.text import convert
 
-from ...Qt import QtCore, QtWidgets
+from ...Qt import QtCore, QtWidgets, QtGui
 from ..._py.apod_dialog import Ui_ApodEdit
-from ..._py.phase_corr_dialog import Ui_SignalEdit
 from ...lib.forms import FormWidget
 
 
-class QPreviewDialogs(QtWidgets.QDialog):
+class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
     finished = QtCore.pyqtSignal(str, tuple)
 
     def __init__(self, parent=None):
         super().__init__(parent=parent)
 
-        self.data = []
-        self.graphs = []
-
-        self.mode = ''
-
-    def setRange(self, xlim: list, ylim: list, logmode: list[bool]):
-        self.graphicsView.getPlotItem().setLogMode(x=logmode[0], y=logmode[1])
-        if logmode[0]:
-            xlim = [np.log10(x) for x in xlim]
-        if logmode[1]:
-            ylim = [np.log10(y) for y in ylim]
-
-        self.graphicsView.setRange(xRange=xlim, yRange=ylim, padding=0, disableAutoRange=True)
-
-    def add_data(self, x, y):
-        self.data.append((x, y))
-        real_plt = PlotItem(x=x, y=y.real, pen=mkPen('b'), )
-        imag_plt = PlotItem(x=x, y=y.imag, pen=mkPen('r'))
-        self.graphs.append((real_plt, imag_plt))
-        self.graphicsView.addItem(real_plt)
-        self.graphicsView.addItem(imag_plt)
-
-    def done(self, val):
-        self.cleanup()
-        super().done(val)
-
-    def close(self):
-        self.cleanup()
-        super().close()
-
-    def accept(self):
-        self.finished.emit(self.mode, self.get_value())
-        super().accept()
-
-    def get_value(self):
-        raise NotImplementedError
-
-    def cleanup(self):
-        self.blockSignals(True)
-
-        for line in self.graphs:
-            for g in line:
-                self.graphicsView.removeItem(g)
-                del g
-
-        self.graphicsView.clear()
-
-        self.data = []
-        self.graphs = []
-
-        self.blockSignals(False)
-
-
-class QPhasedialog(QPreviewDialogs, Ui_SignalEdit):
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
         self.setupUi(self)
 
-        self.mode = 'ph'
+        self.data = []
+        self.graphs = []
+        self._tmp_data_bl = []
+        self._tmp_data_zf = []
+        self._tmp_data_ls = []
+        self._tmp_data_ap = []
+        self._tmp_data_ph = []
 
         self.pvt_line = LogInfiniteLine(pos=0, movable=True)
-        self.graphicsView.addItem(self.pvt_line)
+        self.freq_graph.addItem(self.pvt_line)
         self.pvt_line.sigPositionChanged.connect(self.move_line)
 
-    @QtCore.pyqtSlot(float, name='on_ph1slider_valueChanged')
+        self.ls_lineedit.hide()
-    @QtCore.pyqtSlot(float, name='on_ph0slider_valueChanged')
-    def _temp_phase(self, *args):
-        ph0, ph1, pvt = self.get_value()
-        self.pvt_line.setValue(pvt)
 
-        for i, (x, y) in enumerate(self.data):
-            phasecorr = np.exp(-1j * (ph0 + ph1*(x-pvt)/np.max(x))*np.pi/180.)
-            _y = y * phasecorr
-
-            self.graphs[i][0].setData(x=x, y=_y.real)
-            self.graphs[i][1].setData(x=x, y=_y.imag)
-
-    def get_value(self):
-        return float(self.ph0slider.text()), float(self.ph1slider.text()), float(self.pivot_lineedit.text())
-
-    def move_line(self, evt):
-        self.pivot_lineedit.setText(f'{evt.value():.5g}')
-
-
-class QApodDialog(QPreviewDialogs, Ui_ApodEdit):
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
-        self.setupUi(self)
-
-        self._limits = (-inf, inf), -inf
-
-        self.apods = []
         self.apods = find_models(apodization)
 
         self.apodcombobox.blockSignals(True)
@@ -122,72 +46,288 @@ class QApodDialog(QPreviewDialogs, Ui_ApodEdit):
         self.apodcombobox.blockSignals(False)
 
         self.apod_graph = PlotItem(x=[], y=[])
-        self.graphicsView.addItem(self.apod_graph)
+        self.time_graph.addItem(self.apod_graph)
 
-        self.mode = 'ap'
+        for g in [self.freq_graph, self.time_graph]:
+            pl = g.getPlotItem()
+            pl.hideButtons()
+            pl.setMenuEnabled(False)
+
+        self._all_time = None
+        self._all_freq = None
 
         self.change_apodization(0)
 
-    def add_data(self, x, y):
+        self.shift_box.clicked.connect(self._update_shift)
-        real_plt = PlotItem(x=x, y=y.real, pen=mkPen('b'))
+        self.ls_spinbox.valueChanged.connect(self._update_shift)
-        # imag_plt = (x=x, y=y.imag, pen=pg.mkPen('r'))
+        self.ls_lineedit.setValidator(QtGui.QDoubleValidator())
-        self.graphicsView.addItem(real_plt)
+        self.ls_lineedit.textChanged.connect(self._update_shift)
-        # self.graphicsView.addItem(imag_plt)
 
+        self.zerofill_box.clicked.connect(self._update_zf)
+        self.zf_spinbox.valueChanged.connect(self._update_zf)
+
+        self.apod_box.clicked.connect(self._update_apod)
+
+        self.phase_box.clicked.connect(self._update_phase)
+        self.ph0_spinbox.valueChanged.connect(self._update_phase)
+        self.ph1_spinbox.valueChanged.connect(self._update_phase)
+        self.pivot_lineedit.setValidator(QtGui.QDoubleValidator())
+        self.pivot_lineedit.textChanged.connect(self._update_phase)
+        self.pivot_lineedit.textEdited.connect(lambda x: self.pvt_line.setValue(float(x)))
+
+    def add_data(self: QPreviewDialog, data: FID | Spectrum) -> bool:
+        if isinstance(data, FID):
+            valid, (real_plt, imag_plt, real_plt_fft, imag_plt_fft) = self._prep_time(data)
+
+        elif isinstance(data, Spectrum):
+            valid, (real_plt, imag_plt, real_plt_fft, imag_plt_fft) = self._prep_freq(data)
+
+        else:
+            return False
+
+        if not valid:
+            return False
+
+        x_len = data.x.size
+        self.zf_spinbox.setMaximum(min(2**17//x_len, 3))
+
+        self.time_graph.addItem(imag_plt)
+        self.time_graph.addItem(real_plt)
+
+        self.freq_graph.addItem(imag_plt_fft)
+        self.freq_graph.addItem(real_plt_fft)
+
+        self.data.append(data)
+        for p in [self._tmp_data_bl, self._tmp_data_ls]:
+            p.append(data.y.copy())
+
+        for p in [self._tmp_data_zf, self._tmp_data_ap]:
+            p.append((data.x, data.y.copy()))
+
+        self.graphs.append((real_plt, imag_plt, real_plt_fft, imag_plt_fft))
+
+        return True
+
+    def _prep_time(self, data) -> tuple[bool, tuple]:
+        if self._all_freq:
+            _ = QtWidgets.QMessageBox.warning(self, 'Mixed types',
+                                              'Time signals and spectra cannot be edited at the same time.')
+            return False, tuple()
+
+        fid = data.copy()
+        spec = self._temp_fft_time(fid.x, fid.y, self.baseline_box.isChecked())
+        self._all_time = True
+        self._all_freq = False
+
+        real_plt = PlotItem(x=fid.x, y=fid.y.real, pen=mkPen('b'))
+        imag_plt = PlotItem(x=fid.x, y=fid.y.imag, pen=mkPen('r'))
+
+        real_plt_fft = PlotItem(x=spec[0], y=spec[1].real, pen=mkPen('b'))
+        imag_plt_fft = PlotItem(x=spec[0], y=spec[1].imag, pen=mkPen('r'))
+
+        self._tmp_data_ph.append((data.x, data.y, spec[0], spec[1]))
+
+        return True, (real_plt, imag_plt, real_plt_fft, imag_plt_fft)
+
+    def _prep_freq(self, data) -> tuple[bool, tuple]:
+        if self._all_time:
+            _ = QtWidgets.QMessageBox.warning(self, 'Mixed types',
+                                                  'Time signals and spectra cannot be edited at the same time.')
+            return False, tuple()
+
+        spec = data.copy()
+        fid = self._temp_fft_time(spec.x, spec.y, self.baseline_box.isChecked())
+        self._all_time = False
+        self._all_freq = True
+
+        real_plt = PlotItem(x=fid[0], y=fid[1].real, pen=mkPen('b'))
+        imag_plt = PlotItem(x=fid[0], y=fid[1].imag, pen=mkPen('r'))
+
+        real_plt_fft = PlotItem(x=spec.x, y=spec.y.real, pen=mkPen('b'))
+        imag_plt_fft = PlotItem(x=spec.x, y=spec.y.imag, pen=mkPen('r'))
+
+        self._tmp_data_ph.append((data.x, data.y, spec.x, spec.y))
+
+        return True, (real_plt, imag_plt, real_plt_fft, imag_plt_fft)
+
+    @QtCore.pyqtSlot(name='on_baseline_box_clicked')
+    def _update_bl(self):
+        if self.baseline_box.isChecked():
+            for y in self._tmp_data_bl:
+                self._temp_baseline(y)
+        else:
+            for i, d in enumerate(self.data):
+                self._tmp_data_bl[i] = d.y.copy()
+
+        self._update_shift()
+
+    def _update_shift(self):
+        if self.shift_box.isChecked():
+            if self.ls_combobox.currentIndex() == 0:
+                num_points = self.ls_spinbox.value()
+                is_time = False
+            else:
+                num_points = float(self.ls_lineedit.text())
+                is_time = True
+
+            for i, y in enumerate(self._tmp_data_bl):
+                self._tmp_data_ls[i] = self._temp_leftshift(self.data[i].dx, y, num_points, is_time)
+
+        else:
+            for i, y in enumerate(self._tmp_data_bl):
+                self._tmp_data_ls[i] = y
+
+        self._update_zf()
+
+    def _update_zf(self):
+        zf_padding = self.zf_spinbox.value()
+
+        if self.zerofill_box.isChecked():
+            for i, y in enumerate(self._tmp_data_ls):
+                self._tmp_data_zf[i] = self._temp_zerofill(self.data[i].x, y, zf_padding)
+
+        else:
+            for i, y in enumerate(self._tmp_data_ls):
+                self._tmp_data_zf[i] = self.data[i].x, y
+
+        self._update_apod()
+
+    def _update_apod(self):
+        if self.apod_box.isChecked():
+            model = self.apods[self.apodcombobox.currentIndex()]
+            p = self._get_parameter()
+
+            x_limit = np.inf, -np.inf
+            y_limit = -np.inf
+
+            for i, (x, y) in enumerate(self._tmp_data_zf):
+                self._tmp_data_ap[i] = x, y * model.apod(x, *p)
+                y_limit = max(y.real.max(), y_limit)
+                x_limit = min(x_limit[0], x.min()), max(x_limit[1], x.max())
+
+            _x_apod = np.linspace(*x_limit, num=150)
+            _y_apod = model.apod(_x_apod, *p)
+            self.apod_graph.setData(x=_x_apod, y=y_limit * _y_apod)
+            self.apod_graph.show()
+
+        else:
+            for i, (x, y) in enumerate(self._tmp_data_zf):
+                self._tmp_data_ap[i] = x, y
+
+            self.apod_graph.hide()
+
+        self._update_phase()
+
+    def _update_phase(self):
+        if self.phase_box.isChecked():
+            pvt = float(self.pivot_lineedit.text())
+            self.pvt_line.show()
+            ph0 = self.ph0_spinbox.value()
+            ph1 = self.ph1_spinbox.value()
+
+            for i, (x, y) in enumerate(self._tmp_data_ap):
+                x_fft, y_fft = self._temp_fft(x, y, self.baseline_box.isChecked())
+
+                if ph0 != 0:
+                    y = self._temp_phase(x, y, ph0, 0, 0)
+                    y_fft = self._temp_phase(x, y_fft, ph0, ph1, pvt)
+                elif ph1 != 0:
+                    y_fft = self._temp_phase(x, y_fft, ph0, ph1, pvt)
+
+                self._tmp_data_ph[i] = x, y, x_fft, y_fft
+
+        else:
+            self.pvt_line.hide()
+            for i, (x, y) in enumerate(self._tmp_data_ap):
+                self._tmp_data_ph[i] = x, y, *self._temp_fft(x, y, self.baseline_box.isChecked())
+
+        self._update_plots()
+
+    def _update_plots(self):
+        for i, (x, y, xf, yf) in enumerate(self._tmp_data_ph):
+            self.graphs[i][0].setData(x=x, y=y.real)
+            self.graphs[i][1].setData(x=x, y=y.imag)
+
+            self.graphs[i][2].setData(x=xf, y=yf.real)
+            self.graphs[i][3].setData(x=xf, y=yf.imag)
+
+    @staticmethod
+    def _temp_baseline_time(y):
+        y -= y[int(-0.12 * y.size):].mean()
+
+    @staticmethod
+    def _temp_baseline_freq(y):
+        region = int(0.12 * y.size)
+        y -= np.mean([y[-region:], y[:region]])
+
+    @staticmethod
+    def _temp_phase(x: np.ndarray, y: np.ndarray, ph0: float, ph1: float, pvt: float) -> np.ndarray:
+        phase_correction = np.exp(-1j * (ph0 + ph1 * (x - pvt) / x.max()) * pi / 180.)
+        _y = y * phase_correction
+
+        return _y
+
+    @staticmethod
+    def _temp_zerofill(x: np.ndarray, y: np.ndarray, num_padding: int) -> tuple[np.ndarray, np.ndarray]:
+        length = x.size
+        factor = 2**num_padding
+
+        _y = np.r_[y, np.zeros((factor-1) * length)]
+
+        _temp_x = np.arange(1,  (factor-1) * length+1) * (x[1]-x[0]) + np.max(x)
+        _x = np.r_[x, _temp_x]
+
+        return _x, _y
+
+    @staticmethod
+    def _temp_leftshift(dx: np.ndarray, y: np.ndarray, points: float | int, is_time: bool) -> np.ndarray:
+        if is_time:
+            points = int(points//dx)
+        _y = np.roll(y, -points)
+        _y[-points-1:] = 0
+
+        return _y
+
+    @staticmethod
+    def _temp_fft_time(x: np.ndarray, y: np.ndarray, baseline: bool = False) -> tuple[np.ndarray, np.ndarray]:
         y_fft = fftshift(fft(y))
         x_fft = fftshift(fftfreq(len(x), d=x[1]-x[0]))
-        real_plt_fft = PlotItem(x=x_fft, y=y_fft.real, pen=mkPen('b'))
-        # imag_plt_fft = pg.PlotDataItem(x=x_fft, y=y_fft.imag, pen=pg.mkPen('b'))
-        self.graphicsView_2.addItem(real_plt_fft)
-        # self.graphicsView_2.addItem(imag_plt_fft)
 
-        self.graphs.append((real_plt, real_plt_fft))
+        if baseline:
-        self.data.append((x, y, x_fft))
+            QPreviewDialog._temp_baseline_freq(y_fft)
 
-        xlimits = (max(x.min(), self._limits[0][0]), min(x.max(), self._limits[0][1]))
+        return x_fft, y_fft
-        ylimit = max(self._limits[1], y.real.max())
+
-        self._limits = xlimits, ylimit
+    @staticmethod
+    def _temp_fft_freq(x: np.ndarray, y: np.ndarray, _=None):
+        return x, y
+
+    def move_line(self, evt):
+        self.pivot_lineedit.setText(f'{evt.value():.5g}')
 
     @QtCore.pyqtSlot(int, name='on_apodcombobox_currentIndexChanged')
-    def change_apodization(self, index):
+    def change_apodization(self, index: int) -> None:
         # delete old widgets
         self.eqn_label.setText(convert(self.apods[index].equation))
         while self.widget_layout.count():
             item = self.widget_layout.takeAt(0)
+            if isinstance(item, FormWidget):
+                item.disconnect()
+
             try:
                 item.widget().deleteLater()
             except AttributeError:
                 pass
 
         # set up parameter widgets for new model
-        for k, v in enumerate(self.apods[index]().params):
+        for k, v in enumerate(self.apods[index].params):
-            widgt = FormWidget(name=v)
+            widget = FormWidget(name=v)
-            widgt.valueChanged.connect(self._temp_apod)
+            widget.value = 1
-            self.widget_layout.addWidget(widgt)
+            widget.valueChanged.connect(self._update_apod)
+            self.widget_layout.addWidget(widget)
 
         self.widget_layout.addStretch()
-        self._temp_apod()
+        self._update_apod()
-
-    def _temp_apod(self):
-        apodmodel = self.apods[self.apodcombobox.currentIndex()]
-        p = self._get_parameter()
-
-        if self.data:
-            for i, (x, y, x_fft) in enumerate(self.data):
-                y2 = apodmodel.apod(x, *p)
-                _y = y2 * y
-                self.graphs[i][0].setData(x=x, y=_y.real)
-                # self.graphs[i][1].setData(y=_y.imag)
-                y_fft = fftshift(fft(_y))
-                self.graphs[i][1].setData(x=x_fft, y=y_fft.real)
-                # self.graphs[i][3].setData(y=y_fft.imag)
-
-        _x_apod = linspace(self._limits[0][0], self._limits[0][1])
-        try:
-            _y_apod = apodmodel.apod(_x_apod, *p)
-            self.apod_graph.setData(x=_x_apod, y=self._limits[1]*_y_apod)
-        except IndexError:
-            pass
 
     def _get_parameter(self):
         p = []
@@ -201,8 +341,104 @@ class QApodDialog(QPreviewDialogs, Ui_ApodEdit):
 
         return p
 
-    def get_value(self):
+    @QtCore.pyqtSlot(int, name='on_ls_combobox_currentIndexChanged')
-        apodmodel = self.apods[self.apodcombobox.currentIndex()]
+    def change_ls(self, idx: int) -> None:
-        p = self._get_parameter()
+        self.ls_lineedit.setVisible(bool(idx))
+        self.ls_spinbox.setVisible(not bool(idx))
+
+    @QtCore.pyqtSlot(bool, name='on_ft_checkbox_stateChanged')
+    def change_ft(self, state: bool):
+        self.ph1_spinbox.setEnabled(state)
+        self.pivot_lineedit.setEnabled(state)
+
+    def cleanup(self):
+        self.blockSignals(True)
+
+        for line in self.graphs:
+            for g in line:
+                self.time_graph.removeItem(g)
+                self.freq_graph.removeItem(g)
+                del g
+
+        self.time_graph.clear()
+        self.freq_graph.clear()
+
+        self._tmp_data_ap = []
+        self._tmp_data_bl = []
+        self._tmp_data_ls = []
+        self._tmp_data_ph = []
+        self._tmp_data_zf = []
+
+        self.data = []
+        self.graphs = []
+        self.freq_graph.removeItem(self.pvt_line)
+
+        self.blockSignals(False)
+
+    def get_value(self):
+        edits = [(None,), (None,), (None,), (None,), (None,), (None,)]
+
+        if self.baseline_box.isChecked():
+            edits[0] = (True,)
+
+        if self.zerofill_box.isChecked():
+            edits[2] = (self.zf_spinbox.value(),)
+
+        if self.shift_box.isChecked():
+            if self.ls_combobox.currentIndex() == 0:
+                edits[1] = (self.ls_spinbox.value(), 'pts')
+            else:
+                edits[1] = (float(self.ls_lineedit.text()), 'time')
+
+        if self.apod_box.isChecked():
+            edits[3] = (self._get_parameter(), self.apods[self.apodcombobox.currentIndex()])
+
+        if self.phase_box.isChecked():
+            edits[4] = (self.ph0_spinbox.value(),  self.ph1_spinbox.value(), float(self.pivot_lineedit.text()))
+
+        if self.ft_box.isChecked():
+            edits[5] = (self.phase_before_button.isChecked(),)
+
+        return edits
+
+    def exec(self):
+        self._prepare_ui()
+        return super().exec()
+
+    def _prepare_ui(self):
+        """Stuff we have to do before showing the window but after all the data was added"""
+
+        vb = self.freq_graph.getPlotItem().getViewBox()
+        vb.disableAutoRange(axis=vb.YAxis)
+
+        vb = self.time_graph.getPlotItem().getViewBox()
+        vb.disableAutoRange(axis=vb.YAxis)
+        if self._all_time is not None:
+            self.zerofill_box.setVisible(self._all_time)
+            self.apod_box.setVisible(self._all_time)
+            self.shift_box.setVisible(self._all_time)
+            self.time_graph.setVisible(self._all_time)
+            self.logtime_widget.setVisible(self._all_time)
+
+        self._temp_baseline = self._temp_baseline_time if self._all_time else self._temp_baseline_freq
+        self._temp_fft = self._temp_fft_time if self._all_time else self._temp_fft_freq
+
+    @QtCore.pyqtSlot(int, name='on_logx_time_stateChanged')
+    @QtCore.pyqtSlot(int, name='on_logy_time_stateChanged')
+    @QtCore.pyqtSlot(int, name='on_logx_freq_stateChanged')
+    @QtCore.pyqtSlot(int, name='on_logy_freq_stateChanged')
+    def set_log(self, state: int):
+        switch = {
+            self.logx_time: lambda _x: self.time_graph.setLogMode(x=_x),
+            self.logy_time: lambda _x: self.time_graph.setLogMode(y=_x),
+            self.logx_freq: lambda _x: self.freq_graph.setLogMode(x=_x),
+            self.logy_freq: lambda _x: self.freq_graph.setLogMode(y=_x),
+        }[self.sender()]
+        switch(state == QtCore.Qt.CheckState.Checked)
+
+        vb = self.freq_graph.getPlotItem().getViewBox()
+        vb.disableAutoRange(axis=vb.YAxis)
+
+        vb = self.time_graph.getPlotItem().getViewBox()
+        vb.disableAutoRange(axis=vb.YAxis)
 
-        return p, apodmodel