now with proper package building

.gitea/ISSUE_TEMPLATE/BUG_TEMPLATE.yml

@@ -1,51 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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 }}

bin/evaluate.py

@@ -1,61 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import pathlib
-import os
-sys.path.append(str(pathlib.Path(__file__).absolute().parent.parent / 'src'))
-
-from nmreval.configs import check_for_config
-
-# does a directory for config stuff exist? create it if not
-check_for_config()
-
-# pyqtgraph warns on Mac if QApplication is created when it is imported
-# import pyqtgraph
-
-from nmreval.lib.logger import handle_exception
-sys.excepthook = handle_exception
-
-from gui_qt import App
-from gui_qt.Qt import QtCore
-
-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.show()
-
-sys.exit(app.exec())

pyproject.toml

@@ -1,54 +1,53 @@
-[metadata]
+[build-system]
-name = nmreval
+requires = ["setuptools", "wheel", "setuptools-scm"]
-version = 0.1
+build-backend = "setuptools.build_meta"
-description = Evaluation of data
+
-long_description = file: README.md
+[project]
-author = Dominik Demuth
+name = "nmreval"
-author_email = dominik.demuth@physik.tu-darmstadt.de
+version = "0.1"
-install_requires = [
+description = "Evaluation of NMR and orther data"
-   'numpy',
+authors = [
-   'scipy',
+   { name = "Dominik Demuth", email = "dominik.demuth@pkm.tu-darmstadt.de" },
-   'matplotlib',
-   'bsddb3',
-   'pyqtgraph',
-   'pyqt',
-   'h5py',
 ]
-keywords = ['nmr', 'physics', 'science']
+maintainers = [
+   { name = "Dominik Demuth", email = "dominik.demuth@pkm.tu-darmstadt.de" },
+]
+requires-python = ">=3.7"
 classifiers = [
-   'Development Status :: 3 - Alpha',
+   "Development Status :: 3 - Alpha",
-   'Intended Audience :: End Users/Desktop',
+   "Intended Audience :: Science/Research",
-   'Intended Audience :: Science/Research',
+   "Topic :: Scientific/Engineering :: Physics",
-   'Topic :: Scientific/Engineering :: Physics',
+   "License :: OSI Approved :: BSD License",
-   'Topic :: Scientific/Engineering :: Visualization',
+   "Programming Language :: Python :: 3",
-   'Programming Language :: Python :: 3',
+   "Programming Language :: Python :: 3.7",
-   'Programming Language :: Python :: 3.7',
+   "Programming Language :: Python :: 3.8",
-   'Programming Language :: Python :: 3.8',
+   "Programming Language :: Python :: 3.9",
-   'Programming Language :: Python :: 3.9',
+   "Programming Language :: Python :: 3.10",
-   'Programming Language :: Python :: 3.10',
+   "Programming Language :: Python :: 3.10",
-   'Programming Language :: Python :: 3 :: only',
+   "Programming Language :: Python :: 3.11",
+   "Programming Language :: Python :: 3.12",
+   "Programming Language :: Python :: 3 :: only",
+   "Operating System :: POSIX :: Linux"
+]
+keywords = ["nmr", "physics", "science"]
+license = { text = "BSD 3-Clause License" }
+dependencies = [
+   "numpy",
+   "scipy",
+   "h5py",
+   "PyQt5",
+   "pyqtgraph",
 ]
-license = {text = "BSD 3-Clause License"}
 
-[tool.setuptools]
+[project.optional-dependencies]
-include_package_data = true
+legacy = ["bsddb3"]
 
+[project.urls]
+Repository = "https://gitea.pkm.physik.tu-darmstadt.de/IPKM/nmreval"
+Issues = "https://gitea.pkm.physik.tu-darmstadt.de/IPKM/nmreval/issues"
 
-[tool.setuptools.packages]
+[project.gui-scripts]
-find = {}
+nmreval = "gui_qt.cli:main"
-scripts = bin/evaluate.py
 
 [tool.setuptools.packages.find]
-include =[
+where = ["src"]
-   'nmreval*',
-   'gui_qt*',
-   'resources*',
-]
-
-[tool.setuptools.package_data]
-* = *.txt, *.npz, *.png, *.json
-
-
-
-
-

requirements.txt

@@ -1,8 +0,0 @@
-matplotlib
-numpy
-scipy
-PyQt5
-h5py
-pyqtgraph
-bsddb3
-requests

setup.py

@@ -1,4 +0,0 @@
-# Always prefer setuptools over distutils
-from setuptools import setup
-
-setup()

src/gui_qt/_py/asciidialog.py

@@ -360,7 +360,7 @@ class Ui_ascii_reader(object):
         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.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"))

src/gui_qt/_py/basewindow.py

@@ -1,8 +1,8 @@
 # -*- 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.10
+# Created by: PyQt5 UI code generator 5.15.9
 #
 # 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.
@@ -87,8 +87,6 @@ class Ui_BaseWindow(object):
         self.menuSave.setObjectName("menuSave")
         self.menuData = QtWidgets.QMenu(self.menubar)
         self.menuData.setObjectName("menuData")
-        self.menuCut_to_visible_range = QtWidgets.QMenu(self.menuData)
-        self.menuCut_to_visible_range.setObjectName("menuCut_to_visible_range")
         self.menuHelp = QtWidgets.QMenu(self.menubar)
         self.menuHelp.setObjectName("menuHelp")
         self.menuExtra = QtWidgets.QMenu(self.menubar)
@@ -155,6 +153,15 @@ class Ui_BaseWindow(object):
         self.toolBar_nmr.setIconSize(QtCore.QSize(24, 24))
         self.toolBar_nmr.setObjectName("toolBar_nmr")
         BaseWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar_nmr)
+        self.toolBar_fit = QtWidgets.QToolBar(BaseWindow)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.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)
@@ -306,6 +313,8 @@ class Ui_BaseWindow(object):
         self.actionDerivation.setObjectName("actionDerivation")
         self.actionIntegration = QtWidgets.QAction(BaseWindow)
         self.actionIntegration.setObjectName("actionIntegration")
+        self.action_cut = QtWidgets.QAction(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)
@@ -365,15 +374,6 @@ class Ui_BaseWindow(object):
         self.actionBinning.setObjectName("actionBinning")
         self.actionTNMH = QtWidgets.QAction(BaseWindow)
         self.actionTNMH.setObjectName("actionTNMH")
-        self.actionExclude_region = QtWidgets.QAction(BaseWindow)
-        self.actionExclude_region.setCheckable(True)
-        self.actionExclude_region.setObjectName("actionExclude_region")
-        self.action_cut_xaxis = QtWidgets.QAction(BaseWindow)
-        self.action_cut_xaxis.setObjectName("action_cut_xaxis")
-        self.action_cut_yaxis = QtWidgets.QAction(BaseWindow)
-        self.action_cut_yaxis.setObjectName("action_cut_yaxis")
-        self.actionUse_script = QtWidgets.QAction(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)
@@ -386,9 +386,6 @@ 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)
@@ -398,10 +395,9 @@ class Ui_BaseWindow(object):
         self.menuData.addAction(self.action_sort_pts)
         self.menuData.addAction(self.actionSkip_points)
         self.menuData.addSeparator()
-        self.menuData.addAction(self.menuCut_to_visible_range.menuAction())
+        self.menuData.addAction(self.action_cut)
         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.actionUpdate)
         self.menuHelp.addAction(self.actionBugs)
@@ -432,7 +428,6 @@ 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)
@@ -501,6 +496,7 @@ 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)
@@ -525,7 +521,6 @@ 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"))
@@ -542,6 +537,7 @@ class Ui_BaseWindow(object):
         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"))
@@ -619,6 +615,7 @@ 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..."))
@@ -645,12 +642,6 @@ class Ui_BaseWindow(object):
         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

src/gui_qt/_py/datawidget.py

@@ -1,11 +1,10 @@
 # -*- 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.15.10
+# Created by: PyQt5 UI code generator 5.12.3
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING! All changes made in this file will be lost!
-# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -50,12 +49,6 @@ class Ui_DataWidget(object):
         self.horizontalLayout.addWidget(self.func_toolButton)
         spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
-        self.pokemon_toolbutton = QtWidgets.QToolButton(self.frame)
-        self.pokemon_toolbutton.setText("")
-        self.pokemon_toolbutton.setToolButtonStyle(QtCore.Qt.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/fcreader.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'src/resources/_ui/fcreader.ui'
+# Form implementation generated from reading ui file 'resources/_ui/fcreader.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.12.3
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING! All changes made in this file will be lost!
-# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -48,7 +47,6 @@ class Ui_FCEval_dialog(object):
         self.verticalLayout.addWidget(self.input_box)
         self.region_box = QtWidgets.QGroupBox(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)
@@ -141,7 +139,6 @@ class Ui_FCEval_dialog(object):
         self.line.setObjectName("line")
         self.gridLayout.addWidget(self.line, 2, 0, 1, 2)
         self.graph_comboBox = QtWidgets.QComboBox(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)
@@ -170,8 +167,8 @@ class Ui_FCEval_dialog(object):
         self.label_6.setBuddy(self.m0_cb)
 
         self.retranslateUi(FCEval_dialog)
-        self.buttonBox.accepted.connect(FCEval_dialog.accept) # type: ignore
+        self.buttonBox.accepted.connect(FCEval_dialog.accept)
-        self.buttonBox.rejected.connect(FCEval_dialog.reject) # type: ignore
+        self.buttonBox.rejected.connect(FCEval_dialog.reject)
         QtCore.QMetaObject.connectSlotsByName(FCEval_dialog)
 
     def retranslateUi(self, FCEval_dialog):
@@ -181,7 +178,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 values of the script)"))
+        self.region_box.setTitle(_translate("FCEval_dialog", "Evaluate region (empty values default to start/end)"))
         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/fitcreationdialog.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'resources/_ui/fitcreationdialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# 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.
@@ -51,8 +51,9 @@ 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.editor = EditorWidget(self.splitter)
+        self.plainTextEdit = CodeEditor(self.splitter)
-        self.editor.setObjectName("editor")
+        self.plainTextEdit.setEnabled(True)
+        self.plainTextEdit.setObjectName("plainTextEdit")
         self.verticalLayout.addWidget(self.splitter)
         self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
@@ -62,8 +63,8 @@ class Ui_Dialog(object):
 
         self.retranslateUi(Dialog)
         self.tabWidget.setCurrentIndex(0)
-        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
+        self.buttonBox.accepted.connect(Dialog.accept)
-        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
+        self.buttonBox.rejected.connect(Dialog.reject)
         QtCore.QMetaObject.connectSlotsByName(Dialog)
 
     def retranslateUi(self, Dialog):
@@ -73,4 +74,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 EditorWidget
+from ..lib.codeeditor import CodeEditor

src/gui_qt/_py/fitmodelwidget.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'src/resources/_ui/fitmodelwidget.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.15.9
 #
 # 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.
@@ -42,7 +42,6 @@ class Ui_FitParameter(object):
         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)
@@ -52,9 +51,6 @@ class Ui_FitParameter(object):
         self.global_checkbox = QtWidgets.QCheckBox(FitParameter)
         self.global_checkbox.setObjectName("global_checkbox")
         self.horizontalLayout_2.addWidget(self.global_checkbox)
-        self.reset_button = QtWidgets.QPushButton(FitParameter)
-        self.reset_button.setObjectName("reset_button")
-        self.horizontalLayout_2.addWidget(self.reset_button)
         self.verticalLayout.addLayout(self.horizontalLayout_2)
         self.frame = QtWidgets.QFrame(FitParameter)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
@@ -86,7 +82,6 @@ class Ui_FitParameter(object):
         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)
@@ -105,7 +100,6 @@ class Ui_FitParameter(object):
         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")
@@ -128,7 +122,6 @@ 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/fitresult.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'src/resources/_ui/fitresult.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.15.9
 #
 # 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.
@@ -27,48 +27,20 @@ class Ui_Dialog(object):
         self.stackPage1 = QtWidgets.QWidget()
         self.stackPage1.setObjectName("stackPage1")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.stackPage1)
-        self.gridLayout_3.setContentsMargins(6, 3, 6, 3)
+        self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
         self.gridLayout_3.setSpacing(3)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.logy_box = QtWidgets.QCheckBox(self.stackPage1)
-        self.gridLayout_3.addItem(spacerItem, 2, 3, 1, 1)
+        self.logy_box.setLayoutDirection(QtCore.Qt.RightToLeft)
-        self.autoscale_box = QtWidgets.QToolButton(self.stackPage1)
-        self.autoscale_box.setObjectName("autoscale_box")
-        self.gridLayout_3.addWidget(self.autoscale_box, 2, 4, 1, 1)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_3.addItem(spacerItem1, 2, 1, 1, 1)
-        self.verticalGroupBox_2 = QtWidgets.QGroupBox(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(self.verticalGroupBox_2)
-        self.logx_box.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.logx_box.setObjectName("logx_box")
-        self.verticalLayout_4.addWidget(self.logx_box)
-        self.logy_box = QtWidgets.QCheckBox(self.verticalGroupBox_2)
-        self.logy_box.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.logy_box.setObjectName("logy_box")
-        self.verticalLayout_4.addWidget(self.logy_box)
+        self.gridLayout_3.addWidget(self.logy_box, 2, 1, 1, 1)
-        self.gridLayout_3.addWidget(self.verticalGroupBox_2, 2, 2, 1, 1)
+        self.logx_box = QtWidgets.QCheckBox(self.stackPage1)
-        self.verticalGroupBox = QtWidgets.QGroupBox(self.stackPage1)
+        self.logx_box.setLayoutDirection(QtCore.Qt.RightToLeft)
-        self.verticalGroupBox.setObjectName("verticalGroupBox")
+        self.logx_box.setObjectName("logx_box")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalGroupBox)
+        self.gridLayout_3.addWidget(self.logx_box, 2, 0, 1, 1)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.rel_dev_button = QtWidgets.QRadioButton(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(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(self.stackPage1)
         self.graphicsView.setObjectName("graphicsView")
-        self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 5)
+        self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 2)
         self.stack.addTab(self.stackPage1, "")
         self.stackPage2 = QtWidgets.QWidget()
         self.stackPage2.setObjectName("stackPage2")
@@ -112,6 +84,10 @@ class Ui_Dialog(object):
         self.verticalLayout_3.addWidget(self.corr_tableWidget)
         self.stack.addTab(self.stackPage3, "")
         self.gridLayout.addWidget(self.stack, 0, 1, 5, 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, 8, 0, 1, 2)
         self.param_tableWidget = QtWidgets.QTableWidget(Dialog)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
@@ -137,6 +113,74 @@ class Ui_Dialog(object):
         self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
         self.line.setObjectName("line")
         self.gridLayout.addWidget(self.line, 5, 0, 1, 2)
+        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, 7, 0, 1, 2)
         self.sets_comboBox = ElideComboBox(Dialog)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -151,102 +195,6 @@ class Ui_Dialog(object):
         self.reject_fit_checkBox = QtWidgets.QCheckBox(Dialog)
         self.reject_fit_checkBox.setObjectName("reject_fit_checkBox")
         self.gridLayout.addWidget(self.reject_fit_checkBox, 2, 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.graph_comboBox = QtWidgets.QComboBox(self.groupBox)
-        self.graph_comboBox.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, 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, 7, 1, 1)
-        self.minx_line = QtWidgets.QLineEdit(self.groupBox)
-        self.minx_line.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, 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.extrapolate_box = QtWidgets.QCheckBox(self.groupBox)
-        self.extrapolate_box.setObjectName("extrapolate_box")
-        self.gridLayout_2.addWidget(self.extrapolate_box, 1, 0, 1, 1)
-        self.numx_line = QtWidgets.QLineEdit(self.groupBox)
-        self.numx_line.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.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(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, 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, 6, 1, 1)
-        self.maxx_line = QtWidgets.QLineEdit(self.groupBox)
-        self.maxx_line.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, 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.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, 5, 2, 1)
-        self.newx_log_checkbox = QtWidgets.QCheckBox(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(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.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(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.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(self.groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.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(Dialog)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok|QtWidgets.QDialogButtonBox.Retry)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 8, 0, 1, 2)
 
         self.retranslateUi(Dialog)
         self.stack.setCurrentIndex(0)
@@ -255,14 +203,8 @@ class Ui_Dialog(object):
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Fit results"))
-        self.autoscale_box.setToolTip(_translate("Dialog", "Auto-scale graph for all sets"))
+        self.logy_box.setText(_translate("Dialog", "logarithmic y axis"))
-        self.autoscale_box.setText(_translate("Dialog", "Autoscale all sets"))
+        self.logx_box.setText(_translate("Dialog", "logarithmic x axis"))
-        self.verticalGroupBox_2.setTitle(_translate("Dialog", "Logarithmic axes"))
-        self.logx_box.setText(_translate("Dialog", "x axis"))
-        self.logy_box.setText(_translate("Dialog", "y axis"))
-        self.verticalGroupBox.setTitle(_translate("Dialog", "Residuals"))
-        self.rel_dev_button.setText(_translate("Dialog", "relative deviation"))
-        self.abs_dev_button.setText(_translate("Dialog", "absolute deviation"))
         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)
@@ -275,19 +217,18 @@ class Ui_Dialog(object):
         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.parameter_checkbox.setText(_translate("Dialog", "Plot parameter"))
         self.graph_checkBox.setText(_translate("Dialog", "New graph for parameter"))
+        self.minx_line.setToolTip(_translate("Dialog", "Leave empty to start at lowest point"))
+        self.minx_line.setPlaceholderText(_translate("Dialog", "min x"))
         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.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.parameter_checkbox.setText(_translate("Dialog", "Plot parameter"))
+        self.reject_fit_checkBox.setText(_translate("Dialog", "Reject this fit"))
 from ..lib.forms import ElideComboBox
 from pyqtgraph import GraphicsLayoutWidget

src/gui_qt/_py/graph.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'resources/_ui/graph.ui'
+# Form implementation generated from reading ui file 'src/resources/_ui/graph.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.15.9
 #
 # 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.
@@ -271,11 +271,8 @@ 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 ..lib.graph_items import NMRPlotWidget
 from ..lib.listwidget import QListWidgetSelect

src/gui_qt/_py/interpol_dialog.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './nmreval/src/resources/_ui/interpol_dialog.ui'
+# Form implementation generated from reading ui file 'src/resources/_ui/interpol_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.15.9
 #
 # 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.
@@ -55,7 +55,7 @@ class Ui_Dialog(object):
         self.gridLayout.addWidget(self.interp_comboBox, 4, 1, 1, 1)
         self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
         self.buttonBox.setObjectName("buttonBox")
         self.gridLayout.addWidget(self.buttonBox, 12, 0, 1, 2)
         self.line = QtWidgets.QFrame(Dialog)
@@ -132,6 +132,8 @@ class Ui_Dialog(object):
         self.label_8.setBuddy(self.dest_combobox)
 
         self.retranslateUi(Dialog)
+        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
+        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)
         Dialog.setTabOrder(self.listWidget, self.ylog_checkBox)
         Dialog.setTabOrder(self.ylog_checkBox, self.interp_comboBox)

src/gui_qt/_py/pokeentry.py

@@ -1,260 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file './nmreval/src/resources/_ui/pokeentry.ui'
-#
-# Created by: PyQt5 UI code generator 5.15.10
-#
-# 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_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(Form)
-        self.artwork_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.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(Form)
-        self.label.setObjectName("label")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label)
-        self.nationaldex_label = QtWidgets.QLabel(Form)
-        self.nationaldex_label.setObjectName("nationaldex_label")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.nationaldex_label)
-        self.label_1 = QtWidgets.QLabel(Form)
-        self.label_1.setObjectName("label_1")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_1)
-        self.species_label = QtWidgets.QLabel(Form)
-        self.species_label.setObjectName("species_label")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.species_label)
-        self.label_4 = QtWidgets.QLabel(Form)
-        self.label_4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.label_4.setObjectName("label_4")
-        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_4)
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.type1_label = QtWidgets.QLabel(Form)
-        self.type1_label.setObjectName("type1_label")
-        self.verticalLayout_2.addWidget(self.type1_label)
-        self.type2_label = QtWidgets.QLabel(Form)
-        self.type2_label.setObjectName("type2_label")
-        self.verticalLayout_2.addWidget(self.type2_label)
-        self.formLayout.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.verticalLayout_2)
-        self.label_5 = QtWidgets.QLabel(Form)
-        self.label_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.label_5.setObjectName("label_5")
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_5)
-        self.verticalLayout = QtWidgets.QVBoxLayout()
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.ability1_label = QtWidgets.QLabel(Form)
-        self.ability1_label.setObjectName("ability1_label")
-        self.verticalLayout.addWidget(self.ability1_label)
-        self.ability2_label = QtWidgets.QLabel(Form)
-        self.ability2_label.setObjectName("ability2_label")
-        self.verticalLayout.addWidget(self.ability2_label)
-        self.ability3_label = QtWidgets.QLabel(Form)
-        self.ability3_label.setObjectName("ability3_label")
-        self.verticalLayout.addWidget(self.ability3_label)
-        self.formLayout.setLayout(3, QtWidgets.QFormLayout.FieldRole, self.verticalLayout)
-        self.label_2 = QtWidgets.QLabel(Form)
-        self.label_2.setObjectName("label_2")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_2)
-        self.height_label = QtWidgets.QLabel(Form)
-        self.height_label.setObjectName("height_label")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.height_label)
-        self.label_3 = QtWidgets.QLabel(Form)
-        self.label_3.setObjectName("label_3")
-        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_3)
-        self.weight_label = QtWidgets.QLabel(Form)
-        self.weight_label.setObjectName("weight_label")
-        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.weight_label)
-        self.gender_label = QtWidgets.QLabel(Form)
-        self.gender_label.setObjectName("gender_label")
-        self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.gender_label)
-        self.verticalLayout_4.addLayout(self.formLayout)
-        self.groupBox = QtWidgets.QGroupBox(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(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(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(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(self.groupBox)
-        self.label_6.setFrameShadow(QtWidgets.QFrame.Plain)
-        self.label_6.setObjectName("label_6")
-        self.gridLayout_4.addWidget(self.label_6, 0, 0, 1, 1)
-        self.hp_bar = QtWidgets.QProgressBar(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(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(self.groupBox)
-        self.label_11.setObjectName("label_11")
-        self.gridLayout_4.addWidget(self.label_11, 2, 2, 1, 1)
-        self.label_10 = QtWidgets.QLabel(self.groupBox)
-        self.label_10.setObjectName("label_10")
-        self.gridLayout_4.addWidget(self.label_10, 1, 2, 1, 1)
-        self.defense_bar = QtWidgets.QProgressBar(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(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(self.groupBox)
-        self.label_7.setObjectName("label_7")
-        self.gridLayout_4.addWidget(self.label_7, 1, 0, 1, 1)
-        self.label_9 = QtWidgets.QLabel(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(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(self.groupBox_2)
-        self.tableWidget.setStyleSheet("background-color: transparent;")
-        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.tableWidget.setShowGrid(False)
-        self.tableWidget.setGridStyle(QtCore.Qt.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.Minimum, QtWidgets.QSizePolicy.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

@@ -0,0 +1,118 @@
+# -*- 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

@@ -1,131 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file './nmreval/src/resources/_ui/pokewindow.ui'
-#
-# Created by: PyQt5 UI code generator 5.15.10
-#
-# 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_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(Dialog)
-        self.pushButton.setObjectName("pushButton")
-        self.gridLayout.addWidget(self.pushButton, 0, 2, 1, 1)
-        self.comboBox_2 = QtWidgets.QComboBox(Dialog)
-        self.comboBox_2.setObjectName("comboBox_2")
-        self.gridLayout.addWidget(self.comboBox_2, 0, 0, 1, 1)
-        self.comboBox = QtWidgets.QComboBox(Dialog)
-        self.comboBox.setObjectName("comboBox")
-        self.gridLayout.addWidget(self.comboBox, 0, 1, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem, 0, 4, 1, 1)
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
-        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.setStandardButtons(QtWidgets.QDialogButtonBox.Close)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayout.addWidget(self.buttonBox, 0, 3, 1, 1)
-        self.splitter = QtWidgets.QSplitter(Dialog)
-        self.splitter.setOrientation(QtCore.Qt.Horizontal)
-        self.splitter.setObjectName("splitter")
-        self.tableWidget_2 = QtWidgets.QTableWidget(self.splitter)
-        self.tableWidget_2.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.tableWidget_2.setAlternatingRowColors(True)
-        self.tableWidget_2.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
-        self.tableWidget_2.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
-        self.tableWidget_2.setShowGrid(False)
-        self.tableWidget_2.setGridStyle(QtCore.Qt.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(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/ptstab.py

@@ -1,11 +1,10 @@
 # -*- 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.15.10
+# Created by: PyQt5 UI code generator 5.12.3
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING! All changes made in this file will be lost!
-# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -14,50 +13,29 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
-        Form.resize(417, 746)
+        Form.resize(316, 747)
-        self.gridLayout = QtWidgets.QGridLayout(Form)
+        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
-        self.gridLayout.setObjectName("gridLayout")
+        self.verticalLayout.setContentsMargins(3, 3, 3, 3)
-        self.label_2 = QtWidgets.QLabel(Form)
+        self.verticalLayout.setObjectName("verticalLayout")
-        self.label_2.setObjectName("label_2")
-        self.gridLayout.addWidget(self.label_2, 0, 0, 1, 2)
         self.peaktable = QtWidgets.QListWidget(Form)
         self.peaktable.setEditTriggers(QtWidgets.QAbstractItemView.DoubleClicked|QtWidgets.QAbstractItemView.EditKeyPressed)
         self.peaktable.setObjectName("peaktable")
-        self.gridLayout.addWidget(self.peaktable, 1, 0, 1, 2)
+        self.verticalLayout.addWidget(self.peaktable)
-        self.special_checkbox = QtWidgets.QCheckBox(Form)
+        self.groupBox = QtWidgets.QGroupBox(Form)
-        self.special_checkbox.setObjectName("special_checkbox")
+        self.groupBox.setObjectName("groupBox")
-        self.gridLayout.addWidget(self.special_checkbox, 3, 0, 1, 1)
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox)
-        self.special_comboBox = QtWidgets.QComboBox(Form)
+        self.horizontalLayout.setContentsMargins(3, 3, 3, 3)
-        self.special_comboBox.setEnabled(False)
+        self.horizontalLayout.setSpacing(3)
-        self.special_comboBox.setObjectName("special_comboBox")
+        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.special_comboBox.addItem("")
+        self.left_pt = QtWidgets.QSpinBox(self.groupBox)
-        self.special_comboBox.addItem("")
+        self.left_pt.setMaximum(999)
-        self.special_comboBox.addItem("")
+        self.left_pt.setObjectName("left_pt")
-        self.special_comboBox.addItem("")
+        self.horizontalLayout.addWidget(self.left_pt)
-        self.gridLayout.addWidget(self.special_comboBox, 3, 1, 1, 1)
+        self.right_pt = QtWidgets.QSpinBox(self.groupBox)
-        spacerItem = QtWidgets.QSpacerItem(20, 30, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        self.right_pt.setMaximum(999)
-        self.gridLayout.addItem(spacerItem, 4, 0, 1, 1)
+        self.right_pt.setObjectName("right_pt")
-        self.label_3 = QtWidgets.QLabel(Form)
+        self.horizontalLayout.addWidget(self.right_pt)
-        self.label_3.setObjectName("label_3")
+        self.average_combobox = QtWidgets.QComboBox(self.groupBox)
-        self.gridLayout.addWidget(self.label_3, 5, 0, 1, 1)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.left_limit = QtWidgets.QLineEdit(Form)
-        self.left_limit.setObjectName("left_limit")
-        self.horizontalLayout_2.addWidget(self.left_limit)
-        self.right_limit = QtWidgets.QLineEdit(Form)
-        self.right_limit.setObjectName("right_limit")
-        self.horizontalLayout_2.addWidget(self.right_limit)
-        self.limit_combobox = QtWidgets.QComboBox(Form)
-        self.limit_combobox.setObjectName("limit_combobox")
-        self.limit_combobox.addItem("")
-        self.limit_combobox.addItem("")
-        self.horizontalLayout_2.addWidget(self.limit_combobox)
-        self.gridLayout.addLayout(self.horizontalLayout_2, 5, 1, 1, 1)
-        self.label_5 = QtWidgets.QLabel(Form)
-        self.label_5.setObjectName("label_5")
-        self.gridLayout.addWidget(self.label_5, 6, 0, 1, 1)
-        self.average_combobox = QtWidgets.QComboBox(Form)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -67,94 +45,89 @@ 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.gridLayout.addWidget(self.average_combobox, 6, 1, 1, 1)
+        self.verticalLayout.addWidget(self.groupBox)
-        self.label_4 = QtWidgets.QLabel(Form)
+        self.groupBox_2 = QtWidgets.QGroupBox(Form)
-        self.label_4.setObjectName("label_4")
+        self.groupBox_2.setCheckable(True)
-        self.gridLayout.addWidget(self.label_4, 7, 0, 1, 1)
+        self.groupBox_2.setChecked(False)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.groupBox_2.setObjectName("groupBox_2")
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.horizontalLayout_5 = QtWidgets.QHBoxLayout(self.groupBox_2)
-        self.xbutton = QtWidgets.QCheckBox(Form)
+        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.setObjectName("special_comboBox")
+        self.special_comboBox.addItem("")
+        self.special_comboBox.addItem("")
+        self.special_comboBox.addItem("")
+        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.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.setObjectName("xbutton")
-        self.horizontalLayout.addWidget(self.xbutton)
+        self.gridLayout.addWidget(self.xbutton, 0, 0, 1, 1)
-        self.ybutton = QtWidgets.QCheckBox(Form)
+        self.ybutton = QtWidgets.QCheckBox(self.groupBox_3)
         self.ybutton.setChecked(True)
         self.ybutton.setObjectName("ybutton")
-        self.horizontalLayout.addWidget(self.ybutton)
+        self.gridLayout.addWidget(self.ybutton, 0, 1, 1, 1)
-        self.gridLayout.addLayout(self.horizontalLayout, 7, 1, 1, 1)
+        self.graph_checkbox = QtWidgets.QCheckBox(self.groupBox_3)
-        self.label = QtWidgets.QLabel(Form)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 8, 0, 1, 1)
-        self.group_box = QtWidgets.QComboBox(Form)
-        self.group_box.setObjectName("group_box")
-        self.group_box.addItem("")
-        self.group_box.addItem("")
-        self.gridLayout.addWidget(self.group_box, 8, 1, 1, 1)
-        spacerItem1 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        self.gridLayout.addItem(spacerItem1, 9, 0, 1, 1)
-        self.graph_checkbox = QtWidgets.QCheckBox(Form)
         self.graph_checkbox.setChecked(True)
         self.graph_checkbox.setObjectName("graph_checkbox")
-        self.gridLayout.addWidget(self.graph_checkbox, 10, 0, 1, 1)
+        self.gridLayout.addWidget(self.graph_checkbox, 1, 0, 1, 1)
-        self.graph_combobox = QtWidgets.QComboBox(Form)
+        self.graph_combobox = QtWidgets.QComboBox(self.groupBox_3)
         self.graph_combobox.setEnabled(False)
         self.graph_combobox.setObjectName("graph_combobox")
-        self.gridLayout.addWidget(self.graph_combobox, 10, 1, 1, 1)
+        self.gridLayout.addWidget(self.graph_combobox, 1, 1, 1, 1)
-        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout.addWidget(self.groupBox_3)
-        self.gridLayout.addItem(spacerItem2, 12, 0, 1, 1)
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
+        self.horizontalLayout_2.setSpacing(2)
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.okButton = QtWidgets.QPushButton(Form)
         icon = QtGui.QIcon.fromTheme("dialog-ok")
         self.okButton.setIcon(icon)
         self.okButton.setObjectName("okButton")
-        self.gridLayout.addWidget(self.okButton, 11, 0, 1, 2)
+        self.horizontalLayout_2.addWidget(self.okButton)
         self.deleteButton = QtWidgets.QPushButton(Form)
         icon = QtGui.QIcon.fromTheme("dialog-cancel")
         self.deleteButton.setIcon(icon)
         self.deleteButton.setObjectName("deleteButton")
-        self.gridLayout.addWidget(self.deleteButton, 2, 0, 1, 2)
+        self.horizontalLayout_2.addWidget(self.deleteButton)
-        self.label_2.setBuddy(self.peaktable)
+        self.verticalLayout.addLayout(self.horizontalLayout_2)
-        self.label_5.setBuddy(self.average_combobox)
-        self.label_4.setBuddy(self.xbutton)
-        self.label.setBuddy(self.group_box)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
-        Form.setTabOrder(self.peaktable, self.limit_combobox)
-        Form.setTabOrder(self.limit_combobox, self.average_combobox)
-        Form.setTabOrder(self.average_combobox, self.xbutton)
-        Form.setTabOrder(self.xbutton, self.ybutton)
-        Form.setTabOrder(self.ybutton, self.group_box)
-        Form.setTabOrder(self.group_box, self.graph_checkbox)
-        Form.setTabOrder(self.graph_checkbox, self.graph_combobox)
 
     def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
         Form.setWindowTitle(_translate("Form", "Form"))
-        self.label_2.setText(_translate("Form", "Selected points and regions"))
         self.peaktable.setToolTip(_translate("Form", "Edit by entering new value: \n"
 "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.special_checkbox.setText(_translate("Form", "Use special value"))
+        self.groupBox.setTitle(_translate("Form", "Average"))
+        self.left_pt.setSuffix(_translate("Form", " pts"))
+        self.left_pt.setPrefix(_translate("Form", "- "))
+        self.right_pt.setSuffix(_translate("Form", " pts"))
+        self.right_pt.setPrefix(_translate("Form", "+ "))
+        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.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)"))
         self.special_comboBox.setItemText(1, _translate("Form", "max(abs(y))"))
         self.special_comboBox.setItemText(2, _translate("Form", "min(y)"))
         self.special_comboBox.setItemText(3, _translate("Form", "min(abs(y))"))
-        self.label_3.setText(_translate("Form", "Region around points"))
+        self.groupBox_3.setTitle(_translate("Form", "Result"))
-        self.limit_combobox.setItemText(0, _translate("Form", "points"))
-        self.limit_combobox.setItemText(1, _translate("Form", "range"))
-        self.label_5.setText(_translate("Form", "Aggregation"))
-        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.label_4.setText(_translate("Form", "New set based on"))
         self.xbutton.setText(_translate("Form", "x"))
         self.ybutton.setText(_translate("Form", "y"))
-        self.label.setText(_translate("Form", "Group by"))
-        self.group_box.setItemText(0, _translate("Form", "\"Group\" value"))
-        self.group_box.setItemText(1, _translate("Form", "x value"))
         self.graph_checkbox.setText(_translate("Form", "New graph?"))
         self.okButton.setText(_translate("Form", "Apply"))
-        self.deleteButton.setText(_translate("Form", "Delete selection"))
+        self.deleteButton.setText(_translate("Form", "Delete selected"))

src/gui_qt/_py/smoothdialog.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'src/resources/_ui/smoothdialog.ui'
+# Form implementation generated from reading ui file 'resources/_ui/smoothdialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.12.3
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING! All changes made in this file will be lost!
-# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -18,37 +17,9 @@ class Ui_SmoothDialog(object):
         self.gridLayout = QtWidgets.QGridLayout(SmoothDialog)
         self.gridLayout.setSpacing(3)
         self.gridLayout.setObjectName("gridLayout")
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout.addItem(spacerItem, 7, 0, 1, 1)
         self.frac_label = QtWidgets.QLabel(SmoothDialog)
         self.frac_label.setObjectName("frac_label")
-        self.gridLayout.addWidget(self.frac_label, 2, 0, 1, 1)
+        self.gridLayout.addWidget(self.frac_label, 1, 0, 1, 1)
-        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, 5, 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.setObjectName("label")
-        self.horizontalLayout_2.addWidget(self.label)
-        self.polynom_spinBox = QtWidgets.QSpinBox(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, 3, 0, 1, 2)
-        self.y_checkBox = QtWidgets.QCheckBox(SmoothDialog)
-        self.y_checkBox.setObjectName("y_checkBox")
-        self.gridLayout.addWidget(self.y_checkBox, 6, 1, 1, 1)
-        self.x_checkBox = QtWidgets.QCheckBox(SmoothDialog)
-        self.x_checkBox.setObjectName("x_checkBox")
-        self.gridLayout.addWidget(self.x_checkBox, 6, 0, 1, 1)
         self.widget_2 = QtWidgets.QWidget(SmoothDialog)
         self.widget_2.setObjectName("widget_2")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.widget_2)
@@ -64,17 +35,37 @@ class Ui_SmoothDialog(object):
         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.gridLayout.addWidget(self.widget_2, 3, 0, 1, 2)
-        self.frac_spinBox = QtWidgets.QSpinBox(SmoothDialog)
+        self.line = QtWidgets.QFrame(SmoothDialog)
-        self.frac_spinBox.setMinimum(1)
+        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.frac_spinBox.setMaximum(999)
+        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.frac_spinBox.setObjectName("frac_spinBox")
+        self.line.setObjectName("line")
-        self.gridLayout.addWidget(self.frac_spinBox, 2, 1, 1, 1)
+        self.gridLayout.addWidget(self.line, 4, 0, 1, 2)
         self.buttonBox = QtWidgets.QDialogButtonBox(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, 8, 0, 1, 2)
+        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.setObjectName("label")
+        self.horizontalLayout_2.addWidget(self.label)
+        self.polynom_spinBox = QtWidgets.QSpinBox(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.frac_spinBox = QtWidgets.QSpinBox(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.comboBox = QtWidgets.QComboBox(SmoothDialog)
         self.comboBox.setObjectName("comboBox")
         self.comboBox.addItem("")
@@ -86,17 +77,22 @@ class Ui_SmoothDialog(object):
         self.comboBox.addItem("")
         self.comboBox.addItem("")
         self.comboBox.addItem("")
-        self.gridLayout.addWidget(self.comboBox, 1, 0, 1, 2)
+        self.gridLayout.addWidget(self.comboBox, 0, 0, 1, 2)
-        self.label_2 = QtWidgets.QLabel(SmoothDialog)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.label_2.setObjectName("label_2")
+        self.gridLayout.addItem(spacerItem, 6, 0, 1, 1)
-        self.gridLayout.addWidget(self.label_2, 0, 0, 1, 2)
+        self.y_checkBox = QtWidgets.QCheckBox(SmoothDialog)
+        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.setBuddy(self.polynom_spinBox)
         self.label_3.setBuddy(self.iter_spinBox)
+        self.label.setBuddy(self.polynom_spinBox)
 
         self.retranslateUi(SmoothDialog)
-        self.buttonBox.accepted.connect(SmoothDialog.accept) # type: ignore
+        self.buttonBox.accepted.connect(SmoothDialog.accept)
-        self.buttonBox.rejected.connect(SmoothDialog.reject) # type: ignore
+        self.buttonBox.rejected.connect(SmoothDialog.reject)
         QtCore.QMetaObject.connectSlotsByName(SmoothDialog)
         SmoothDialog.setTabOrder(self.comboBox, self.frac_spinBox)
         SmoothDialog.setTabOrder(self.frac_spinBox, self.polynom_spinBox)
@@ -108,11 +104,9 @@ 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"))
@@ -123,4 +117,5 @@ 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.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.y_checkBox.setText(_translate("SmoothDialog", "y log-spaced?"))
+        self.x_checkBox.setText(_translate("SmoothDialog", "x log-spaced?"))

src/gui_qt/_py/usermodeleditor.py

@@ -2,10 +2,9 @@
 
 # Form implementation generated from reading ui file 'resources/_ui/usermodeleditor.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.12.3
 #
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# WARNING! All changes made in this file will be lost!
-# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -21,12 +20,15 @@ class Ui_MainWindow(object):
         self.verticalLayout.setContentsMargins(3, 3, 3, 3)
         self.verticalLayout.setSpacing(3)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.widget = EditorWidget(self.centralwidget)
+        self.edit_field = CodeEditor(self.centralwidget)
-        self.widget.setObjectName("widget")
+        font = QtGui.QFont()
-        self.verticalLayout.addWidget(self.widget)
+        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, 20))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 30))
         self.menubar.setObjectName("menubar")
         self.menuFile = QtWidgets.QMenu(self.menubar)
         self.menuFile.setObjectName("menuFile")
@@ -59,4 +61,4 @@ class Ui_MainWindow(object):
         self.actionSave.setText(_translate("MainWindow", "Save"))
         self.actionSave_as.setText(_translate("MainWindow", "Save as..."))
         self.actionClose.setText(_translate("MainWindow", "Close"))
-from ..lib.codeeditor import EditorWidget
+from ..lib.codeeditor import CodeEditor

src/gui_qt/cli.py

@@ -0,0 +1,28 @@
+
+def main():
+    import sys
+    from nmreval.configs import check_for_config
+
+    # does a directory for config stuff exist? create it if not
+    check_for_config()
+
+    # pyqtgraph warns on Mac if QApplication is created when it is imported
+    # import pyqtgraph
+
+    from nmreval.lib.logger import handle_exception
+    sys.excepthook = handle_exception
+
+    from gui_qt import App
+
+    app = App(['Team Rocket FTW!'])
+
+    from gui_qt.main.mainwindow import NMRMainWindow
+
+    mplQt = NMRMainWindow()
+    mplQt.show()
+
+    sys.exit(app.exec())
+
+
+if __name__ == '__main__':
+    main()

src/gui_qt/data/container.py

@@ -300,12 +300,10 @@ class ExperimentContainer(QtCore.QObject):
             self._relations.pop(relation_type)
 
     def _update_actions(self):
-        self.actions.update({
+        self.actions.update({'sort': self._data.sort,
-            'sort': self._data.sort,
                              'cut': self._data.cut,
                              'norm': self._data.normalize,
-            'center': self.center,
+                             'center': self.center})
-        })
 
     @plot_update
     def update(self, opts: dict):
@@ -313,11 +311,9 @@ class ExperimentContainer(QtCore.QObject):
 
     def get_properties(self) -> dict:
         props = OrderedDict()
-        props['General'] = OrderedDict([
+        props['General'] = OrderedDict([('Name', self.name),
-            ('Name', self.name),
                                         ('Value', str(self.value)),
-            ('Group', str(self.group)),
+                                        ('Group', str(self.group))])
-        ])
         props['Symbol'] = OrderedDict()
         props['Line'] = OrderedDict()
 
@@ -484,12 +480,10 @@ class ExperimentContainer(QtCore.QObject):
         else:
             prefix = f'g[{i}].s[{j}].'
 
-        namespace = {
+        namespace = {prefix + 'x': (self.x, 'x values'),
-            prefix + 'x': (self.x, 'x values'),
                      prefix + 'y': [self.y, 'y values'],
                      prefix + 'y_err': (self.y_err, 'y error values'),
-            prefix + 'value': (self.value, str(self.value)),
+                     prefix + 'value': (self.value, str(self.value))}
-        }
 
         if len(self._fits) == 1:
             namespace.update({

src/gui_qt/data/datawidget/datawidget.py

@@ -17,7 +17,7 @@ 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, bool)
+    extendFits = QtCore.pyqtSignal(list)
 
     # noinspection PyUnresolvedReferences
     def __init__(self, parent=None):
@@ -49,16 +49,11 @@ class DataTree(QtWidgets.QTreeWidget):
 
     def add_graph(self, idd: str, name: str):
         item = QtWidgets.QTreeWidgetItem()
-        item.setFlags(
+        item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsDropEnabled | QtCore.Qt.ItemIsEditable |
-            QtCore.Qt.ItemFlag.ItemIsSelectable |
+                      QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsUserCheckable)
-            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.ItemDataRole.UserRole, idd)
+        item.setData(0, QtCore.Qt.UserRole, idd)
-        item.setCheckState(0, QtCore.Qt.CheckState.Checked)
+        item.setCheckState(0, QtCore.Qt.Checked)
 
         self.addTopLevelItem(item)
         self._checked_graphs.add(idd)
@@ -72,19 +67,14 @@ class DataTree(QtWidgets.QTreeWidget):
 
         for row in range(self.invisibleRootItem().childCount()):
             graph = self.invisibleRootItem().child(row)
-            if graph.data(0, QtCore.Qt.ItemDataRole.UserRole) == gid:
+            if graph.data(0, QtCore.Qt.UserRole) == gid:
                 for (idd, name, value) in items:
                     item = QtWidgets.QTreeWidgetItem([name])
                     item.setToolTip(0, f'Value: {value}')
-                    item.setData(0, QtCore.Qt.ItemDataRole.UserRole, idd)
+                    item.setData(0, QtCore.Qt.UserRole, idd)
-                    item.setCheckState(0, QtCore.Qt.CheckState.Checked)
+                    item.setCheckState(0, QtCore.Qt.Checked)
-                    item.setFlags(
+                    item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsEditable |
-                        QtCore.Qt.ItemFlag.ItemIsSelectable |
+                                  QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsUserCheckable)
-                        QtCore.Qt.ItemFlag.ItemIsDragEnabled |
-                        QtCore.Qt.ItemFlag.ItemIsEditable |
-                        QtCore.Qt.ItemFlag.ItemIsEnabled |
-                        QtCore.Qt.ItemFlag.ItemIsUserCheckable
-                    )
                     graph.addChild(item)
                     self._checked_sets.add(idd)
 
@@ -95,8 +85,8 @@ class DataTree(QtWidgets.QTreeWidget):
 
     @QtCore.pyqtSlot(QtWidgets.QTreeWidgetItem)
     def data_change(self, item: QtWidgets.QTreeWidgetItem, emit: bool = True) -> tuple[set, set]:
-        idd = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
+        idd = item.data(0, QtCore.Qt.UserRole)
-        is_selected = item.checkState(0) == QtCore.Qt.CheckState.Checked
+        is_selected = item.checkState(0) == QtCore.Qt.Checked
         to_be_hidden = set()
         to_be_shown = set()
 
@@ -114,9 +104,9 @@ class DataTree(QtWidgets.QTreeWidget):
                     self.blockSignals(True)
                     for i in range(item.childCount()):
                         child = item.child(i)
-                        child.setCheckState(0, QtCore.Qt.CheckState.Checked)
+                        child.setCheckState(0, QtCore.Qt.Checked)
-                        to_be_shown.add(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
+                        to_be_shown.add(child.data(0, QtCore.Qt.UserRole))
-                        self._checked_sets.add(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
+                        self._checked_sets.add(child.data(0, QtCore.Qt.UserRole))
                     self.blockSignals(False)
 
                 # check state change to unchecked
@@ -125,10 +115,10 @@ class DataTree(QtWidgets.QTreeWidget):
                     self.blockSignals(True)
                     for i in range(item.childCount()):
                         child = item.child(i)
-                        child.setCheckState(0, QtCore.Qt.CheckState.Unchecked)
+                        child.setCheckState(0, QtCore.Qt.Unchecked)
-                        to_be_hidden.add(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
+                        to_be_hidden.add(child.data(0, QtCore.Qt.UserRole))
                         try:
-                            self._checked_sets.remove(child.data(0, QtCore.Qt.ItemDataRole.UserRole))
+                            self._checked_sets.remove(child.data(0, QtCore.Qt.UserRole))
                         except KeyError:
                             pass
                     self.blockSignals(False)
@@ -163,7 +153,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.ItemDataRole.UserRole))
+            self.management.select_window(item.data(0, QtCore.Qt.UserRole))
 
     def dropEvent(self, evt: QtGui.QDropEvent):
         dropped_index = self.indexAt(evt.pos())
@@ -189,7 +179,7 @@ class DataTree(QtWidgets.QTreeWidget):
 
             from_parent.removeChild(it)
             tobemoved.append(it)
-            take_from.append(from_parent.data(0, QtCore.Qt.ItemDataRole.UserRole))
+            take_from.append(from_parent.data(0, QtCore.Qt.UserRole))
 
         pos = QtCore.QModelIndex(persistent_drop)
         if self.dropIndicatorPosition() == QtWidgets.QAbstractItemView.BelowItem:
@@ -201,8 +191,8 @@ class DataTree(QtWidgets.QTreeWidget):
         else:
             to_parent.insertChildren(row, tobemoved)
 
-        self.management.move_sets([it.data(0, QtCore.Qt.ItemDataRole.UserRole) for it in tobemoved],
+        self.management.move_sets([it.data(0, QtCore.Qt.UserRole) for it in tobemoved],
-                                  to_parent.data(0, QtCore.Qt.ItemDataRole.UserRole), take_from,
+                                  to_parent.data(0, QtCore.Qt.UserRole), take_from,
                                   pos=-1 if append else row)
 
         self.update_indexes()
@@ -217,7 +207,7 @@ class DataTree(QtWidgets.QTreeWidget):
         while iterator.value():
             item = iterator.value()
             if item is not None:
-                data = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
+                data = item.data(0, QtCore.Qt.UserRole)
                 if data == gid_out:
                     from_parent = item
 
@@ -241,7 +231,7 @@ 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.ItemDataRole.UserRole)
+        graph_id = graph_item.data(0, QtCore.Qt.UserRole)
         sets = self.management.get_attributes(graph_id, mode)
         sets = [el[0] for el in sorted(sets.items(), key=lambda x: x[1])]
 
@@ -253,7 +243,7 @@ class DataTree(QtWidgets.QTreeWidget):
 
         for s in sets:
             for c in children:
-                if c.data(0, QtCore.Qt.ItemDataRole.UserRole) == s:
+                if c.data(0, QtCore.Qt.UserRole) == s:
                     graph_item.addChild(c)
 
         self.update_indexes()
@@ -286,7 +276,7 @@ class DataTree(QtWidgets.QTreeWidget):
         while iterator.value():
             item = iterator.value()
             if item is not None:
-                data = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
+                data = item.data(0, QtCore.Qt.UserRole)
                 if data == sid:
                     if name != item.text(0):
                         item.setText(0, name)
@@ -295,7 +285,7 @@ class DataTree(QtWidgets.QTreeWidget):
                 iterator += 1
 
     def keyPressEvent(self, evt: QtGui.QKeyEvent):
-        if evt.key() == QtCore.Qt.Key.Key_Delete:
+        if evt.key() == QtCore.Qt.Key_Delete:
             rm_sets = []
             rm_graphs = []
             for idx in self.selectedIndexes():
@@ -306,20 +296,20 @@ class DataTree(QtWidgets.QTreeWidget):
                 if item.parent() is None:
                     for c_i in range(item.childCount()):
                         # add sets inside graph to removal
-                        child_data = item.child(c_i).data(0, QtCore.Qt.ItemDataRole.UserRole)
+                        child_data = item.child(c_i).data(0, QtCore.Qt.UserRole)
                         if child_data not in rm_sets:
                             rm_sets.append(child_data)
-                    rm_graphs.append(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
+                    rm_graphs.append(item.data(0, QtCore.Qt.UserRole))
 
                 else:
-                    item_data = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
+                    item_data = item.data(0, QtCore.Qt.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.Key_Space:
+        elif evt.key() == QtCore.Qt.Key_Space:
             sets = []
             from_parent = []
 
@@ -339,7 +329,7 @@ class DataTree(QtWidgets.QTreeWidget):
             for it in sets:
                 if it in from_parent:
                     continue
-                it.setCheckState(0, QtCore.Qt.CheckState.Unchecked if it.checkState(0) == QtCore.Qt.CheckState.Checked else QtCore.Qt.CheckState.Checked)
+                it.setCheckState(0, QtCore.Qt.Unchecked if it.checkState(0) == QtCore.Qt.Checked else QtCore.Qt.Checked)
                 s1, s2 = self.data_change(it, emit=False)
                 to_be_hidden |= s2
                 to_be_shown |= s1
@@ -363,7 +353,7 @@ class DataTree(QtWidgets.QTreeWidget):
         # find all items that have to be removed
         while iterator.value():
             item = iterator.value()
-            _id = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
+            _id = item.data(0, QtCore.Qt.UserRole)
             if _id in ids:
                 try:
                     item_parent = item.parent()
@@ -420,7 +410,6 @@ 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')
@@ -441,16 +430,12 @@ class DataTree(QtWidgets.QTreeWidget):
             if i.column() == 0:
                 continue
             items.append(self.itemFromIndex(i))
-            graphs.append(self.itemFromIndex(i).data(0, QtCore.Qt.ItemDataRole.UserRole))
+            graphs.append(self.itemFromIndex(i).data(0, QtCore.Qt.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())
@@ -465,7 +450,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 = subfit_action = None
+        plt_action = save_action = extend_action = None
         menu.addSeparator()
         col_menu = menu.addMenu('Color cycle')
         for c in available_cycles.keys():
@@ -483,12 +468,12 @@ class DataTree(QtWidgets.QTreeWidget):
                 continue
 
             else:
-                graph_id = parent.data(0, QtCore.Qt.ItemDataRole.UserRole)
+                graph_id = parent.data(0, QtCore.Qt.UserRole)
                 if graph_id not in idx:
                     idx[graph_id] = []
                 # collect sets in their graph
-                idx[graph_id].append(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
+                idx[graph_id].append(item.data(0, QtCore.Qt.UserRole))
-                data = self.management[item.data(0, QtCore.Qt.ItemDataRole.UserRole)]
+                data = self.management[item.data(0, QtCore.Qt.UserRole)]
                 if data.mode == 'fit':
                     has_fits = True
 
@@ -497,7 +482,6 @@ 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())
 
@@ -505,9 +489,6 @@ 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)
 
@@ -525,10 +506,7 @@ class DataTree(QtWidgets.QTreeWidget):
             self.saveFits.emit(s)
 
         elif action == extend_action:
-            self.extendFits.emit(s, False)
+            self.extendFits.emit(s)
-
-        elif action == subfit_action:
-            self.extendFits.emit(s, True)
 
         elif action.parent() == col_menu:
             self.management.set_cycle(s, action.text())
@@ -540,7 +518,7 @@ class DataTree(QtWidgets.QTreeWidget):
         while iterator.value():
             item = iterator.value()
             if item is not None:
-                if item.data(0, QtCore.Qt.ItemDataRole.UserRole) == gid:
+                if item.data(0, QtCore.Qt.UserRole) == gid:
                     item.setBackground(0, QtGui.QBrush(QtGui.QColor('gray')))
                 else:
                     item.setBackground(0, QtGui.QBrush())
@@ -549,14 +527,11 @@ 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.ItemDataRole.UserRole) in sets:
+                if item.data(0, QtCore.Qt.UserRole) in sets:
-                    item.setCheckState(0, QtCore.Qt.CheckState.Unchecked)
+                    item.setCheckState(0, QtCore.Qt.Unchecked)
-                else:
-                    self._checked_sets.add(item.data(0, QtCore.Qt.ItemDataRole.UserRole))
                 iterator += 1
         self.blockSignals(False)
 
@@ -584,8 +559,6 @@ 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):
@@ -613,7 +586,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.ItemDataRole.UserRole))
+                sid.append(i.data(role=QtCore.Qt.UserRole))
 
         self.startShowProperty.emit(sid)
 
@@ -622,23 +595,15 @@ 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(
+                QtWidgets.QMessageBox.warning(self, 'Invalid entry',
-                    self,
+                                              'Value %r is not a valid number for `value`.' % value)
-                    '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]):
@@ -647,12 +612,6 @@ 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.ItemDataRole.DisplayRole))
+                                  item.data(QtCore.Qt.DisplayRole))
 
     @QtCore.pyqtSlot(int)
     def tab_change(self, idx: int):
@@ -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.ItemDataRole.DisplayRole, v)
+            value_item.setData(QtCore.Qt.DisplayRole, v)
 
             key_item = QtWidgets.QTableWidgetItem(k)
-            key_item.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
+            key_item.setFlags(QtCore.Qt.NoItemFlags)
             key_item.setForeground(QtGui.QBrush(QtGui.QColor(0, 0, 0)))
 
             self.setRowCount(self.rowCount()+1)

src/gui_qt/data/point_select.py

@@ -1,6 +1,6 @@
 import re
 
-from ..Qt import QtCore, QtWidgets, QtGui
+from ..Qt import QtCore, QtWidgets
 from .._py.ptstab import Ui_Form
 from ..lib.pg_objects import LogInfiniteLine, RegionItem
 
@@ -27,23 +27,15 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
         self._last_item = None
         self.connected_figure = ''
 
-        self._avg_modes = ['mean', 'sum', 'integral', 'std']
-        self._special_values = ['max', 'absmax', 'min', 'absmin']
-        self._group_modes = ['group', 'x']
-
         self.okButton.clicked.connect(self.apply)
         self.deleteButton.clicked.connect(self.remove_points)
-
         self.peaktable.itemChanged.connect(self.editing_finished)
         self.peaktable.itemDoubleClicked.connect(self.editing_started)
 
-        self.left_limit.setValidator(QtGui.QDoubleValidator())
-        self.right_limit.setValidator(QtGui.QDoubleValidator())
-
     def keyPressEvent(self, e):
-        if e.key() == QtCore.Qt.Key.Key_Delete:
+        if e.key() == QtCore.Qt.Key_Delete:
             self.remove_points()
-        elif e.key() == QtCore.Qt.Key.Key_F2:
+        elif e.key() == QtCore.Qt.Key_F2:
             self.editing_started()
         else:
             super().keyPressEvent(e)
@@ -99,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.ItemFlag.ItemIsEditable)
+        item.setFlags(item.flags() ^ QtCore.Qt.ItemIsEditable)
         self.peaktable.blockSignals(True)
         self.peaktable.addItem(item)
         self.peaktable.blockSignals(False)
@@ -110,22 +102,21 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
 
     @QtCore.pyqtSlot()
     def apply(self) -> dict:
-        ret_dic = {
+        ret_dic = {'avg_range': [self.left_pt.value(), self.right_pt.value()],
-            'avg_range': self.get_limits(),
+                   'avg_mode': {0: 'mean', 1: 'sum', 2: 'integral'}[self.average_combobox.currentIndex()],
-            'avg_mode': self._avg_modes[self.average_combobox.currentIndex()],
+                   'special': None, 'idx': None,
-            'special': None,
+                   'xy': (self.xbutton.isChecked(), self.ybutton.isChecked())}
-            'idx': None,
-            'xy': (self.xbutton.isChecked(), self.ybutton.isChecked()),
-            'groupby': self._group_modes[self.group_box.currentIndex()],
-        }
 
-        if self.special_checkbox.isChecked():
+        if self.groupBox_2.isChecked():
-            ret_dic['special'] = self._special_values[self.special_comboBox.currentIndex()]
+            ret_dic['special'] = {0: 'max', 1: 'absmax', 2: 'min', 3: 'absmin'}[self.special_comboBox.currentIndex()]
 
         if len(self.pts) != 0:
             ret_dic['idx'] = self.pts
 
-        gid = self.graph_combobox.currentData() if not self.graph_checkbox.isChecked() else ''
+        if self.graph_checkbox.isChecked():
+            gid = ''
+        else:
+            gid = self.graph_combobox.currentData()
 
         self.points_selected.emit(ret_dic, gid)
 
@@ -208,22 +199,4 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
 
     @QtCore.pyqtSlot(int, name='on_graph_checkbox_stateChanged')
     def changed_state(self, checked):
-        self.graph_combobox.setEnabled(checked != QtCore.Qt.CheckState.Checked)
+        self.graph_combobox.setEnabled(checked!=QtCore.Qt.Checked)
-
-    @QtCore.pyqtSlot(int, name='on_special_checkbox_stateChanged')
-    def changed_special(self, checked: int):
-        self.graph_combobox.setEnabled(checked != QtCore.Qt.CheckState.Checked)
-
-    def get_limits(self) -> tuple[float, float, str]:
-        try:
-            left = float(self.left_limit.text())
-        except ValueError:
-            left = 0.
-
-        try:
-            right = float(self.right_limit.text())
-        except ValueError:
-            right = 0.
-
-        return left, right, self.limit_combobox.currentText()
-

src/gui_qt/data/signaledit/phase_dialog.py

@@ -76,24 +76,38 @@ class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
         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)
+            if self._all_freq:
+                msg = QtWidgets.QMessageBox.warning(self, 'Mixed types',
+                                                    'Timesignals and spectra cannot be edited at the same time.')
+                return False
+            else:
+                self._all_time = True
+                self._all_freq = False
 
         elif isinstance(data, Spectrum):
-            valid, (real_plt, imag_plt, real_plt_fft, imag_plt_fft) = self._prep_freq(data)
+            if self._all_time:
-
+                msg = QtWidgets.QMessageBox.warning(self, 'Mixed types',
+                                                    'Timesignals and spectra cannot be edited at the same time.')
+                return False
             else:
-            return False
+                self._all_time = False
+                self._all_freq = True
 
-        if not valid:
+        fid = data.copy()
-            return False
+        spec = self._temp_fft_time(fid.x, fid.y, self.baseline_box.isChecked())
 
         x_len = data.x.size
         self.zf_spinbox.setMaximum(min(2**17//x_len, 3))
 
+        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'))
         self.time_graph.addItem(imag_plt)
         self.time_graph.addItem(real_plt)
 
+        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.freq_graph.addItem(imag_plt_fft)
         self.freq_graph.addItem(real_plt_fft)
 
@@ -104,52 +118,12 @@ class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
         for p in [self._tmp_data_zf, self._tmp_data_ap]:
             p.append((data.x, data.y.copy()))
 
+        self._tmp_data_ph.append((data.x, data.y, spec[0], spec[1]))
+
         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():
@@ -226,7 +200,7 @@ class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
             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())
+                x_fft, y_fft = self._temp_fft_time(x, y, self.baseline_box.isChecked())
 
                 if ph0 != 0:
                     y = self._temp_phase(x, y, ph0, 0, 0)
@@ -239,7 +213,7 @@ class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
         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._tmp_data_ph[i] = x, y, *self._temp_fft_time(x, y, self.baseline_box.isChecked())
 
         self._update_plots()
 
@@ -372,6 +346,7 @@ class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
         self.data = []
         self.graphs = []
         self.freq_graph.removeItem(self.pvt_line)
+        self.time_graph.removeItem(self.pvt_line)
 
         self.blockSignals(False)
 
@@ -413,16 +388,13 @@ class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
 
         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')
@@ -442,3 +414,14 @@ class QPreviewDialog(QtWidgets.QDialog, Ui_ApodEdit):
         vb = self.time_graph.getPlotItem().getViewBox()
         vb.disableAutoRange(axis=vb.YAxis)
 
+
+        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
+
+        self.freq_graph.setVisible(self._all_time)
+        if self._all_freq:
+            self.time_graph.addItem(self.pvt_line)
+        else:
+            self.freq_graph.addItem(self.pvt_line)
+
+

src/gui_qt/data/valueeditwidget.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 from typing import Any
 
 from numpy import ndarray, iscomplexobj, asarray
+from pyqtgraph import PlotDataItem
 
 from ..Qt import QtGui, QtCore, QtWidgets
 from .._py.valueeditor import Ui_MaskDialog
-from ..lib.pg_objects import PlotItem
 
 
 class ValueEditWidget(QtWidgets.QWidget, Ui_MaskDialog):
@@ -35,12 +35,12 @@ class ValueEditWidget(QtWidgets.QWidget, Ui_MaskDialog):
 
         self.tableView.setModel(self.model)
         self.tableView.setSelectionModel(self.selection_model)
-        self.tableView.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
+        self.tableView.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.tableView.customContextMenuRequested.connect(self.ctx)
 
-        self.selection_real = PlotItem(x=[], y=[], symbolSize=25, symbol='x',
+        self.selection_real = PlotDataItem(x=[], y=[], symbolSize=25, symbol='x',
                                            pen=None, symbolPen='#c9308e', symbolBrush='#c9308e')
-        self.selection_imag = PlotItem(x=[], y=[], symbolSize=25, symbol='+',
+        self.selection_imag = PlotDataItem(x=[], y=[], symbolSize=25, symbol='+',
                                            pen=None, symbolPen='#dcdcdc', symbolBrush='#dcdcdc')
 
     def __call__(self, items: dict):
@@ -133,7 +133,7 @@ class ValueEditWidget(QtWidgets.QWidget, Ui_MaskDialog):
     def keyPressEvent(self, evt):
         if evt.matches(QtGui.QKeySequence.Copy):
             self.copy_selection()
-        elif evt.key() == QtCore.Qt.Key.Key_Delete:
+        elif evt.key() == QtCore.Qt.Key_Delete:
             self.delete_item()
         else:
             super().keyPressEvent(evt)
@@ -229,7 +229,7 @@ class ValueModel(QtCore.QAbstractTableModel):
     """
     itemChanged = QtCore.pyqtSignal(int, int, str)
     load_number = 20
-    maskRole = QtCore.Qt.ItemDataRole.UserRole+321
+    maskRole = QtCore.Qt.UserRole+321
 
     def __init__(self, parent=None):
         super().__init__(parent=parent)
@@ -240,7 +240,7 @@ class ValueModel(QtCore.QAbstractTableModel):
         self.mask = None
         self.headers = ['x', 'y', '\u0394y']
         for i, hd in enumerate(self.headers):
-            self.setHeaderData(i, QtCore.Qt.Orientation.Horizontal, hd)
+            self.setHeaderData(i, QtCore.Qt.Horizontal, hd)
 
     def rowCount(self, *args, **kwargs) -> int:
         return self.total_rows
@@ -258,28 +258,25 @@ class ValueModel(QtCore.QAbstractTableModel):
         self.mask = mask.tolist()
 
         self.endResetModel()
-        self.dataChanged.emit(
+        self.dataChanged.emit(self.index(0, 0), self.index(0, 1), [QtCore.Qt.DisplayRole])
-            self.index(0, 0),
-            self.index(0, 1), [QtCore.Qt.ItemDataRole.DisplayRole]
-        )
 
-    def data(self, idx: QtCore.QModelIndex, role=QtCore.Qt.ItemDataRole.DisplayRole) -> Any:
+    def data(self, idx: QtCore.QModelIndex, role=QtCore.Qt.DisplayRole) -> Any:
         if not idx.isValid():
             return
 
         row = idx.row()
-        if role in [QtCore.Qt.ItemDataRole.DisplayRole, QtCore.Qt.ItemDataRole.EditRole]:
+        if role in [QtCore.Qt.DisplayRole, QtCore.Qt.EditRole]:
             val = self._data[row][idx.column()]
             return self.as_string(val)
 
-        elif role == QtCore.Qt.ItemDataRole.BackgroundRole:
+        elif role == QtCore.Qt.BackgroundRole:
             pal = QtGui.QGuiApplication.palette()
             if not self.mask[row]:
                 return pal.color(QtGui.QPalette.Disabled, QtGui.QPalette.Base)
             else:
                 return pal.color(QtGui.QPalette.Base)
 
-        elif role == QtCore.Qt.ItemDataRole.ForegroundRole:
+        elif role == QtCore.Qt.ForegroundRole:
             pal = QtGui.QGuiApplication.palette()
             if not self.mask[row]:
                 return pal.color(QtGui.QPalette.Disabled, QtGui.QPalette.Text)
@@ -292,7 +289,7 @@ class ValueModel(QtCore.QAbstractTableModel):
         else:
             return
 
-    def setData(self, idx: QtCore.QModelIndex, value: str | bool, role=QtCore.Qt.ItemDataRole.DisplayRole) -> Any:
+    def setData(self, idx: QtCore.QModelIndex, value: str | bool, role=QtCore.Qt.DisplayRole) -> Any:
         col, row = idx.column(), idx.row()
 
         if role == ValueModel.maskRole:
@@ -302,7 +299,7 @@ class ValueModel(QtCore.QAbstractTableModel):
             return True
 
         if value:
-            if role == QtCore.Qt.ItemDataRole.EditRole:
+            if role == QtCore.Qt.EditRole:
                 if value == self.as_string(self._data[row][col]):
                     return True
 
@@ -325,9 +322,9 @@ class ValueModel(QtCore.QAbstractTableModel):
         else:
             return False
 
-    def headerData(self, section: int, orientation, role=QtCore.Qt.ItemDataRole.DisplayRole) -> Any:
+    def headerData(self, section: int, orientation, role=QtCore.Qt.DisplayRole) -> Any:
-        if role == QtCore.Qt.ItemDataRole.DisplayRole:
+        if role == QtCore.Qt.DisplayRole:
-            if orientation == QtCore.Qt.Orientation.Horizontal:
+            if orientation == QtCore.Qt.Horizontal:
                 return self.headers[section]
             else:
                 return str(section+1)
@@ -349,7 +346,7 @@ class ValueModel(QtCore.QAbstractTableModel):
         self.endInsertRows()
 
     def flags(self, idx: QtCore.QModelIndex) -> QtCore.Qt.ItemFlag:
-        return QtCore.QAbstractTableModel.flags(self, idx) | QtCore.Qt.ItemFlag.ItemIsEditable
+        return QtCore.QAbstractTableModel.flags(self, idx) | QtCore.Qt.ItemIsEditable
 
     def removeRows(self, pos: int, rows: int, parent=None, *args, **kwargs) -> bool:
         self.beginRemoveRows(parent, pos, pos+rows-1)
@@ -385,6 +382,6 @@ class ValueModel(QtCore.QAbstractTableModel):
     @staticmethod
     def as_string(value) -> str:
         if isinstance(value, complex):
-            return f'{value.real:.13g}{value.imag:+.13g}j'
+            return f'{value.real:.8g}{value.imag:+.8g}j'
         else:
-            return f'{value:.13g}'
+            return f'{value:.8g}'

src/gui_qt/dsc/glass_dialog.py

@@ -136,8 +136,8 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
             max_x = max(max_x, data.x.max())
 
             item = QtWidgets.QListWidgetItem(name)
-            item.setCheckState(QtCore.Qt.CheckState.Checked)
+            item.setCheckState(QtCore.Qt.Checked)
-            item.setData(QtCore.Qt.ItemDataRole.UserRole, key)
+            item.setData(QtCore.Qt.UserRole, key)
             item.setForeground(mkBrush(c.rgb()))
             self.listWidget.addItem(item)
 
@@ -191,10 +191,10 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
 
         for idx in range(self.listWidget.count()):
             item = self.listWidget.item(idx)
-            if item.checkState() == QtCore.Qt.CheckState.Unchecked:
+            if item.checkState() == QtCore.Qt.Unchecked:
                 continue
 
-            key = item.data(QtCore.Qt.ItemDataRole.UserRole)
+            key = item.data(QtCore.Qt.UserRole)
             plot = self._plots[key]
             data, _ = self._dsc[key]
 
@@ -214,7 +214,7 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
             item = self.listWidget.item(idx)
 
             tree_item = QtWidgets.QTreeWidgetItem([item.text()])
-            values = self._tg_value.get(item.data(QtCore.Qt.ItemDataRole.UserRole))
+            values = self._tg_value.get(item.data(QtCore.Qt.UserRole))
 
             if values is not None:
                 for name, pos in values.items():
@@ -223,7 +223,7 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
 
                 self.tg_tree.addTopLevelItem(tree_item)
 
-            key = item.data(QtCore.Qt.ItemDataRole.UserRole)
+            key = item.data(QtCore.Qt.UserRole)
             plot = self._plots[key]
             data, _ = self._dsc[key]
 
@@ -251,7 +251,7 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
     @QtCore.pyqtSlot(QtWidgets.QListWidgetItem)
     def change_visibility(self, item: QtWidgets.QListWidgetItem):
         is_checked = bool(item.checkState())
-        plot = self._plots[item.data(QtCore.Qt.ItemDataRole.UserRole)]
+        plot = self._plots[item.data(QtCore.Qt.UserRole)]
         for val in plot:
             val.setVisible(is_checked)
 
@@ -275,10 +275,10 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
         self.tnmh_tree.clear()
         for idx in range(self.listWidget.count()):
             item = self.listWidget.item(idx)
-            if item.checkState() == QtCore.Qt.CheckState.Unchecked:
+            if item.checkState() == QtCore.Qt.Unchecked:
                 continue
 
-            key = item.data(QtCore.Qt.ItemDataRole.UserRole)
+            key = item.data(QtCore.Qt.UserRole)
 
             data = self.get_fictive(key, baselines)
 
@@ -292,7 +292,7 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
             item = self.listWidget.item(idx)
 
             tree_item = QtWidgets.QTreeWidgetItem([item.text()])
-            values = self._fit.get(item.data(QtCore.Qt.ItemDataRole.UserRole))
+            values = self._fit.get(item.data(QtCore.Qt.UserRole))
 
             if values is not None:
                 child_item = QtWidgets.QTreeWidgetItem([values.parameter_string()])
@@ -305,10 +305,10 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
         ret_dic = {}
         for idx in range(self.listWidget.count()):
             item = self.listWidget.item(idx)
-            if item.checkState() == QtCore.Qt.CheckState.Unchecked:
+            if item.checkState() == QtCore.Qt.Unchecked:
                 continue
 
-            key = item.data(QtCore.Qt.ItemDataRole.UserRole)
+            key = item.data(QtCore.Qt.UserRole)
 
             cp = None
             if self.fictive_export_check.isChecked():
@@ -332,10 +332,10 @@ class TgCalculator(QtWidgets.QWizard, Ui_DSCEvalDialog):
             m = []
             for idx in range(self.listWidget.count()):
                 item = self.listWidget.item(idx)
-                if item.checkState() == QtCore.Qt.CheckState.Unchecked:
+                if item.checkState() == QtCore.Qt.Unchecked:
                     continue
 
-                key = item.data(QtCore.Qt.ItemDataRole.UserRole)
+                key = item.data(QtCore.Qt.UserRole)
                 data, _ = self._dsc[key]
                 try:
                     tg_value = self._tg_value[key][tg_type][0]

src/gui_qt/editors/script_editor.py

@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-
-from .usermodeleditor import QUsermodelEditor
-from ..Qt import QtWidgets, QtCore, QtGui
-
-
-class QEditor(QUsermodelEditor):
-    runSignal = QtCore.pyqtSignal(str)
-
-    def __init__(self, path: str | Path = None, parent=None):
-        super().__init__(path, parent=parent)
-
-        self.add_run_button()
-
-    def add_run_button(self):
-        self.disclaimer = QtWidgets.QLabel("This is work in progress and less than perfect :(")
-        self.disclaimer.setStyleSheet('QLabel {color: rgb(255, 0, 0); font-weight: bold; font-size: 2.5em;};')
-        self.centralwidget.layout().insertWidget(0, self.disclaimer)
-
-        self.run_button = QtWidgets.QPushButton("Run")
-        self.centralwidget.layout().addWidget(self.run_button)
-
-        self.run_button.clicked.connect(self.start_script)
-
-    @QtCore.pyqtSlot()
-    def start_script(self):
-        self.runSignal.emit(self.edit_field.toPlainText())
-

src/gui_qt/fit/fit_forms.py

@@ -1,11 +1,134 @@
 from __future__ import annotations
 
+from nmreval.utils.text import convert
+
 from ..Qt import QtCore, QtWidgets, QtGui
+from .._py.fitmodelwidget import Ui_FitParameter
 from .._py.save_fitmodel_dialog import Ui_SaveDialog
 from ..lib.iconloading import get_icon
 from ..lib.tables import TableWidget
 
 
+class FitModelWidget(QtWidgets.QWidget, Ui_FitParameter):
+    value_requested = QtCore.pyqtSignal(object)
+    value_changed = QtCore.pyqtSignal(str)
+    state_changed = QtCore.pyqtSignal()
+    replace_single_value = QtCore.pyqtSignal(object)
+
+    def __init__(self, label: str = 'Fitparameter', parent=None, fixed: bool = False):
+        super().__init__(parent)
+        self.setupUi(self)
+
+        self.name = label
+
+        self.parametername.setText(convert(label) + ' ')
+
+        self.parameter_line.setText('1')
+        self.parameter_line.setMaximumWidth(160)
+        self.lineEdit.setMaximumWidth(100)
+        self.lineEdit_2.setMaximumWidth(100)
+
+        self.label_3.setText(f'< {convert(label)} <')
+
+        self.checkBox.stateChanged.connect(self.enableBounds)
+        self.global_checkbox.stateChanged.connect(lambda: self.state_changed.emit())
+        self.parameter_line.editingFinished.connect(self.update_parameter)
+        self.parameter_line.values_requested.connect(lambda: self.value_requested.emit(self))
+        self.parameter_line.replace_single_values.connect(lambda: self.replace_single_value.emit(None))
+        self.parameter_line.editingFinished.connect(lambda: self.value_changed.emit(self.parameter_line.text()))
+        self.fixed_check.toggled.connect(self.set_fixed)
+
+        if fixed:
+            self.fixed_check.hide()
+
+        self.parameter_pos = None
+        self.func_idx = None
+
+        self._linetext = '1'
+
+        self.menu = QtWidgets.QMenu(self)
+
+    def set_parameter_string(self, p: str):
+        self.parameter_line.setText(p)
+        self.parameter_line.setToolTip(p)
+
+    def set_bounds(self, lb: float, ub: float, cbox: bool = True):
+        self.checkBox.setCheckState(QtCore.Qt.Checked if cbox else QtCore.Qt.Unchecked)
+        for val, bds_line in [(lb, self.lineEdit), (ub, self.lineEdit_2)]:
+            if val is not None:
+                bds_line.setText(str(val))
+            else:
+                bds_line.setText('')
+
+    def enableBounds(self, value: int):
+        self.lineEdit.setEnabled(value == 2)
+        self.lineEdit_2.setEnabled(value == 2)
+
+    def set_parameter(self, p: float | None, bds: tuple[float, float, bool] = None,
+                      fixed: bool = None, glob: bool = None):
+        ptext = f'{p:.4g}'
+
+        self.set_parameter_string(ptext)
+
+        if bds is not None:
+            self.set_bounds(*bds)
+
+        if fixed is not None:
+            self.fixed_check.setCheckState(QtCore.Qt.Unchecked if fixed else QtCore.Qt.Checked)
+
+        if glob is not None:
+            self.global_checkbox.setCheckState(QtCore.Qt.Checked if glob else QtCore.Qt.Unchecked)
+
+    def get_parameter(self):
+        try:
+            p = float(self.parameter_line.text().replace(',', '.'))
+        except ValueError:
+            p = self.parameter_line.text().replace(',', '.')
+
+        if self.checkBox.isChecked():
+            lb_text = self.lineEdit.text()
+            lb = None
+            if lb_text:
+                try:
+                    lb = float(lb_text.replace(',', '.'))
+                except ValueError:
+                    lb = lb_text
+
+            ub_text = self.lineEdit_2.text()
+            rb = None
+            if ub_text:
+                try:
+                    rb = float(ub_text.replace(',', '.'))
+                except ValueError:
+                    rb = ub_text
+        else:
+            lb = rb = None
+
+        bounds = (lb, rb)
+
+        return p, bounds, not self.fixed_check.isChecked(), self.global_checkbox.isChecked()
+
+    @QtCore.pyqtSlot(bool)
+    def set_fixed(self, state: bool):
+        # self.global_checkbox.setVisible(not state)
+        self.frame.setVisible(not state)
+
+    @QtCore.pyqtSlot()
+    def update_parameter(self):
+        new_value = self.parameter_line.text()
+        if not new_value:
+            self.parameter_line.setText('1')
+
+        try:
+            float(new_value)
+            is_text = False
+        except ValueError:
+            is_text = True
+            self.global_checkbox.setCheckState(False)
+
+        self.set_fixed(is_text)
+
+
 class QSaveModelDialog(QtWidgets.QDialog, Ui_SaveDialog):
     def __init__(self, types=None, parent=None):
         super().__init__(parent=parent)
@@ -45,37 +168,30 @@ class FitModelTree(QtWidgets.QTreeWidget):
     treeChanged = QtCore.pyqtSignal()
     itemRemoved = QtCore.pyqtSignal(int)
 
-    counterRole = QtCore.Qt.ItemDataRole.UserRole + 1
+    counterRole = QtCore.Qt.UserRole + 1
-    operatorRole = QtCore.Qt.ItemDataRole.UserRole + 2
+    operatorRole = QtCore.Qt.UserRole + 2
 
     def __init__(self, parent=None):
         super().__init__(parent=parent)
         self.setHeaderHidden(True)
         self.setDragEnabled(True)
         self.setDragDropMode(QtWidgets.QTreeWidget.InternalMove)
-        self.setDefaultDropAction(QtCore.Qt.DropAction.MoveAction)
+        self.setDefaultDropAction(QtCore.Qt.MoveAction)
 
         self.itemSelectionChanged.connect(lambda: self.treeChanged.emit())
 
     def keyPressEvent(self, evt):
-        operators = [
+        operators = [QtCore.Qt.Key_Plus, QtCore.Qt.Key_Asterisk,
-            QtCore.Qt.Key.Key_Plus,
+                     QtCore.Qt.Key_Minus, QtCore.Qt.Key_Slash]
-            QtCore.Qt.Key.Key_Asterisk,
-            QtCore.Qt.Key.Key_Minus,
-            QtCore.Qt.Key.Key_Slash
-        ]
 
-        if evt.key() == QtCore.Qt.Key.Key_Delete:
+        if evt.key() == QtCore.Qt.Key_Delete:
             for item in self.selectedItems():
                 self.remove_function(item)
 
-        elif evt.key() == QtCore.Qt.Key.Key_Space:
+        elif evt.key() == QtCore.Qt.Key_Space:
-            for item in self.selectedItems():
+            for item in self.treeWidget.selectedItems():
-                cs = item.checkState(0)
+                item.setCheckState(0, QtCore.Qt.Checked) if item.checkState(
-                if cs == QtCore.Qt.CheckState.Unchecked:
+                    0) == QtCore.Qt.Unchecked else item.setCheckState(0, QtCore.Qt.Unchecked)
-                    item.setCheckState(0, QtCore.Qt.CheckState.Checked)
-                else:
-                    item.setCheckState(0, QtCore.Qt.CheckState.Unchecked)
 
         elif evt.key() in operators:
             idx = operators.index(evt.key())
@@ -126,7 +242,7 @@ class FitModelTree(QtWidgets.QTreeWidget):
                 color = QtGui.QColor(color)
 
         it = QtWidgets.QTreeWidgetItem()
-        it.setData(0, QtCore.Qt.ItemDataRole.UserRole, idx)
+        it.setData(0, QtCore.Qt.UserRole, idx)
         it.setData(0, self.counterRole, cnt)
         it.setData(0, self.operatorRole, op)
         it.setText(0, name)
@@ -137,7 +253,7 @@ class FitModelTree(QtWidgets.QTreeWidget):
         it.setForeground(0, QtGui.QBrush(color))
 
         it.setIcon(0, get_icon(self.icons[op]))
-        it.setCheckState(0, QtCore.Qt.CheckState.Checked if active else QtCore.Qt.CheckState.Unchecked)
+        it.setCheckState(0, QtCore.Qt.Checked if active else QtCore.Qt.Unchecked)
 
         if parent is None:
             self.addTopLevelItem(it)
@@ -157,7 +273,7 @@ class FitModelTree(QtWidgets.QTreeWidget):
     def get_selected(self):
         try:
             it = self.selectedItems()[0]
-            function_nr = it.data(0, QtCore.Qt.ItemDataRole.UserRole)
+            function_nr = it.data(0, QtCore.Qt.UserRole)
             idx = it.data(0, self.counterRole)
 
         except IndexError:
@@ -180,10 +296,10 @@ class FitModelTree(QtWidgets.QTreeWidget):
             it = parent.child(i)
 
             child = {
-                'idx': it.data(0, QtCore.Qt.ItemDataRole.UserRole),
+                'idx': it.data(0, QtCore.Qt.UserRole),
                 'op': it.data(0, self.operatorRole),
                 'pos': pos,
-                'active': (it.checkState(0) == QtCore.Qt.CheckState.Checked),
+                'active': (it.checkState(0) == QtCore.Qt.Checked),
                 'children': []
             }
 
@@ -251,8 +367,8 @@ class FitTableWidget(TableWidget):
 
         for (sid, name) in set_ids:
             item = QtWidgets.QTableWidgetItem(name)
-            item.setCheckState(QtCore.Qt.CheckState.Checked)
+            item.setCheckState(QtCore.Qt.Checked)
-            item.setData(QtCore.Qt.ItemDataRole.UserRole+1, sid)
+            item.setData(QtCore.Qt.UserRole+1, sid)
             row = self.rowCount()
             self.setRowCount(row+1)
             self.setItem(row, 0, item)
@@ -270,15 +386,15 @@ class FitTableWidget(TableWidget):
 
         for i in range(self.rowCount()):
             item = self.item(i, 0)
-            if item.checkState() == QtCore.Qt.CheckState.Checked:
+            if item.checkState() == QtCore.Qt.Checked:
                 mod = self.cellWidget(i, 1).currentData()
                 if mod is None:
                     mod = default
 
                 if include_name:
-                    arg = (item.data(QtCore.Qt.ItemDataRole.UserRole+1), item.text())
+                    arg = (item.data(QtCore.Qt.UserRole+1), item.text())
                 else:
-                    arg = item.data(QtCore.Qt.ItemDataRole.UserRole+1)
+                    arg = item.data(QtCore.Qt.UserRole+1)
 
                 if mod not in data:
                     data[mod] = []
@@ -291,8 +407,8 @@ class FitTableWidget(TableWidget):
         for i in range(self.rowCount()):
             item = self.item(i, 0)
             if include_name:
-                ret_val.append((item.data(QtCore.Qt.ItemDataRole.UserRole+1), item.text()))
+                ret_val.append((item.data(QtCore.Qt.UserRole+1), item.text()))
             else:
-                ret_val.append(item.data(QtCore.Qt.ItemDataRole.UserRole+1))
+                ret_val.append(item.data(QtCore.Qt.UserRole+1))
 
         return ret_val

src/gui_qt/fit/fit_parameter.py

@@ -1,24 +1,25 @@
 from __future__ import annotations
 
+from typing import Optional
+
 from nmreval.fit.parameter import Parameter
 from nmreval.utils.text import convert
 
 from ..Qt import QtWidgets, QtCore, QtGui
 from .._py.fitfuncwidget import Ui_FormFit
-from .._py.fitmodelwidget import Ui_FitParameter
 from ..lib.forms import SelectionWidget
+from .fit_forms import FitModelWidget
 
 
 class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
     value_requested = QtCore.pyqtSignal(int)
 
-    def __init__(self, func_id: int, parent=None):
+    def __init__(self, parent=None):
         super().__init__(parent=parent)
         self.setupUi(self)
 
         self.func = None
         self.func_idx = None
-        self.func_id = func_id
         self.max_width = QtCore.QSize(0, 0)
         self.global_parameter = []
         self.data_parameter = []
@@ -29,15 +30,16 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
         self.scrollwidget2.setLayout(QtWidgets.QVBoxLayout())
 
     def eventFilter(self, src: QtCore.QObject, evt: QtCore.QEvent):
-        modifiers = QtCore.Qt.KeyboardModifier.ControlModifier | QtCore.Qt.KeyboardModifier.ShiftModifier
         if isinstance(evt, QtGui.QKeyEvent):
-            if (evt.key() == QtCore.Qt.Key.Key_Right) and (evt.modifiers() == modifiers):
+            if (evt.key() == QtCore.Qt.Key_Right) and \
+                    (evt.modifiers() == QtCore.Qt.ControlModifier | QtCore.Qt.ShiftModifier):
                 self.change_single_parameter(src.value, sender=src)
                 self.select_next_preview(1)
 
                 return True
 
-            elif (evt.key() == QtCore.Qt.Key.Key_Left) and (evt.modifiers() == modifiers):
+            elif (evt.key() == QtCore.Qt.Key_Left) and \
+                    (evt.modifiers() == QtCore.Qt.ControlModifier | QtCore.Qt.ShiftModifier):
                 self.change_single_parameter(src.value, sender=src)
                 self.select_next_preview(-1)
 
@@ -63,7 +65,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
         self.glob_values = [1] * len(func.params)
 
         for k, v in enumerate(func.params):
-            widgt = ParameterGlobalWidget(name=v, parent=self.scrollwidget)
+            widgt = FitModelWidget(label=v, parent=self.scrollwidget)
             widgt.parameter_pos = k
             widgt.func_idx = idx
             try:
@@ -93,7 +95,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
         for w1, w2 in zip(self.global_parameter, self.data_parameter):
             w1.parametername.setFixedSize(self.max_width)
             w1.checkBox.setFixedSize(self.max_width)
-            w2.parametername.setFixedSize(self.max_width)
+            w2.label.setFixedSize(self.max_width)
 
         if hasattr(func, 'choices') and func.choices is not None:
             cbox = func.choices
@@ -173,7 +175,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
         # disable single parameter if it is set global, enable if global is unset
         widget = self.sender()
         idx = self.global_parameter.index(widget)
-        enable = (widget.global_checkbox.checkState() == QtCore.Qt.CheckState.Unchecked)
+        enable = (widget.global_checkbox.checkState() == QtCore.Qt.Unchecked)
         self.data_parameter[idx].setEnabled(enable)
 
     def select_next_preview(self, direction):
@@ -213,7 +215,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
         param_general = []
 
         for g in self.global_parameter:
-            if isinstance(g, ParameterGlobalWidget):
+            if isinstance(g, FitModelWidget):
                 p_i, bds_i, fixed_i, global_i = g.get_parameter()
                 parameter_i = Parameter(name=g.name, value=p_i, lb=bds_i[0], ub=bds_i[1], var=fixed_i)
                 param_general.append(parameter_i)
@@ -234,7 +236,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
             p = []
 
             for i, (p_i, g) in enumerate(zip(parameter, self.global_parameter)):
-                if isinstance(g, ParameterGlobalWidget):
+                if isinstance(g, FitModelWidget):
                     if (p_i is None) or is_global[i]:
                         # set has no oen value
                         p.append(param_general[i].copy())
@@ -301,11 +303,9 @@ class ParameterSingleWidget(QtWidgets.QWidget):
         self._init_ui()
 
         self.name = name
-        self.parametername.setText(convert(name))
+        self.label.setText(convert(name))
-        self.parametername.setToolTip(
+        self.label.setToolTip('If this is bold then this parameter is only for this data. '
-            'If this is bold then this parameter is only for this data. '
+                              'Otherwise, the general parameter is used and displayed')
-            'Otherwise, the general parameter is used and displayed'
-        )
 
         # self.value_line.setValidator(QtGui.QDoubleValidator())
         self.value_line.textChanged.connect(lambda: self.valueChanged.emit(self.value) if self.value is not None else 0)
@@ -316,8 +316,8 @@ class ParameterSingleWidget(QtWidgets.QWidget):
         layout.setContentsMargins(2, 2, 2, 2)
         layout.setSpacing(2)
 
-        self.parametername = QtWidgets.QLabel(self)
+        self.label = QtWidgets.QLabel(self)
-        layout.addWidget(self.parametername)
+        layout.addWidget(self.label)
 
         layout.addSpacerItem(QtWidgets.QSpacerItem(0, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
 
@@ -343,137 +343,9 @@ class ParameterSingleWidget(QtWidgets.QWidget):
     def value(self, val):
         # self.value_line.setText(f'{float(val):.5g}')
         self.value_line.setText(f'{val}')
-        self.value_line.setCursorPosition(0)
 
     def show_as_local_parameter(self, is_local: bool):
         if is_local:
-            self.parametername.setStyleSheet('font-weight: bold;')
+            self.label.setStyleSheet('font-weight: bold;')
         else:
-            self.parametername.setStyleSheet('')
+            self.label.setStyleSheet('')
-
-
-class ParameterGlobalWidget(QtWidgets.QWidget, Ui_FitParameter):
-    """
-    Widget to show a global parameter
-    """
-
-    value_requested = QtCore.pyqtSignal(object)
-    value_changed = QtCore.pyqtSignal(str)
-    state_changed = QtCore.pyqtSignal()
-    replace_single_value = QtCore.pyqtSignal(object)
-
-    def __init__(self, name: str = 'Fitparameter', parent=None, fixed: bool = False):
-        super().__init__(parent)
-        self.setupUi(self)
-
-        self.name = name
-        self.reset_button.setVisible(False)
-
-        self.parametername.setText(convert(name) + ' ')
-
-        self.parameter_line.setText('1')
-        self.parameter_line.setMaximumWidth(160)
-        self.lineEdit.setMaximumWidth(100)
-        self.lineEdit_2.setMaximumWidth(100)
-
-        self.label_3.setText(f'< {convert(name)} <')
-
-        self.checkBox.stateChanged.connect(self.enableBounds)
-        self.global_checkbox.stateChanged.connect(lambda: self.state_changed.emit())
-        self.parameter_line.editingFinished.connect(self.update_parameter)
-        self.parameter_line.values_requested.connect(lambda: self.value_requested.emit(self))
-        self.parameter_line.replace_single_values.connect(lambda: self.replace_single_value.emit(None))
-        self.parameter_line.editingFinished.connect(lambda: self.value_changed.emit(self.parameter_line.text()))
-        self.fixed_check.toggled.connect(self.set_fixed)
-
-        if fixed:
-            self.fixed_check.hide()
-
-        self.reset_button.setVisible(False)
-
-        self.parameter_pos = None
-        self.func_idx = None
-
-        self._linetext = '1'
-
-        self.menu = QtWidgets.QMenu(self)
-
-    def set_parameter_string(self, p: str):
-        self.parameter_line.setText(p)
-        self.parameter_line.setToolTip(p)
-
-    def set_bounds(self, lb: float, ub: float, cbox: bool = True):
-        self.checkBox.setCheckState(QtCore.Qt.CheckState.Checked if cbox else QtCore.Qt.CheckState.Unchecked)
-        for val, bds_line in [(lb, self.lineEdit), (ub, self.lineEdit_2)]:
-            if val is not None:
-                bds_line.setText(str(val))
-            else:
-                bds_line.setText('')
-
-    def enableBounds(self, value: int):
-        self.lineEdit.setEnabled(value == 2)
-        self.lineEdit_2.setEnabled(value == 2)
-
-    def set_parameter(self, p: float | None, bds: tuple[float, float, bool] = None,
-                      fixed: bool = None, glob: bool = None):
-        ptext = f'{p:.4g}'
-
-        self.set_parameter_string(ptext)
-
-        if bds is not None:
-            self.set_bounds(*bds)
-
-        if fixed is not None:
-            self.fixed_check.setCheckState(QtCore.Qt.CheckState.Unchecked if fixed else QtCore.Qt.CheckState.Checked)
-
-        if glob is not None:
-            self.global_checkbox.setCheckState(QtCore.Qt.CheckState.Checked if glob else QtCore.Qt.CheckState.Unchecked)
-
-    def get_parameter(self):
-        try:
-            p = float(self.parameter_line.text().replace(',', '.'))
-        except ValueError:
-            p = self.parameter_line.text().replace(',', '.')
-
-        if self.checkBox.isChecked():
-            lb_text = self.lineEdit.text()
-            lb = None
-            if lb_text:
-                try:
-                    lb = float(lb_text.replace(',', '.'))
-                except ValueError:
-                    lb = lb_text
-
-            ub_text = self.lineEdit_2.text()
-            rb = None
-            if ub_text:
-                try:
-                    rb = float(ub_text.replace(',', '.'))
-                except ValueError:
-                    rb = ub_text
-        else:
-            lb = rb = None
-
-        bounds = (lb, rb)
-
-        return p, bounds, not self.fixed_check.isChecked(), self.global_checkbox.isChecked()
-
-    @QtCore.pyqtSlot(bool)
-    def set_fixed(self, state: bool):
-        # self.global_checkbox.setVisible(not state)
-        self.frame.setVisible(not state)
-
-    @QtCore.pyqtSlot()
-    def update_parameter(self):
-        new_value = self.parameter_line.text()
-        if not new_value:
-            self.parameter_line.setText('1')
-
-        try:
-            float(new_value)
-            is_text = False
-        except ValueError:
-            is_text = True
-            self.global_checkbox.setCheckState(False)
-
-        self.set_fixed(is_text or self.fixed_check.isChecked())

src/gui_qt/fit/fit_toolbar.py

@@ -1,99 +0,0 @@
-from ..Qt import QtWidgets, QtGui, QtCore
-from ..lib.iconloading import get_icon
-from ..lib.pg_objects import RegionItem
-
-
-class FitToolbar(QtWidgets.QToolBar):
-    def __init__(
-            self,
-            fitaction: QtWidgets.QAction,
-            limit_menu: QtWidgets.QMenu,
-            parent=None,
-    ):
-        super().__init__('Fit', parent=parent)
-
-        self.fit_action = fitaction
-        self.region = RegionItem()
-        self.addAction(fitaction)
-
-        self.fitlim_button = QtWidgets.QToolButton(self)
-        self.fitlim_button.setMenu(limit_menu)
-        self.fitlim_button.setPopupMode(self.fitlim_button.InstantPopup)
-        self.fitlim_button.setIcon(get_icon('fit_region'))
-        self.addWidget(self.fitlim_button)
-
-        self.label = QtWidgets.QLabel(self)
-        self.label.setText('L: ')
-        self.addWidget(self.label)
-        self.label.setEnabled(False)
-
-        self.lineedit = QtWidgets.QLineEdit(self)
-        self.lineedit.setValidator(QtGui.QDoubleValidator())
-        self.lineedit.setMaximumWidth(92)
-        self.addWidget(self.lineedit)
-        self.lineedit.setEnabled(False)
-
-        self.label2 = QtWidgets.QLabel(self)
-        self.label2.setText(' R: ')
-        self.addWidget(self.label2)
-        self.label2.setEnabled(False)
-
-        self.lineedit2 = QtWidgets.QLineEdit(self)
-        self.lineedit2.setValidator(QtGui.QDoubleValidator())
-        self.addWidget(self.lineedit2)
-        self.lineedit2.setMaximumWidth(92)
-        self.lineedit2.setEnabled(False)
-
-        self.limit_group = QtWidgets.QActionGroup(self)
-        for ac in limit_menu.actions():
-            self.limit_group.addAction(ac)
-
-        self.limit_group.triggered.connect(self.change_limit_type)
-
-        self.region.sigRegionChanged.connect(self.change_labels)
-        self.change_labels()
-
-        self.lineedit.textChanged.connect(self.move_region)
-        self.lineedit2.textChanged.connect(self.move_region)
-
-    @QtCore.pyqtSlot(QtWidgets.QAction)
-    def change_limit_type(self, action: QtWidgets.QAction):
-        is_custom = (action.text() in ['Custom', 'Exclude region'])
-        print(is_custom)
-
-        for w in [self.label, self.label2, self.lineedit, self.lineedit2]:
-            w.setEnabled(is_custom)
-
-    def change_labels(self):
-        r = self.region.getRegion()
-        self.lineedit.blockSignals(True)
-        self.lineedit.setText(f'{r[0]:.4g}')
-        self.lineedit.blockSignals(False)
-
-        self.lineedit2.blockSignals(True)
-        self.lineedit2.setText(f'{r[1]:.4g}')
-        self.lineedit2.blockSignals(False)
-
-    def move_region(self):
-        try:
-            r_min = float(self.lineedit.text())
-        except ValueError:
-            r_min = None
-
-        try:
-            r_max = float(self.lineedit2.text())
-        except ValueError:
-            r_max = None
-
-        if r_min is not None and r_max is not None:
-            self.region.setRegion((r_min, r_max), use_log=True)
-
-    def get_limit(self):
-        action_text = self.limit_group.checkedAction().text()
-
-        return {
-            'None': 'none',
-            'Visible x range': 'x',
-            'Custom': ('in', self.region.getRegion()),
-            'Exclude region': ('out', self.region.getRegion()),
-        }[action_text]

src/gui_qt/fit/fitfunction.py

@@ -6,7 +6,6 @@ from nmreval.configs import config_paths
 from nmreval import models
 from nmreval.lib.importer import find_models
 from nmreval.lib.colors import BaseColor, Tab10
-from nmreval.lib.logger import logger
 from nmreval.utils.text import convert
 
 from ..lib.iconloading import get_icon
@@ -51,17 +50,8 @@ class QFunctionWidget(QtWidgets.QWidget, Ui_Form):
         user_defined = []
         try:
             user_defined = find_models(config_paths() / 'usermodels.py')
-        except Exception as e:
+        except FileNotFoundError:
-            import traceback, sys
+            pass
-
-            exc_type, exc_value, exc_traceback = sys.exc_info()
-
-            _ = QtWidgets.QMessageBox.warning(
-                self,
-                'No user functions',
-                f'Loading user-defined function failed with exception:\n'
-                f'{"".join(traceback.format_exception(exc_type, exc_value, exc_traceback, limit=1))}')
-            logger.exception("Invalid usermodels.py", exc_info=e)
 
         for model in user_defined:
             name = model.__name__
@@ -165,7 +155,7 @@ class QFunctionWidget(QtWidgets.QWidget, Ui_Form):
         self.iscomplex = False
         while iterator.value():
             item = iterator.value()
-            f = self.functions[item.data(0, QtCore.Qt.ItemDataRole.UserRole)]
+            f = self.functions[item.data(0, QtCore.Qt.UserRole)]
             if hasattr(f, 'iscomplex') and f.iscomplex:
                 self.iscomplex = True
                 break
@@ -226,7 +216,7 @@ class QFunctionWidget(QtWidgets.QWidget, Ui_Form):
         iterator = QtWidgets.QTreeWidgetItemIterator(self.functree)
         while iterator.value():
             item = iterator.value()
-            f = self.functions[item.data(0, QtCore.Qt.ItemDataRole.UserRole)]
+            f = self.functions[item.data(0, QtCore.Qt.UserRole)]
             cnt = item.data(0, self.functree.counterRole)
             all_parameters[f'{f.name}_{cnt}'] = [(convert(pp, new='str'), (cnt, i)) for i, pp in enumerate(f.params)]
 
@@ -235,19 +225,7 @@ class QFunctionWidget(QtWidgets.QWidget, Ui_Form):
         return all_parameters
 
     def get_complex_state(self):
-        iscomplex = False
+        return self.complex_comboBox.currentIndex() if self.iscomplex else None
-        iterator = QtWidgets.QTreeWidgetItemIterator(self.functree)
-        while iterator.value():
-            item = iterator.value()
-            if item.checkState(0) != QtCore.Qt.CheckState.Unchecked:
-                f = self.functions[item.data(0, QtCore.Qt.ItemDataRole.UserRole)]
-                if hasattr(f, 'iscomplex') and f.iscomplex:
-                    iscomplex = True
-                    break
-
-            iterator += 1
-
-        return self.complex_comboBox.currentIndex() if iscomplex else None
 
     def set_complex_state(self, state):
         if state is not None:

src/gui_qt/fit/fitwindow.py

@@ -9,6 +9,7 @@ import numpy as np
 from pyqtgraph import mkPen
 
 from nmreval.fit._meta import MultiModel, ModelFactory
+from nmreval.fit.data import Data
 from nmreval.fit.model import Model
 from nmreval.fit.parameter import Parameters
 from nmreval.fit.result import FitResult
@@ -41,8 +42,8 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
         self._management = mgmt
 
         self._current_model = next(QFitDialog.model_cnt)
-        self.show_combobox.setItemData(0, self._current_model, QtCore.Qt.ItemDataRole.UserRole)
+        self.show_combobox.setItemData(0, self._current_model, QtCore.Qt.UserRole)
-        self.default_combobox.setItemData(0, self._current_model, QtCore.Qt.ItemDataRole.UserRole)
+        self.default_combobox.setItemData(0, self._current_model, QtCore.Qt.UserRole)
 
         self.data_table = FitTableWidget(self.data_widget)
         self.data_widget.addWidget(self.data_table)
@@ -77,12 +78,8 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
         """
         w = self.param_widgets[idx]
         self.stackedWidget.removeWidget(w)
-        w.setParent(None)
         w.deleteLater()
         del self.param_widgets[idx]
-        _, func_id = self.functionwidget.get_selected()
-
-        self.get_functions()
 
         self._current_function = None
         if len(self.param_widgets) == 0:
@@ -108,7 +105,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
             if function is None:
                 return
 
-            dialog = QFitParameterWidget(function_id, self.stackedWidget)
+            dialog = QFitParameterWidget(self.stackedWidget)
             data_names = self.data_table.data_list(include_name=True)
 
             dialog.set_function(function, function_idx)
@@ -153,9 +150,9 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
 
         # deselect all fit sets
         for i in range(self.data_table.rowCount()):
-            data_id = self.data_table.item(i, 0).data(QtCore.Qt.ItemDataRole.UserRole+1)
+            data_id = self.data_table.item(i, 0).data(QtCore.Qt.UserRole+1)
             if self._management[data_id].mode == 'fit' or self._management[data_id].has_relation(Relations.isFitPartOf):
-                self.data_table.item(i, 0).setCheckState(QtCore.Qt.CheckState.Unchecked)
+                self.data_table.item(i, 0).setCheckState(QtCore.Qt.Unchecked)
 
         if self.models:
             for m in self.models.keys():
@@ -179,7 +176,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
 
         self.default_combobox.addItem('Model '+idx, userData=idx)
         self.show_combobox.addItem('Model '+idx, userData=idx)
-        self.show_combobox.setItemData(self.show_combobox.count()-1, idx, QtCore.Qt.ItemDataRole.UserRole)
+        self.show_combobox.setItemData(self.show_combobox.count()-1, idx, QtCore.Qt.UserRole)
         self.show_combobox.setCurrentIndex(self.show_combobox.count()-1)
 
         self._current_model = idx
@@ -193,7 +190,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
         self.get_functions()
         self.functionwidget.clear()
 
-        self._current_model = self.show_combobox.itemData(idx, QtCore.Qt.ItemDataRole.UserRole)
+        self._current_model = self.show_combobox.itemData(idx, QtCore.Qt.UserRole)
         if self._current_model in self.models and len(self.models[self._current_model]):
             for el in self.models[self._current_model]:
                 self.functionwidget.add_function(**el)
@@ -210,7 +207,9 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
 
         for m in self.models[model_id]:
             func_id = m['cnt']
-            self.remove_function(func_id)
+            self.stackedWidget.removeWidget(self.param_widgets[func_id])
+
+            self.param_widgets.pop(func_id)
 
         self._complex.pop(model_id)
         self._func_list.pop(model_id)
@@ -221,14 +220,8 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
         if len(self.models) == 1:
             self.model_frame.hide()
 
-    def _prepare(
+    def _prepare(self, model: list, function_use: list = None,
-            self,
+                 parameter: dict = None, add_idx: bool = False, cnt: int = 0) -> tuple[dict, int]:
-            model: list,
-            function_use: list = None,
-            parameter: dict = None,
-            add_idx: bool = False,
-            cnt: int = 0,
-    ) -> tuple[dict, int]:
 
         if parameter is None:
             parameter = {
@@ -271,7 +264,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
 
             if f['children']:
                 # recurse for children
-                _, cnt = self._prepare(f['children'], parameter=parameter, function_use=function_use, add_idx=add_idx, cnt=cnt)
+                _, cnt = self._prepare(f['children'], parameter=parameter, add_idx=add_idx, cnt=cnt)
 
         return parameter, cnt
 
@@ -283,20 +276,17 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
 
         func_dict = {}
         for model_name, model_parameter in self.models.items():
-            func, order, param_len, _ = ModelFactory.create_from_list(model_parameter)
+            func, order, param_len = ModelFactory.create_from_list(model_parameter)
-            multiple_funcs = isinstance(func, MultiModel)
+
             if func is None:
                 continue
 
             func = Model(func)
 
             if model_name in data:
-                parameter, _ = self._prepare(model_parameter, function_use=data[model_name], add_idx=multiple_funcs)
+                parameter, _ = self._prepare(model_parameter, function_use=data[model_name], add_idx=isinstance(func, MultiModel))
 
-                if parameter is None or not isinstance(parameter, dict):
+                if parameter is None:
-                    return
-
-                if ('data_parameter' not in parameter) or ('global_parameter' not in parameter):
                     return
 
                 for (data_parameter, _) in parameter['data_parameter'].values():
@@ -395,7 +385,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
 
         func_dict = {}
         for k, mod in self.models.items():
-            func, order, param_len, _ = ModelFactory.create_from_list(mod)
+            func, order, param_len = ModelFactory.create_from_list(mod)
             multiple_funcs = isinstance(func, MultiModel)
 
             if k in data:
@@ -503,7 +493,7 @@ class QFitDialog(QtWidgets.QWidget, Ui_FitDialog):
             if model_p['active']:
                 cnt += self.param_widgets[model_p['cnt']].set_parameter(fit_id, param[cnt:])
                 if model_p['children']:
-                    cnt = self.set_parameter_iter(fit_id, param, model_p['children'], cnt=cnt)
+                    cnt += self.set_parameter_iter(fit_id, param, model_p['children'], cnt=cnt)
 
         return cnt
 

src/gui_qt/fit/function_creation_dialog.py

@@ -8,9 +8,9 @@ from typing import Any
 
 import numpy as np
 
-from ..Qt import QtCore, QtWidgets, QtGui
+from gui_qt.Qt import QtCore, QtWidgets, QtGui
-from .._py.fitcreationdialog import Ui_Dialog
+from gui_qt._py.fitcreationdialog import Ui_Dialog
-from ..editors.namespace import QNamespaceWidget
+from gui_qt.lib.namespace import QNamespaceWidget
 
 __all__ = ['QUserFitCreator']
 
@@ -48,13 +48,13 @@ class QUserFitCreator(QtWidgets.QDialog, Ui_Dialog):
 
         self.update_function()
 
-    def __call__(self, filepath: str | pathlib.Path):
+    def __call__(self, filepath: str|pathlib.Path):
         self.filepath = pathlib.Path(filepath)
 
         return self
 
     def update_function(self):
-        prev_text = self.editor.toPlainText().split('\n')
+        prev_text = self.plainTextEdit.toPlainText().split('\n')
         func_body = ''
         in_body = False
         for line in prev_text:
@@ -89,12 +89,9 @@ class QUserFitCreator(QtWidgets.QDialog, Ui_Dialog):
             else:
                 k += f'    def func(x):\n'
 
-            if func_body:
             k += func_body
-            else:
-                k += '        return x'
 
-            self.editor.setPlainText(k)
+            self.plainTextEdit.setPlainText(k)
         except Exception as e:
             QtWidgets.QMessageBox.warning(self, 'Failure', f'Error found: {e.args[0]}')
 
@@ -218,7 +215,7 @@ class KwargsWidget(QtWidgets.QWidget):
         for i in range(self.choices.count()):
             kwargs.append(self.choices.widget(i).get_strings())
         if kwargs:
-            return f"    choices = [{', '.join(kwargs)}]\n"
+            return f"    choices = {', '.join(kwargs)}\n"
         else:
             return ''
 
@@ -478,3 +475,12 @@ class DescWidget(QtWidgets.QWidget):
                   f"    equation = r'{self.eq_lineedit.text()}'\n"
 
         return stringi
+
+
+if __name__ == '__main__':
+    import sys
+    app = QtWidgets.QApplication([])
+    win = QUserFitCreator()
+    win.show()
+
+    sys.exit(app.exec())

src/gui_qt/fit/result.py

@@ -1,9 +1,6 @@
-from __future__ import annotations
-
 from math import isnan
 
-from pyqtgraph import mkBrush, mkPen, mkColor
+from pyqtgraph import mkBrush, mkPen
-from numpy import abs as np_abs, isfinite as np_isfinite
 
 from nmreval.utils.text import convert
 from ..lib.graph_items import logTickValues
@@ -18,7 +15,7 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
     closed = QtCore.pyqtSignal(dict, list, str, bool, bool, list)
     redoFit = QtCore.pyqtSignal(dict)
 
-    def __init__(self, results: list, sub_colors: dict, management, parent=None):
+    def __init__(self, results: list, management, parent=None):
         super().__init__(parent=parent)
         self.setupUi(self)
 
@@ -30,14 +27,12 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
         self.extrapolate_box.stateChanged.connect(lambda x: self.maxx_line.setEnabled(x))
         self.extrapolate_box.stateChanged.connect(lambda x: self.minx_line.setEnabled(x))
         self.extrapolate_box.stateChanged.connect(lambda x: self.numx_line.setEnabled(x))
-        self.extrapolate_box.stateChanged.connect(lambda x: self.newx_log_checkbox.setEnabled(x))
 
         self._previous_fits = {}
         self._opts = []
         self._results = {}
         self.graph_opts = {}
         self.last_idx = None
-        self.func_colors = sub_colors
 
         self.fit_plot = self.graphicsView.addPlot(row=1, col=0, title='Fit')
         self.resid_plot = self.graphicsView.addPlot(row=0, col=0, title='Residual')
@@ -49,29 +44,21 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
         self.graphicsView.ci.layout.setRowStretchFactor(0, 1)
         self.graphicsView.ci.layout.setRowStretchFactor(1, 2)
 
-        self.resid_graph = PlotItem(
+        self.resid_graph = PlotItem(x=[], y=[],
-            x=[], y=[],
                                     symbol='o', symbolPen=None, symbolBrush=mkBrush(color=(31, 119, 180)),
-            pen=None
+                                    pen=None)
-        )
+        self.resid_graph_imag = PlotItem(x=[], y=[],
-        self.resid_graph_imag = PlotItem(
-            x=[], y=[],
                                          symbol='s', symbolPen=None, symbolBrush=mkBrush(color=(255, 127, 14)),
-            pen=None
+                                         pen=None)
-        )
         self.resid_plot.addItem(self.resid_graph)
         self.resid_plot.addItem(self.resid_graph_imag)
 
-        self.data_graph = PlotItem(
+        self.data_graph = PlotItem(x=[], y=[],
-            x=[], y=[],
                                    symbol='o', symbolPen=None, symbolBrush=mkBrush(color=(31, 119, 180)),
-            pen=None
+                                   pen=None)
-        )
+        self.data_graph_imag = PlotItem(x=[], y=[],
-        self.data_graph_imag = PlotItem(
-            x=[], y=[],
                                         symbol='s', symbolPen=None, symbolBrush=mkBrush(color=(255, 127, 14)),
-            pen=None
+                                        pen=None)
-        )
         self.fit_plot.addItem(self.data_graph)
         self.fit_plot.addItem(self.data_graph_imag)
 
@@ -82,26 +69,21 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
 
         self.cmap = RdBuCMap(vmin=-1, vmax=1)
 
-        self.graph_checkBox.stateChanged.connect(
+        self.graph_checkBox.stateChanged.connect(lambda x: self.graph_comboBox.setEnabled(x == QtCore.Qt.Unchecked))
-            lambda x: self.graph_comboBox.setEnabled(x == QtCore.Qt.CheckState.Unchecked)
-        )
 
         self.logy_box.stateChanged.connect(lambda x: self.fit_plot.setLogMode(y=bool(x)))
         self.logx_box.stateChanged.connect(lambda x: self.fit_plot.setLogMode(x=bool(x)))
         self.resid_plot.setXLink(self.fit_plot)
 
-        self.buttonGroup.buttonToggled.connect(self._plot_residuals)
-
         self.set_results(results)
 
-    def __call__(self, results: list, sub_colors: dict):
+    def __call__(self, results: list):
         self._previous_fits = {}
         self.sets_comboBox.blockSignals(True)
         self.sets_comboBox.clear()
         self.sets_comboBox.blockSignals(False)
         self._results = {}
         self._opts = {}
-        self.func_colors = sub_colors
 
         self.set_results(results)
 
@@ -130,7 +112,7 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
 
     @QtCore.pyqtSlot(int, name='on_sets_comboBox_currentIndexChanged')
     def set_parameter(self, idx: int):
-        set_id = self.sets_comboBox.itemData(idx, QtCore.Qt.ItemDataRole.UserRole)
+        set_id = self.sets_comboBox.itemData(idx, QtCore.Qt.UserRole)
 
         res = self._results[set_id]
         self.param_tableWidget.setRowCount(len(res.parameter))
@@ -156,11 +138,11 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
     def change_opts(self, _):
         idx = self.sets_comboBox.currentIndex()
 
-        self._opts[idx] = (self.reject_fit_checkBox.checkState() == QtCore.Qt.CheckState.Checked,
+        self._opts[idx] = (self.reject_fit_checkBox.checkState() == QtCore.Qt.Checked,
-                           self.del_prev_checkBox.checkState() == QtCore.Qt.CheckState.Checked)
+                           self.del_prev_checkBox.checkState() == QtCore.Qt.Checked)
 
     def show_results(self, idx):
-        set_id = self.sets_comboBox.itemData(idx, QtCore.Qt.ItemDataRole.UserRole)
+        set_id = self.sets_comboBox.itemData(idx, QtCore.Qt.UserRole)
         self.set_plot(set_id)
         self.set_correlation(set_id)
         self.set_statistics(set_id)
@@ -171,15 +153,6 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
         self.del_prev_checkBox.setChecked(self._opts[idx][1])
         self.del_prev_checkBox.blockSignals(False)
 
-    @QtCore.pyqtSlot(name='on_autoscale_box_clicked')
-    def reset_fit_ranges(self):
-        for i in range(self.sets_comboBox.count()):
-            graph_id = self.sets_comboBox.itemData(i)
-            if graph_id in self.graph_opts:
-                self.graph_opts.pop(graph_id)
-
-        self.fit_plot.enableAutoRange()
-
     def set_plot(self, idx: str):
         if self.last_idx is not None:
             self.graph_opts[self.last_idx] = (
@@ -202,26 +175,27 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
             self.data_graph_imag.setData(x=res.x_data, y=res.y_data.imag)
             self.fit_graph.setData(x=res.x, y=res.y.real)
             self.fit_graph_imag.setData(x=res.x, y=res.y.imag)
+            self.resid_graph.setData(x=res.x_data, y=res.residual.real)
+            self.resid_graph_imag.setData(x=res.x_data, y=res.residual.imag)
 
-            for f, c in zip(sub_funcs, self.func_colors[idx]):
+            for i, f in enumerate(sub_funcs):
-                col = mkColor(*[c_i*255 for c_i in c])
+                item = PlotItem(x=f.x, y=f.y.real, pen=mkPen({'color': i, 'style': 2}))
-                item = PlotItem(x=f.x, y=f.y.real, pen=mkPen({'color': col, 'style': 2}))
                 self.fit_plot.addItem(item)
-                item = PlotItem(x=f.x, y=f.y.imag, pen=mkPen({'color': col, 'style': 2}))
+                item = PlotItem(x=f.x, y=f.y.imag, pen=mkPen({'color': i, 'style': 2}))
                 self.fit_plot.addItem(item)
 
         else:
+            self.resid_graph.setData(x=res.x_data, y=res.residual)
+            self.resid_graph_imag.setData(x=[], y=[])
             self.data_graph.setData(x=res.x_data, y=res.y_data)
             self.data_graph_imag.setData(x=[], y=[])
             self.fit_graph.setData(x=res.x, y=res.y)
             self.fit_graph_imag.setData(x=[], y=[])
 
-            for f, c in zip(sub_funcs, self.func_colors[idx]):
+            for i, f in enumerate(sub_funcs):
-                item = PlotItem(x=f.x, y=f.y, pen=mkPen({'color': mkColor(*[c_i*255 for c_i in c]), 'style': 2}))
+                item = PlotItem(x=f.x, y=f.y, pen=mkPen({'color': i, 'style': 2}))
                 self.fit_plot.addItem(item)
 
-        self._plot_residuals(idx)
-
         self.logx_box.blockSignals(True)
         self.logx_box.setChecked(res.islog)
         self.logx_box.blockSignals(False)
@@ -239,29 +213,6 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
             self.logy_box.blockSignals(True)
             self.logy_box.setChecked(logy)
             self.logy_box.blockSignals(False)
-        else:
-            self.fit_plot.enableAutoRange()
-
-    def _plot_residuals(self, idx: str = None):
-        if idx is None or isinstance(idx, QtWidgets.QAbstractButton):
-            idx = self.sets_comboBox.currentData(QtCore.Qt.ItemDataRole.UserRole)
-
-        res = self._results[idx]
-        if res.iscomplex:
-            if self.rel_dev_button.isChecked():
-                self.resid_graph.setData(x=res.x_data, y=res.residual.real/np_abs(res.y_data.real))
-                if all(np_isfinite(res.y_data.imag)):
-                    self.resid_graph_imag.setData(x=res.x_data, y=res.residual.imag/np_abs(res.y_data.imag))
-            else:
-                self.resid_graph.setData(x=res.x_data, y=res.residual.real)
-                self.resid_graph_imag.setData(x=res.x_data, y=res.residual.imag)
-
-        else:
-            if self.rel_dev_button.isChecked():
-                self.resid_graph.setData(x=res.x_data, y=res.residual / np_abs(res.y_data))
-            else:
-                self.resid_graph.setData(x=res.x_data, y=res.residual)
-            self.resid_graph_imag.setData(x=[], y=[])
 
     def set_correlation(self, idx: str):
         while self.corr_tableWidget.rowCount():
@@ -296,20 +247,20 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
         self.stats_tableWidget.setRowCount(len(res.statistics)+3)
 
         it = QtWidgets.QTableWidgetItem(f'{res.dof}')
-        it.setFlags(it.flags() ^ QtCore.Qt.ItemFlag.ItemIsEditable)
+        it.setFlags(it.flags() ^ QtCore.Qt.ItemIsEditable)
         self.stats_tableWidget.setVerticalHeaderItem(0, QtWidgets.QTableWidgetItem('DoF'))
         self.stats_tableWidget.setItem(0, 0, it)
 
         for col, (name, _, dof) in enumerate(self._previous_fits[idx], start=1):
             self.stats_tableWidget.setHorizontalHeaderItem(0, QtWidgets.QTableWidgetItem(name))
             it = QtWidgets.QTableWidgetItem(f'{dof}')
-            it.setFlags(it.flags() ^ QtCore.Qt.ItemFlag.ItemIsEditable)
+            it.setFlags(it.flags() ^ QtCore.Qt.ItemIsEditable)
             self.stats_tableWidget.setItem(0, col, it)
 
         for row, (k, v) in enumerate(res.statistics.items(), start=1):
             self.stats_tableWidget.setVerticalHeaderItem(row, QtWidgets.QTableWidgetItem(k))
             it = QtWidgets.QTableWidgetItem(f'{v:.4f}')
-            it.setFlags(it.flags() ^ QtCore.Qt.ItemFlag.ItemIsEditable)
+            it.setFlags(it.flags() ^ QtCore.Qt.ItemIsEditable)
             self.stats_tableWidget.setItem(row, 0, it)
 
             best_idx = -1
@@ -320,7 +271,7 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
                 else:
                     best_idx = col if best_val > stats[k] else max(0, best_idx)
                 it = QtWidgets.QTableWidgetItem(f'{stats[k]:.4f}')
-                it.setFlags(it.flags() ^ QtCore.Qt.ItemFlag.ItemIsEditable)
+                it.setFlags(it.flags() ^ QtCore.Qt.ItemIsEditable)
                 self.stats_tableWidget.setItem(row, col, it)
 
             if best_idx > -1:
@@ -337,11 +288,11 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
         for col, (_, stats, dof) in enumerate(self._previous_fits[idx], start=1):
             f_value, prob_f = res.f_test(stats['chi^2'], dof)
             it = QtWidgets.QTableWidgetItem(f'{f_value:.4g}')
-            it.setFlags(it.flags() ^ QtCore.Qt.ItemFlag.ItemIsEditable)
+            it.setFlags(it.flags() ^ QtCore.Qt.ItemIsEditable)
             self.corr_tableWidget.setItem(row, col, it)
 
             it = QtWidgets.QTableWidgetItem(f'{prob_f:.4g}')
-            it.setFlags(it.flags() ^ QtCore.Qt.ItemFlag.ItemIsEditable)
+            it.setFlags(it.flags() ^ QtCore.Qt.ItemIsEditable)
             if prob_f < 0.05:
                 it.setBackground(QtGui.QColor('green'))
                 it.setForeground(QtGui.QColor('white'))
@@ -357,16 +308,16 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
         elif button_type == self.buttonBox.Ok:
             graph = '-1'
             if self.parameter_checkbox.isChecked():
-                if self.graph_checkBox.checkState() == QtCore.Qt.CheckState.Checked:
+                if self.graph_checkBox.checkState() == QtCore.Qt.Checked:
                     graph = ''
                 else:
                     graph = self.graph_comboBox.currentData()
 
             plot_fits = self.curve_checkbox.isChecked()
 
-            parts = self.partial_checkBox.checkState() == QtCore.Qt.CheckState.Checked
+            parts = self.partial_checkBox.checkState() == QtCore.Qt.Checked
 
-            extrapolate = [None, None, None, None]
+            extrapolate = [None, None, None]
             error = []
             if self.extrapolate_box.isChecked():
                 try:
@@ -382,8 +333,6 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
                 except (TypeError, ValueError):
                     error.append('Number of points is missing')
 
-                extrapolate[3] = self.newx_log_checkbox.isChecked()
-
             if error:
                 msg = QtWidgets.QMessageBox.warning(self, 'Error', 'Extrapolation failed because:\n' + '\n'.join(error))
                 return
@@ -421,13 +370,10 @@ class FitExtension(QtWidgets.QDialog):
         self.num_pts.setValidator(QtGui.QIntValidator())
         gridLayout.addWidget(self.num_pts, 2, 1, 1, 1)
 
-        self.logx_checkbox = QtWidgets.QCheckBox('Log-spaced?')
-        gridLayout.addWidget(self.logx_checkbox, 3, 0, 1, 2)
-
         self.buttonBox = QtWidgets.QDialogButtonBox()
-        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
         self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel | QtWidgets.QDialogButtonBox.Ok)
-        gridLayout.addWidget(self.buttonBox, 4, 0, 1, 2)
+        gridLayout.addWidget(self.buttonBox, 3, 0, 1, 2)
 
         self.setLayout(gridLayout)
 
@@ -435,13 +381,12 @@ class FitExtension(QtWidgets.QDialog):
         self.buttonBox.rejected.connect(self.reject)
 
     @property
-    def values(self) -> tuple[float, float, int, bool] | None:
+    def values(self):
         try:
             xmin = float(self.min_line.text())
             xmax = float(self.max_line.text())
             nums = int(self.num_pts.text())
-            logx = self.logx_checkbox.isChecked()
         except TypeError:
             return None
 
-        return xmin, xmax, nums, logx
+        return xmin, xmax, nums

src/gui_qt/graphs/graphwindow.py

@@ -27,7 +27,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
     mouseDoubleClicked = QtCore.pyqtSignal()
     positionClicked = QtCore.pyqtSignal(tuple, bool)
     aboutToClose = QtCore.pyqtSignal(list)
-    newData = QtCore.pyqtSignal(list, str)
 
     counter = itertools.count()
 
@@ -56,16 +55,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
         self._external_items = []
         self.closable = True
 
-        """
-        TODO 
-        this does not work properly and leads to lots of errors
-        because PlotDataItems do not have a viewBox anymore which is called in getData
-        
-        # desperate attempts to improve memory usage during paintEvents
-        self.graphic.setAntialiasing(False)
-        self.plotItem.setDownsampling(auto=True)
-        self.plotItem.setClipToView(True)
-        """
         self._block = False
 
         self.log = [False, False]
@@ -73,7 +62,7 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
         self.scene = self.plotItem.scene()
         self.scene.sigMouseMoved.connect(self.move_mouse)
 
-        self.checkBox.stateChanged.connect(lambda x: self.legend.setVisible(x == QtCore.Qt.CheckState.Checked))
+        self.checkBox.stateChanged.connect(lambda x: self.legend.setVisible(x == QtCore.Qt.Checked))
         self.label_button.toggled.connect(lambda x: self.label_widget.setVisible(x))
         self.limit_button.toggled.connect(lambda x: self.limit_widget.setVisible(x))
         self.gridbutton.toggled.connect(lambda x: self.graphic.showGrid(x=x, y=x))
@@ -88,9 +77,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
 
         self.bwbutton.toggled.connect(self.change_background)
 
-        self.setAcceptDrops(True)
-        self.graphic.installEventFilter(self)
-
     def _init_gui(self):
         self.setWindowTitle('Graph ' + str(next(QGraphWindow.counter)))
 
@@ -123,34 +109,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
         for lineedit in [self.xmin_lineedit, self.xmax_lineedit, self.ymin_lineedit, self.ymax_lineedit]:
             lineedit.setValidator(QtGui.QDoubleValidator())
 
-    def eventFilter(self, obj: QtCore.QObject, evt: QtCore.QEvent):
-        """
-        Catch drag and Drop to prevent anything inside self.graphic to accept the events.
-        Without event filter, we cannot process it here and start file reading
-        """
-        if evt.type() == QtCore.QEvent.Type.DragEnter:
-            evt.accept()
-            return True
-
-        elif evt.type() == QtCore.QEvent.Type.Drop:
-            return self._handle_drop(evt)
-
-        else:
-            return False
-
-    def dropEvent(self, evt: QtGui.QDropEvent):
-        return self._handle_drop(evt)
-
-    def _handle_drop(self, evt: QtGui.QDropEvent):
-        if evt.mimeData().hasUrls():
-            files = [str(url.toLocalFile()) for url in evt.mimeData().urls()]
-            self.newData.emit(files, self.id)
-
-            evt.accept()
-            return True
-
-        return False
-
     def __contains__(self, item: str):
         return item in self.sets
 
@@ -209,7 +167,7 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
         self._block = state
 
         if not self._block:
-            # self.graphic.enableAutoRange()
+            self.graphic.enableAutoRange()
             self._update_zorder()
             self.show_legend()
         else:
@@ -220,7 +178,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
             name = [name]
             plots = [plots]
         toplevel = len(self.sets)
-
         self.listWidget.blockSignals(True)
         for (real_plot, imag_plot, err_plot), n in zip(plots, name):
             self.sets.append(n)
@@ -237,13 +194,9 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
             self.error_plots[n] = err_plot
 
             list_item = QtWidgets.QListWidgetItem(real_plot.opts.get('name', ''))
-            list_item.setData(QtCore.Qt.ItemDataRole.UserRole, n)
+            list_item.setData(QtCore.Qt.UserRole, n)
-            list_item.setFlags(
+            list_item.setFlags(QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsUserCheckable)
-                QtCore.Qt.ItemFlag.ItemIsEnabled |
+            list_item.setCheckState(QtCore.Qt.Checked)
-                QtCore.Qt.ItemFlag.ItemIsSelectable |
-                QtCore.Qt.ItemFlag.ItemIsUserCheckable
-            )
-            list_item.setCheckState(QtCore.Qt.CheckState.Checked)
             self.listWidget.addItem(list_item)
 
             toplevel += 1
@@ -275,7 +228,7 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
 
         for i in range(self.listWidget.count()-1, 0, -1):
             item = self.listWidget.item(i)
-            if item.data(QtCore.Qt.ItemDataRole.UserRole) in name:
+            if item.data(QtCore.Qt.UserRole) in name:
                 self.listWidget.takeItem(i)
 
         self.listWidget.blockSignals(False)
@@ -340,8 +293,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
                 if item in self.graphic.items():
                     self.graphic.removeItem(item)
 
-        self.show_legend()
-
     @QtCore.pyqtSlot(bool, name='on_imag_button_toggled')
     @QtCore.pyqtSlot(bool, name='on_real_button_toggled')
     def set_imag_visible(self, visible: bool):
@@ -469,37 +420,24 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
                 _y = pos.y()
             self.mousePositionChanged.emit(_x, _y)
 
-    @QtCore.pyqtSlot(str, name='on_title_lineedit_textChanged')
+    @QtCore.pyqtSlot(name='on_title_lineedit_returnPressed')
-    @QtCore.pyqtSlot(str, name='on_xaxis_linedit_textChanged')
+    @QtCore.pyqtSlot(name='on_xaxis_linedit_returnPressed')
-    @QtCore.pyqtSlot(str, name='on_yaxis_linedit_textChanged')
+    @QtCore.pyqtSlot(name='on_yaxis_linedit_returnPressed')
-    def labels_changed(self, text: str):
+    def labels_changed(self):
-        label = {
+        label = {self.title_lineedit: 'title', self.xaxis_linedit: 'x', self.yaxis_linedit: 'y'}[self.sender()]
-            self.title_lineedit: 'title',
+        self.set_label(**{label: self.sender().text()})
-            self.xaxis_linedit: 'x',
-            self.yaxis_linedit: 'y',
-        }[self.sender()]
-        self.set_label(**{label: text})
 
-    def set_label(self, x: str = None, y: str = None, title: str = None):
+    def set_label(self, x=None, y=None, title=None):
         if title is not None:
-            self.plotItem.setTitle(
+            self.plotItem.setTitle(convert(title, old='tex', new='html'), **{'size': '10pt', 'color': self._fgcolor})
-                convert(title, old='tex', new='html'),
-                **{'size': '10pt', 'color': self._fgcolor},
-            )
 
         if x is not None:
-            self.plotItem.setLabel(
+            self.plotItem.setLabel('bottom', convert(x, old='tex', new='html'),
-                'bottom',
+                                   **{'font-size': '10pt', 'color': self._fgcolor.name()})
-                convert(x, old='tex', new='html'),
-                **{'font-size': '10pt', 'color': self._fgcolor.name()},
-            )
 
         if y is not None:
-            self.plotItem.setLabel(
+            self.plotItem.setLabel('left', convert(y, old='tex', new='html'),
-                'left',
+                                   **{'font-size': '10pt', 'color': self._fgcolor.name()})
-                convert(y, old='tex', new='html'),
-                **{'font-size': '10pt', 'color': self._fgcolor.name()},
-            )
 
     def set_logmode(self, xmode: bool = None, ymode: bool = None):
         r = self.ranges
@@ -525,6 +463,8 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
         self.plotItem.updateLogMode()
         self.set_range(x=r[0], y=r[1])
 
+        self.plotItem.enableAutoRange()
+
     def enable_picking(self, enabled: bool):
         if enabled:
             self.scene.sigMouseClicked.connect(self.position_picked)
@@ -539,10 +479,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
 
         if self.graphic.plotItem.sceneBoundingRect().contains(evt.scenePos()) and evt.button() == 1:
             pos = vb.mapSceneToView(evt.scenePos())
-
-            if not _inside_range(pos.x(), pos.y(), vb.viewRange()):
-                return
-
             _x, _y = pos.x(), pos.y()
 
             if self.log[0]:
@@ -609,7 +545,7 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
 
         for i in range(self.listWidget.count()):
             item = self.listWidget.item(i)
-            if item.data(QtCore.Qt.ItemDataRole.UserRole) == sid:
+            if item.data(QtCore.Qt.UserRole) == sid:
                 item.setText(convert(name, old='tex', new='html'))
 
         self.listWidget.blockSignals(False)
@@ -674,14 +610,11 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
 
         else:
             if os.path.exists(outfile):
-                if QtWidgets.QMessageBox.warning(
+                if QtWidgets.QMessageBox.warning(self, 'Export graphic',
-                        self,
-                        'Export graphic',
                                                  f'{os.path.split(outfile)[1]} already exists.\n'
                                                  f'Do you REALLY want to replace it?',
                                                  QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,
-                        QtWidgets.QMessageBox.No
+                                                 QtWidgets.QMessageBox.No) == QtWidgets.QMessageBox.No:
-                ) == QtWidgets.QMessageBox.No:
                     return
 
             bg_color = self._bgcolor
@@ -723,20 +656,16 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
                 logger.exception(f'{item} could not exported because {e.args}')
                 continue
 
-            if item_dic:
             if len(item) == 2:
                 # plot can show errorbars
-                    if len(item_dic['x']):
                 item_dic['yerr'] = item[1].opts['topData']
-                    else:
+
-                        item_dic['yerr'] = []
+            if item_dic:
                 dic['items'].append(item_dic)
 
         for item in self._external_items:
             try:
-                item_dic = item.get_data_opts()
+                dic['items'].append(item.get_data_opts())
-                if item_dic:
-                    dic['items'].append(item_dic)
             except Exception as e:
                 logger.exception(f'{item} could not be exported because {e.args}')
                 continue
@@ -762,7 +691,6 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
             'plots': (self.real_button.isChecked(), self.imag_button.isChecked(), self.error_button.isChecked()),
             'children': self.sets,
             'active': self._active,
-            'invert': (self.plotItem.vb.state['xInverted'], self.plotItem.vb.state['yInverted']),
         }
 
         in_legend = []
@@ -809,7 +737,7 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
 
         graph.graphic.showGrid(x=state['grid'], y=state['grid'])
 
-        graph.checkBox.setCheckState(QtCore.Qt.CheckState.Checked if state['legend'] else QtCore.Qt.CheckState.Unchecked)
+        graph.checkBox.setCheckState(QtCore.Qt.Checked if state['legend'] else QtCore.Qt.Unchecked)
 
         graph.real_button.setChecked(state['plots'][0])
         graph.imag_button.setChecked(state['plots'][1])
@@ -858,7 +786,3 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
         self.set_color(foreground=self._prev_colors[0], background=self._prev_colors[1])
         self._prev_colors = temp
 
-
-def _inside_range(x: float, y: float, ranges: list[list[float]]) -> bool:
-    x_range, y_range = ranges
-    return (x_range[0] <= x <= x_range[1]) and (y_range[0] <= y <= y_range[1])

src/gui_qt/io/asciireader.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import re
 
 from nmreval.io.asciireader import AsciiReader
-from nmreval.utils import NUMBER_RE, numbers_from_string
+from nmreval.utils import NUMBER_RE
 
 from ..Qt import QtGui, QtCore, QtWidgets
 from .._py.asciidialog import Ui_ascii_reader
@@ -38,7 +38,7 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
         self.changestaggeredrange(0)
 
         self.ascii_table.contextMenuEvent = self.ctx_table
-        self.ascii_table.horizontalHeader().setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
+        self.ascii_table.horizontalHeader().setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.ascii_table.horizontalHeader().customContextMenuRequested.connect(self.ctx_table)
 
         self.skip = False
@@ -65,7 +65,7 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
         self.set_column_names(1)
 
         self.skippy_checkbox.blockSignals(True)
-        self.skippy_checkbox.setCheckState(QtCore.Qt.CheckState.Unchecked)
+        self.skippy_checkbox.setCheckState(QtCore.Qt.Unchecked)
         self.skippy_checkbox.blockSignals(False)
 
         return self
@@ -132,10 +132,7 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
         self.ascii_table.setHorizontalHeaderLabels(map(str, range(1, self.ascii_table.columnCount() + 1)))
         if self.column_checkBox.isChecked() and self.line_spinBox.isEnabled():
             header_line = self.reader.header[self.line_spinBox.value()-1]
-            header_line = header_line.strip('\n\t\r, ')
+            self.ascii_table.setHorizontalHeaderLabels(header_line.split())
-            header_line = re.sub(r'[\t ;,]+', ';', header_line)
-
-            self.ascii_table.setHorizontalHeaderLabels(header_line.split(';'))
 
     @QtCore.pyqtSlot(int, name='on_staggered_checkBox_stateChanged')
     def changestaggeredrange(self, state: int):
@@ -181,12 +178,11 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
     @QtCore.pyqtSlot()
     def accept(self):
         if self.apply():
-            super().accept()
+            self.close()
 
     def apply(self):
         # default row for x is the first row, it will be superseded if an integer number is given.
         x = self.x_lineedit.text()
-        is_valid = True
         if x:
             try:
                 x = int(x)-1
@@ -195,35 +191,16 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
         else:
             x = None
 
-        if not self.check_column_numbers(x, max(self.reader.width)):
-            _ = QtWidgets.QMessageBox.information(self, 'Improper input',
-                                                  f'Input for x axis is invalid')
-            return False
-
         try:
             y = [int(t)-1 for t in self.y_lineedit.text().split(' ')]
         except ValueError:
             y = None
 
-        if not self.check_column_numbers(y, max(self.reader.width)):
-            _ = QtWidgets.QMessageBox.information(self, 'Improper input',
-                                                  f'Input for y axis is invalid')
-            return False
-
         try:
             y_err = [int(t)-1 for t in self.deltay_lineEdit.text().split(' ')]
         except ValueError:
             y_err = None
 
-        mode = self.buttonGroup.checkedButton().text()
-        if mode != 'Points':
-            y_err = None
-
-        if not self.check_column_numbers(y, max(self.reader.width)):
-            _ = QtWidgets.QMessageBox.information(self, 'Improper input',
-                                                  f'Input for y_err axis is invalid')
-            return False
-
         col_header = None
         if self.column_checkBox.isChecked():
             col_header = []
@@ -234,29 +211,28 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
                     col_header.append(i)
 
         if y is not None and col_header is not None:
-            col_header = [col_header[i] for i in range(len(col_header))]
+            col_header = [col_header[i] for i in range(len(col_header)) if i in y]
 
         try:
             ret_dic = self.reader.export(
                 x=x,
                 y=y,
                 yerr=y_err,
-                mode=mode,
+                mode=self.buttonGroup.checkedButton().text(),
                 col_names=col_header,
                 num_value=self.get_numerical_value(),
             )
             self.data_read.emit(ret_dic)
 
-        except Exception as e:
+        except ImportError as e:
             _ = QtWidgets.QMessageBox.information(self, 'Reading failed',
-                                                  f'Import data failed with\n {e.args[0]}')
+                                                  f'Import data failed with {e.args}')
-            return False
 
         return True
 
     @QtCore.pyqtSlot(int, name='on_buttonGroup_buttonClicked')
     def show_error(self, val: int):
-        self.deltay_lineEdit.setEnabled(val == -2)
+        self.deltay_lineEdit.setEnabled(val == -3)
 
     @QtCore.pyqtSlot(int, name='on_skippy_checkbox_stateChanged')
     def skip_next_dial(self, _: int):
@@ -267,31 +243,19 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
         if self.reader is None:
             return
 
-        success = True
+        try:
+            pattern = re.compile(pattern)
+            self.regex_input.setStyleSheet('color: rgb(0, 0, 0)')
+            self._matches = [m for m in pattern.finditer(str(self.reader.fname.stem))]
+        except re.error:
             self._matches = []
 
-        if pattern:
+        if self._matches:
-            try:
-                re_pattern = re.compile(pattern)
-            except re.error:
-                success = False
-            else:
-                self._matches = [m for m in re_pattern.finditer(str(self.reader.fname.stem))]
-        else:
-            success = False
-
-        # matches exist and have numbers in them
-        if self._matches and all([len(numbers_from_string(m.group())) for m in self._matches]):
             self.re_match_index.blockSignals(True)
             self.re_match_index.setMaximum(len(self._matches))
             self.re_match_index.blockSignals(False)
         else:
-            success = False
+            self.regex_input.setStyleSheet('color: rgb(255, 0, 0)')
-
-        if success:
-            self.regex_input.setStyleSheet('color: rgb(0, 0, 0)')
-        else:
-            self.regex_input.setStyleSheet('background-color: rgba(255, 0, 0, 50)')
 
         self.show_match(self.re_match_index.value())
 
@@ -305,32 +269,12 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
         else:
             self.label_8.setText(fname)
 
-    def get_numerical_value(self) -> float:
+    def get_numerical_value(self):
         val = 0
         if self.re_button.isChecked() and self._matches:
             m = self._matches[self.re_match_index.value()-1]
-            val = numbers_from_string(m.group())
+            val = float(NUMBER_RE.search(m.group()).group().replace('p', '.'))
-            # numbers_from returns list of floats we use first match if available
-            val = val[0] if val else 0.0
         elif self.custom_button.isChecked():
             val = float(self.custom_input.text())
 
         return val
-
-    def check_column_numbers(self, values: int | list[int] | str | None, num_column: int) -> bool:
-        is_valid = False
-        if values is None:
-            is_valid = True
-        elif values == 'index':
-            is_valid = True
-
-        elif isinstance(values, int):
-            is_valid = values < num_column
-        elif isinstance(values, list):
-            try:
-                is_valid = all(v < num_column for v in values)
-            except TypeError:
-                is_valid = False
-
-        return is_valid
-

src/gui_qt/io/dscreader.py

@@ -78,22 +78,14 @@ class QDSCReader(QtWidgets.QDialog, Ui_Dialog):
 
         for opts in self.sample.steps:
             item = QtWidgets.QListWidgetItem()
-            item.setFlags(
+            item.setFlags(QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsUserCheckable)
-                QtCore.Qt.ItemFlag.ItemIsEnabled |
+            item.setCheckState(QtCore.Qt.Unchecked)
-                QtCore.Qt.ItemFlag.ItemIsSelectable |
-                QtCore.Qt.ItemFlag.ItemIsUserCheckable
-            )
-            item.setCheckState(QtCore.Qt.CheckState.Unchecked)
 
             if opts[0] == 'i':
-                item.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
+                item.setFlags(QtCore.Qt.NoItemFlags)
                 item.setText(f'{opts[1]:.2f} K for {opts[2] / 60:.0f} min')
             else:
-                item.setFlags(
+                item.setFlags(QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsUserCheckable)
-                    QtCore.Qt.ItemFlag.ItemIsEnabled |
-                    QtCore.Qt.ItemFlag.ItemIsSelectable |
-                    QtCore.Qt.ItemFlag.ItemIsUserCheckable
-                )
                 item.setText(f'{opts[2]:.2f} K to {opts[3]:.2f} K with {opts[1]} K/min')
 
             self.step_listWidget.addItem(item)
@@ -105,12 +97,7 @@ class QDSCReader(QtWidgets.QDialog, Ui_Dialog):
 
         if empty:
             self.empty = self.calibrator.set_measurement(empty, mode='empty')
-
-            # avoid ValueError breaking data update
-            if self.empty.fname.is_relative_to(Path.home()):
             self.empty_label.setText('~/' + str(self.empty.fname.relative_to(Path.home())))
-            else:
-                self.empty_label.setText(str(self.empty.fname))
 
             self.update_plots()
 
@@ -131,8 +118,8 @@ class QDSCReader(QtWidgets.QDialog, Ui_Dialog):
 
             self.references.append(ref)
             item = QtWidgets.QTableWidgetItem(str(ref.fname.name))
-            item.setData(QtCore.Qt.ItemDataRole.UserRole, ref.fname)
+            item.setData(QtCore.Qt.UserRole, ref.fname)
-            item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
+            item.setFlags(QtCore.Qt.ItemIsEnabled)
 
             rowcnt = self.reference_tableWidget.rowCount()
             self.reference_tableWidget.setRowCount(rowcnt+1)
@@ -145,7 +132,7 @@ class QDSCReader(QtWidgets.QDialog, Ui_Dialog):
     @QtCore.pyqtSlot(name='on_ref_remove_pushButton_clicked')
     def remove_reference(self):
         idx = self.reference_tableWidget.currentRow()
-        self.calibrator.remove_reference(self.reference_tableWidget.item(idx, 0).data(QtCore.Qt.ItemDataRole.UserRole))
+        self.calibrator.remove_reference(self.reference_tableWidget.item(idx, 0).data(QtCore.Qt.UserRole))
 
         self.reference_tableWidget.removeRow(idx)
         self.update_plots()
@@ -158,10 +145,10 @@ class QDSCReader(QtWidgets.QDialog, Ui_Dialog):
         for row in range(self.step_listWidget.count()):
             if idx == row:
                 continue
-            self.step_listWidget.item(row).setCheckState(QtCore.Qt.CheckState.Unchecked)
+            self.step_listWidget.item(row).setCheckState(QtCore.Qt.Unchecked)
         self.step_listWidget.blockSignals(False)
 
-        if item.checkState() == QtCore.Qt.CheckState.Checked:
+        if item.checkState() == QtCore.Qt.Checked:
             mode, rate, _, _ = self.sample.steps[idx]
             self.current_run = (rate, mode)
             self.sample_idx = idx
@@ -230,8 +217,6 @@ class QDSCReader(QtWidgets.QDialog, Ui_Dialog):
 
         if empty_data is not None:
             self.empty_sample.setData(x=empty_data[0], y=empty_data[1])
-        else:
-            self.empty_sample.setData(x=[], y=[])
 
         self.calib_graph.clear()
 
@@ -264,16 +249,11 @@ class QDSCReader(QtWidgets.QDialog, Ui_Dialog):
         except TypeError:
             return
 
-        if self.cp_checkBox.isChecked() and self.references:
-            y_label = 'cp'
-        else:
-            y_label = 'q'
-
         rate, mode = self.current_run
-        new_val = DSC(sample_data[0], sample_data[1], value=rate, name=f'{self.fname.stem} {rate}K-min ({mode}, {y_label})')
+        new_val = DSC(sample_data[0], sample_data[1], value=rate, name=f'{self.fname.stem} {rate} ({mode})')
 
         if filesave:
-            new_val.savetxt(self.fname.with_name(f'{self.fname.stem}_{rate}K-min_{y_label}{mode}.dat'.replace(' ', '_')))
+            new_val.savetxt(self.fname.with_name(f'{self.fname.stem} {rate}K-min {mode}.dat'.replace(' ', '_')))
             close_after = False
         else:
             self.data_read.emit([new_val])

src/gui_qt/io/exporters.py

@@ -28,19 +28,14 @@ class GraceExporter:
             new_g.set_log(x=self.__opts['log'][0], y=self.__opts['log'][1])
 
             new_g.set_onoff('legend', self.__opts['legend'])
-            new_g.set_property(**{
+            new_g.set_property(**{'title': f'"{convert(self.__opts["labels"][2], old="html", new="agr")}"',
-                'title': f'"{convert(self.__opts["labels"][2], old="html", new="agr")}"',
                                   'legend loctype': 'view',
-                'legend': ', '.join(str(i) for i in new_g.world_to_view(self.__opts['legend_pos']))
+                                  'legend': ', '.join(str(i) for i in new_g.world_to_view(self.__opts['legend_pos']))})
-            })
 
             for i, ax in enumerate('xy'):
-                new_g.set_axis_property(ax, **{
+                new_g.set_axis_property(ax, **{'label': f'"{convert(self.__opts["labels"][i], old="html", new="agr")}"',
-                    'label': f'"{convert(self.__opts["labels"][i], old="html", new="agr")}"',
                                                'tick major': self.__opts['ticks'][i][0],
-                    'tick minor ticks': self.__opts['ticks'][i][1],
+                                               'tick minor ticks': self.__opts['ticks'][i][1],})
-                    'invert': 'on' if self.__opts['invert'][i] else 'off',
-                })
                 new_g.set_axis_onoff(ax, 'tick major grid', self.__opts['grid'])
             g_idx = new_g.idx
         else:
@@ -64,13 +59,8 @@ class GraceExporter:
                 colors[c_num] = (f'color{c_num}', sc)
                 new_colors.append((c_num, f'color{c_num}', sc))
 
-            new_s.set_symbol(**{
+            new_s.set_symbol(**{'symbol': item['symbol'].value, 'size': item['symbolsize'] / 10., 'color': c_num,
-                'symbol': item['symbol'].value,
+                                'fill color': c_num, 'fill pattern': 1})
-                'size': item['symbolsize'] / 10.,
-                'color': c_num,
-                'fill color': c_num,
-                'fill pattern': 1
-            })
             new_s.set_onoff('errorbar', self.__opts['plots'][2])
 
             lc = item['linecolor']
@@ -84,17 +74,12 @@ class GraceExporter:
                 colors[c_num + 1] = ()
                 new_colors.append((c_num, f'color{c_num + 1}', sc))
 
-            new_s.set_line(**{
+            new_s.set_line(**{'color': c_num, 'linewidth': item['linewidth'],
-                'color': c_num,
+                              'linestyle': item['linestyle'].to_agr()})
-                'linewidth': item['linewidth'],
-                'linestyle': item['linestyle'].to_agr()
-            })
 
             if plot_label:
-                new_s.set_property(
+                new_s.set_property(comment=f'"{item["name"]}"',
-                    comment=f'"{item["name"]}"',
+                                   legend=f'"{convert(item["name"], old="tex", new="agr")}"')
-                    legend=f'"{convert(item["name"], old="tex", new="agr")}"'
-                )
             else:
                 new_s.set_property(comment=f'"{item["name"]}"')
 

src/gui_qt/io/fcbatchreader.py

@@ -22,22 +22,12 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
         self.start_lineedit.setValidator(QtGui.QDoubleValidator())
         self.stop_lineedit.setValidator(QtGui.QDoubleValidator())
 
-        self.graph_checkbox.stateChanged.connect(
-            lambda x: self.graph_comboBox.setEnabled(x == QtCore.Qt.CheckState.Unchecked)
-        )
-
         self.listWidget.installEventFilter(self)
 
-    def __call__(self, path=None):
-        if path is None:
-            path = pathlib.Path().home()
-        self.path = path
-        self.listWidget.clear()
-
     def eventFilter(self, src: QtCore.QObject, evt: QtCore.QEvent) -> bool:
         # intercept key press in listwidget to allow deletion with Del
-        if evt.type() == QtCore.QEvent.Type.KeyPress:
+        if evt.type() == QtCore.QEvent.KeyPress:
-            if evt.key() == QtCore.Qt.Key.Key_Delete:
+            if evt.key() == QtCore.Qt.Key_Delete:
                 self.listWidget.takeItem(self.listWidget.currentRow())
                 return True
 
@@ -49,25 +39,21 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
 
     @QtCore.pyqtSlot(int, name='on_region_checkBox_stateChanged')
     def use_region(self, state: int):
-        self.start_lineedit.setEnabled(state == QtCore.Qt.CheckState.Checked)
+        self.start_lineedit.setEnabled(state == QtCore.Qt.Checked)
-        self.stop_lineedit.setEnabled(state == QtCore.Qt.CheckState.Checked)
+        self.stop_lineedit.setEnabled(state == QtCore.Qt.Checked)
 
     @QtCore.pyqtSlot(name='on_file_pushbutton_clicked')
     @QtCore.pyqtSlot(name='on_dir_pushbutton_clicked')
     def get_input(self):
         if self.sender() == self.file_pushbutton:
-            infiles, _ = QtWidgets.QFileDialog.getOpenFileNames(
+            infiles, _ = QtWidgets.QFileDialog.getOpenFileNames(caption='Select HDF files',
-                caption='Select HDF files',
                                                                 directory=str(self.path),
-                filter='HDF files (*.h5)',
+                                                                filter='HDF files (*.h5)')
-            )
 
         else:
-            infiles = QtWidgets.QFileDialog.getExistingDirectory(
+            infiles = QtWidgets.QFileDialog.getExistingDirectory(caption='Select input directory',
-                caption='Select input directory',
                                                                  directory=str(self.path),
-                options=QtWidgets.QFileDialog.ShowDirsOnly,
+                                                                 options=QtWidgets.QFileDialog.ShowDirsOnly)
-            )
             infiles = [infiles] if infiles else infiles
 
         if infiles:
@@ -77,12 +63,9 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
 
     @QtCore.pyqtSlot(name='on_savebutton_clicked')
     def save_path(self):
-        outfile = QtWidgets.QFileDialog.getExistingDirectory(
+        outfile = QtWidgets.QFileDialog.getExistingDirectory(self, caption='Select directory',
-            self,
-            caption='Select directory',
                                                              directory=self.label.text(),
-            options=QtWidgets.QFileDialog.ShowDirsOnly,
+                                                             options=QtWidgets.QFileDialog.ShowDirsOnly)
-        )
         if outfile:
             self.label.setText(outfile)
 
@@ -99,11 +82,11 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
         if self.region_box.isChecked():
             start = None
             if self.start_lineedit.text():
-                start = float(self.start_lineedit.text())*1e-6
+                start = float(self.start_lineedit.text())
 
             stop = None
             if self.stop_lineedit.text():
-                stop = float(self.stop_lineedit.text())*1e-6
+                stop = float(self.stop_lineedit.text())
             region = (start, stop)
 
         fc_eval = FCReader(items)
@@ -122,10 +105,9 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
 
         ret_vals = []
         ret_vals.extend(fc_eval.get_parameter(path=self.label.text(), kind='temp', parameter=save_variables))
-        print(ret_vals)
 
         grp = ''
-        if not self.graph_checkbox.isChecked():
+        if self.graph_checkbox.isChecked():
-            grp = self.graph_comboBox.currentData(QtCore.Qt.ItemDataRole.UserRole)
+            grp = self.graph_comboBox.currentData(QtCore.Qt.UserRole)
 
         self.data_read.emit(ret_vals, grp)

src/gui_qt/io/filereaders.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 import struct
 
-from ..Qt import QtCore, QtWidgets
+from ..Qt import QtCore
 from .asciireader import QAsciiReader
 from .hdfreader import QHdfViewer
 from .bdsreader import QBDSReader
@@ -26,12 +26,8 @@ class QFileReader(QtCore.QObject):
         self.reader = {}
 
         for ext, reader in [
-            ('txt', QAsciiReader),
+            ('txt', QAsciiReader), ('dsc', QDSCReader), ('agr', QGraceReader),
-            ('dsc', QDSCReader),
+            ('bds', QBDSReader), ('hdf', QHdfViewer),  ('nmr', QNMRReader)
-            ('agr', QGraceReader),
-            ('bds', QBDSReader),
-            ('hdf', QHdfViewer),
-            ('nmr', QNMRReader),
         ]:
             self.register(ext, reader)
 
@@ -51,7 +47,6 @@ class QFileReader(QtCore.QObject):
         if not isinstance(fname, list):
             fname = [fname]
 
-        status = QtWidgets.QDialog.Accepted
         for f in fname:
             f = Path(f)
             dtype = self.guess_type(f)
@@ -62,10 +57,7 @@ class QFileReader(QtCore.QObject):
 
             try:
                 # If QAsciiReader.skip = True it accepts automatically and returns None
-                if status == QtWidgets.QDialog.DialogCode.Rejected and isinstance(r, QAsciiReader) and self.reader['txt'].skip:
+                r(f).exec()
-                    break
-                status = r(f).exec()
-
             except AttributeError:
                 pass
 

src/gui_qt/lib/backup.py

@@ -1,207 +0,0 @@
-import os
-import sqlite3
-from datetime import datetime
-from pathlib import Path
-
-from nmreval.configs import config_paths
-from ..Qt import QtCore, QtWidgets
-
-DB_FILE = '/tmp/nmreval.db'
-
-
-class BackupManager(QtCore.QObject):
-    def __init__(self):
-        super().__init__()
-        self.create_table()
-        self._pid = None
-
-    def create_table(self):
-        con = sqlite3.connect(DB_FILE)
-        con.execute(
-            "CREATE TABLE IF NOT EXISTS sessions "
-            "(pid INTEGER NOT NULL, backup_file TEXT NOT NULL, last_save TEXT);"
-        )
-
-    def create_entry(self, pid: int):
-        backup_path = config_paths() / f'autosave_{datetime.now().strftime("%Y-%m-%d_%H%M%S")}_{pid}.nmr'
-
-        con = sqlite3.connect(DB_FILE)
-        con.execute('INSERT INTO sessions VALUES(?, ?, ?);',
-                    (pid, str(backup_path), None))
-        con.commit()
-        con.close()
-        self._pid = pid
-
-        return backup_path
-
-    def update_last_save(self):
-        con = sqlite3.connect(DB_FILE)
-        con.execute(
-            'UPDATE sessions SET last_save = ? WHERE pid = ?',
-            (datetime.now().strftime("%Y-%m-%d %H:%M:%S"), self._pid)
-        )
-        con.commit()
-        con.close()
-
-    def search_unsaved(self):
-        con = sqlite3.connect(DB_FILE)
-        cursor = con.cursor()
-        res = cursor.execute('SELECT sessions.* FROM sessions;')
-        con.commit()
-        data = res.fetchall()
-        con.close()
-
-        missing_processes = []
-
-        for pid, fname, save_date in data:
-            try:
-                os.kill(pid, 0)
-            except ProcessLookupError:
-                if Path(fname).exists():
-                    missing_processes.append((pid, fname, save_date))
-                else:
-                    # remove entries without valid file
-                    self.remove_row(pid)
-
-        if missing_processes:
-            msg = QLonelyBackupWindow()
-            msg.add_files(missing_processes)
-            msg.exec()
-            toberead = msg.recover
-
-            for pid in toberead[0]:
-                self.remove_file(pid)
-
-            for pid in toberead[1]:
-                self.remove_row(pid)
-
-            return list(toberead[1].values())
-
-        return []
-
-    def remove_row(self, pid):
-        con = sqlite3.connect(DB_FILE)
-        con.execute('DELETE FROM sessions WHERE pid = ?', (pid,))
-        con.commit()
-        con.close()
-
-    def remove_file(self, pid: int = None):
-        if pid is None:
-            pid = self._pid
-
-        con = sqlite3.connect(DB_FILE)
-        cursor = con.cursor()
-
-        # remove backup file
-        res = cursor.execute('SELECT sessions.backup_file FROM sessions WHERE pid = ?', (pid,))
-        con.commit()
-
-        fname = Path(res.fetchone()[0])
-        con.close()
-
-        fname.unlink(missing_ok=True)
-
-        # because autosave backups in a *.nmr.0 file and then moves it to *.nmr we look also for this one.
-        fname.with_suffix('.nmr.0').unlink(missing_ok=True)
-
-        # after removal of file also remove entry
-        self.remove_row(pid)
-
-    def delete_db_if_empty(self):
-        con = sqlite3.connect(DB_FILE)
-        cursor = con.cursor()
-        res = cursor.execute('SELECT COUNT(sessions.pid) FROM sessions GROUP BY sessions.pid;')
-        con.commit()
-
-        remaining_processes = res.fetchone()
-        con.close()
-        if remaining_processes is None:
-            Path(DB_FILE).unlink()
-
-    def close(self):
-        self.remove_file()
-        self.delete_db_if_empty()
-
-
-class QLonelyBackupWindow(QtWidgets.QDialog):
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
-        self.recover = [[], {}]    # list of pid to delete, dict of files to read {pid: file}
-
-        self.setWindowTitle('Adopt a file!')
-        self.resize(720, 320)
-
-        layout = QtWidgets.QVBoxLayout(self)
-        self.label = QtWidgets.QLabel(self)
-        self.label.setText('Abandoned backup file(s) looking for a loving home!\n'
-                           '(Files will all be loaded to same instance)')
-        layout.addWidget(self.label)
-
-        self.table = QtWidgets.QTableWidget(self)
-        self.table.setColumnCount(4)
-        self.table.setHorizontalHeaderLabels(['File name', 'Last saved', 'File size', 'Action'])
-        self.table.setGridStyle(QtCore.Qt.PenStyle.DashLine)
-        # self.table.horizontalHeader().setStretchLastSection(True)
-        self.table.verticalHeader().setVisible(False)
-        self.table.horizontalHeader().setSectionResizeMode(0, QtWidgets.QHeaderView.Stretch)
-        layout.addWidget(self.table)
-
-        self.buttons = QtWidgets.QDialogButtonBox(self)
-        self.buttons.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.buttons.setStandardButtons(QtWidgets.QDialogButtonBox.Ok)
-        layout.addWidget(self.buttons)
-
-        self.buttons.accepted.connect(self.accept)
-
-    def add_files(self, entries):
-        self.table.setRowCount(len(entries))
-        for i, (pid, path, date) in enumerate(entries):
-            path = Path(path)
-            item1 = QtWidgets.QTableWidgetItem(path.name)
-            item1.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
-            item1.setData(QtCore.Qt.ItemDataRole.UserRole, pid)
-            item1.setData(QtCore.Qt.ItemDataRole.UserRole+1, path)
-            self.table.setItem(i, 0, item1)
-
-            item2 = QtWidgets.QTableWidgetItem(date)
-            item2.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
-            self.table.setItem(i, 1, item2)
-
-            size = path.stat().st_size
-            size_cnt = 0
-            while size > 1024:
-                # make file size human-readable
-                size /= 1024
-                size_cnt += 1
-                if size_cnt == 5:
-                    break
-
-            byte = ['bytes', 'kB', 'MiB', 'GiB', 'TiB', 'PiB'][size_cnt]
-
-            item3 = QtWidgets.QTableWidgetItem(f'{size:.2f} {byte}')
-            item3.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
-            self.table.setItem(i, 2, item3)
-
-            cw = QtWidgets.QComboBox(self)
-            cw.addItems(['Load', 'Delete', 'Keep for later'])
-            self.table.setCellWidget(i, 3, cw)
-
-        self.table.resizeColumnsToContents()
-
-    def accept(self):
-        for i in range(self.table.rowCount()):
-            decision = self.table.cellWidget(i, 3).currentIndex()
-            item = self.table.item(i, 0)
-            pid = item.data(QtCore.Qt.ItemDataRole.UserRole)
-            if decision == 0:
-                # load file
-                self.recover[1][pid] = item.data(QtCore.Qt.ItemDataRole.UserRole+1)
-            elif decision == 1:
-                # delete
-                self.recover[0].append(pid)
-            else:
-                # do nothing
-                pass
-
-        super().accept()
-

src/gui_qt/lib/codeeditor.py

@@ -1,6 +1,5 @@
 # CodeEditor based on QT example, Python syntax highlighter found on Python site
-import typing
+
-from ast import parse
 
 from ..Qt import QtGui, QtCore, QtWidgets
 
@@ -72,8 +71,7 @@ class PythonHighlighter(QtGui.QSyntaxHighlighter):
             (r'\bdef\b\s*(\w+)', 1, STYLES['defclass']),
             # 'class' followed by an identifier
             (r'\bclass\b\s*(\w+)', 1, STYLES['defclass']),
-
+            # @ followed by a word
-            # decorator @ followed by a word
             (r'\s*@(\w+)\s*', 0, STYLES['property']),
 
             # Numeric literals
@@ -81,6 +79,7 @@ class PythonHighlighter(QtGui.QSyntaxHighlighter):
             (r'\b[+-]?0[xX][\dA-Fa-f]+[lL]?\b', 0, STYLES['numbers']),
             (r'\b[+-]?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?\b', 0, STYLES['numbers']),
 
+
             # Double-quoted string, possibly containing escape sequences
             (r'[rf]?"[^"\\]*(\\.[^"\\]*)*"', 0, STYLES['string']),
             # Single-quoted string, possibly containing escape sequences
@@ -187,10 +186,10 @@ class CodeEditor(QtWidgets.QPlainTextEdit):
         self.highlight = PythonHighlighter(self.document())
 
     def keyPressEvent(self, evt):
-        if evt.key() == QtCore.Qt.Key.Key_Tab:
+        if evt.key() == QtCore.Qt.Key_Tab:
             # use spaces instead of tab
             self.insertPlainText(' '*4)
-        elif evt.key() == QtCore.Qt.Key.Key_Insert:
+        elif evt.key() == QtCore.Qt.Key_Insert:
             self.setOverwriteMode(not self.overwriteMode())
         else:
             super().keyPressEvent(evt)
@@ -225,7 +224,7 @@ class CodeEditor(QtWidgets.QPlainTextEdit):
 
     def paintevent_linenumber(self, evt):
         painter = QtGui.QPainter(self.current_linenumber)
-        painter.fillRect(evt.rect(), QtCore.Qt.GlobalColor.lightGray)
+        painter.fillRect(evt.rect(), QtCore.Qt.lightGray)
 
         block = self.firstVisibleBlock()
         block_number = block.blockNumber()
@@ -237,9 +236,9 @@ class CodeEditor(QtWidgets.QPlainTextEdit):
         while block.isValid() and (top <= evt.rect().bottom()):
             if block.isVisible() and (bottom >= evt.rect().top()):
                 number = str(block_number + 1)
-                painter.setPen(QtCore.Qt.GlobalColor.black)
+                painter.setPen(QtCore.Qt.black)
                 painter.drawText(0, int(top), self.current_linenumber.width() - 3, height,
-                                 QtCore.Qt.AlignmentFlag.AlignRight, number)
+                                 QtCore.Qt.AlignRight, number)
 
             block = block.next()
             top = bottom
@@ -252,7 +251,7 @@ class CodeEditor(QtWidgets.QPlainTextEdit):
         if not self.isReadOnly():
             selection = QtWidgets.QTextEdit.ExtraSelection()
 
-            line_color = QtGui.QColor(QtCore.Qt.GlobalColor.yellow).lighter(180)
+            line_color = QtGui.QColor(QtCore.Qt.yellow).lighter(180)
 
             selection.format.setBackground(line_color)
             selection.format.setProperty(QtGui.QTextFormat.FullWidthSelection, True)
@@ -261,49 +260,3 @@ class CodeEditor(QtWidgets.QPlainTextEdit):
             extra_selections.append(selection)
 
         self.setExtraSelections(extra_selections)
-
-
-class EditorWidget(QtWidgets.QWidget):
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
-
-        layout = QtWidgets.QVBoxLayout()
-        layout.setContentsMargins(0, 0, 0, 0)
-
-        self.editor = CodeEditor(self)
-        layout.addWidget(self.editor)
-
-        self.error_label = QtWidgets.QLabel(self)
-
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.error_label.setFont(font)
-
-        self.error_label.setVisible(False)
-
-        layout.addWidget(self.error_label)
-
-        self.setLayout(layout)
-
-        for attr in ['appendPlainText', 'toPlainText', 'insertPlainText', 'setPlainText']:
-            setattr(self, attr, getattr(self.editor, attr))
-
-        self.editor.textChanged.connect(self._check_syntax)
-
-    def _check_syntax(self) -> (int, tuple[typing.Any]):
-        is_valid = True
-
-        # Compile into an AST and check for syntax errors.
-        try:
-            _ = parse(self.toPlainText(), filename='<string>')
-
-        except SyntaxError as e:
-            self.error_label.setText(f'Syntax error in line {e.lineno}: {e.args[0]}')
-            is_valid = False
-
-        except Exception as e:
-            self.error_label.setText(f'Unexpected error: {e.args[0]}')
-            is_valid = False
-
-        self.error_label.setVisible(not is_valid)

src/gui_qt/lib/logger.py

@@ -1,21 +1,17 @@
-import logging
+import sys
 from pathlib import Path
 
-from PyQt5 import QtWidgets
+from .codeeditor import _make_textformats
-
-from ..editors.codeeditor import _make_textformats
 from ..Qt import QtWidgets, QtCore, QtGui
 from nmreval.configs import config_paths
 
 
-STYLES = {
+STYLES = {'INFO': _make_textformats('black'),
-    'INFO': _make_textformats('black'),
           'WARNING': _make_textformats('blue'),
           'ERROR': _make_textformats('red', 'bold'),
           'DEBUG': _make_textformats('black', 'italic'),
           'file': _make_textformats('red', 'italic'),
-    'PyError': _make_textformats('red', 'bold-italic'),
+          'PyError': _make_textformats('red', 'bold-italic')}
-}
 
 
 class LogHighlighter(QtGui.QSyntaxHighlighter):
@@ -116,28 +112,3 @@ class QLog(QtWidgets.QDialog):
 
         for lines in text[-100:]:
             self.plainTextEdit.appendPlainText(lines[:-1])
-
-
-class ConsoleDock(QtWidgets.QDockWidget):
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
-
-        self.code = QtWidgets.QPlainTextEdit(parent)
-        self.code.highlight = LogHighlighter(self.code.document())
-        self.code.setReadOnly(True)
-        self.code.setMaximumBlockCount(50)
-        self.setWidget(self.code)
-
-
-class QTextHandler(logging.Handler):
-    def __init__(self, parent):
-        super().__init__()
-
-        self.console = ConsoleDock(parent)
-        self.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
-        self.setLevel(logging.WARNING)
-
-    def emit(self, record):
-        msg = self.format(record)
-        self.console.code.appendPlainText(msg)
-        self.console.show()

src/gui_qt/lib/mdiarea.py

@@ -7,11 +7,8 @@ from ..graphs.graphwindow import QGraphWindow
 
 
 class MdiAreaTile(QtWidgets.QMdiArea):
-    newData = QtCore.pyqtSignal(list)
-
     def __init__(self, parent=None):
         super().__init__(parent=parent)
-        self.setAcceptDrops(True)
 
     def tileSubWindowsVertically(self):
         window_list = self.subWindowList()
@@ -50,8 +47,3 @@ class MdiAreaTile(QtWidgets.QMdiArea):
             if isinstance(wdgt, QGraphWindow) and wdgt.id == key:
                 self.setActiveSubWindow(win)
                 break
-
-    def dropEvent(self, evt):
-        if evt.mimeData().hasUrls():
-            files = [str(url.toLocalFile()) for url in evt.mimeData().urls()]
-            self.newData.emit(files)

src/gui_qt/lib/namespace.py

@@ -4,8 +4,6 @@ from collections import namedtuple
 
 import numpy as np
 
-import nmreval
-
 from nmreval import models
 from nmreval.configs import config_paths
 from nmreval.lib.importer import find_models, import_
@@ -24,20 +22,17 @@ class Namespace:
 
         if basic:
             self.add_namespace(
-                {
+                {'x': (None, 'x values'),
-                    'x': (None, 'x values'),
                  'y': (None, 'x values'),
                  'y_err': (None, 'y error values'),
                  'fit': (None, 'dictionary of fit parameter', 'fit["PIKA"]'),
                  'np': (np, 'numpy module'),
-                    'nmreval': (nmreval, 'built-in classes and stuff')
                  },
                 parents=('Basic', 'General'),
             )
 
             self.add_namespace(
-                {
+                {'sin': (np.sin, 'Sine', 'sin(PIKA)'),
-                    'sin': (np.sin, 'Sine', 'sin(PIKA)'),
                  'cos': (np.cos, 'Cosine', 'cos(PIKA)'),
                  'tan': (np.tan, 'Tangens', 'tan(PIKA)'),
                  'ln': (np.log, 'Natural Logarithm', 'ln(PIKA)'),
@@ -50,8 +45,7 @@ class Namespace:
                 parents=('Basic', 'Functions'))
 
             self.add_namespace(
-                {
+                {'max': (np.max, 'Maximum value', 'max(PIKA)'),
-                    'max': (np.max, 'Maximum value', 'max(PIKA)'),
                  'min': (np.min, 'Minimum value', 'min(PIKA)'),
                  'argmax': (np.argmax, 'Index of maximum value', 'argmax(PIKA)'),
                  'argmin': (np.argmax, 'Index of minimum value', 'argmin(PIKA)'),
@@ -60,24 +54,19 @@ class Namespace:
 
         if const:
             self.add_namespace(
-                {
+                {'e': (constants.e, 'e / As'),
-                    'e': (constants.e, 'e / As'),
                  'eps0': (constants.epsilon0, 'epsilon0 / As/Vm'),
-                    'Eu': (constants.Eu,),
+                 'Eu': (constants.Eu,), 'h': (constants.h, 'h / eVs'),
-                    'h': (constants.h, 'h / eVs'),
+                 'hbar': (constants.hbar, 'hbar / eVs'), 'kB': (constants.kB, 'kB / eV/K'),
-                    'hbar': (constants.hbar, 'hbar / eVs'),
+                 'mu0': (constants.mu0, 'mu0 / Vs/Am'), 'NA': (constants.NA, 'NA / 1/mol'),
-                    'kB': (constants.kB, 'kB / eV/K'),
+                 'pi': (constants.pi,), 'R': (constants.R, 'R / eV'),
-                    'mu0': (constants.mu0, 'mu0 / Vs/Am'),
-                    'NA': (constants.NA, 'NA / 1/mol'),
-                    'pi': (constants.pi,),
-                    'R': (constants.R, 'R / eV'),
                  },
                 parents=('Constants', 'Maybe useful'),
             )
 
             self.add_namespace(
                 {f'gamma["{k}"]': (v, k, f'gamma["{k}"]') for k, v in constants.gamma.items()},
-                parents=('Constants', 'Gyromagnetic ratios (in 1/(sT))')
+                parents=('Constants', 'Magnetogyric ratios (in 1/(sT))')
             )
 
         if fitfuncs:
@@ -210,7 +199,7 @@ class QNamespaceWidget(QtWidgets.QWidget, Ui_Form):
 
         for entry in subspace:
             key_item = QtWidgets.QTableWidgetItem(entry)
-            key_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
+            key_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
 
             vals = self.namespace.namespace[entry]
 
@@ -225,12 +214,12 @@ class QNamespaceWidget(QtWidgets.QWidget, Ui_Form):
                 display = vals[1]
 
             value_item = QtWidgets.QTableWidgetItem(display)
-            value_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
+            value_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
 
-            key_item.setData(QtCore.Qt.ItemDataRole.UserRole, alias)
+            key_item.setData(QtCore.Qt.UserRole, alias)
-            key_item.setData(QtCore.Qt.ItemDataRole.UserRole+1, entry)
+            key_item.setData(QtCore.Qt.UserRole+1, entry)
-            value_item.setData(QtCore.Qt.ItemDataRole.UserRole, alias)
+            value_item.setData(QtCore.Qt.UserRole, alias)
-            value_item.setData(QtCore.Qt.ItemDataRole.UserRole+1, entry)
+            value_item.setData(QtCore.Qt.UserRole+1, entry)
 
             row = self.namespace_table.rowCount()
             self.namespace_table.setRowCount(row+1)
@@ -252,5 +241,5 @@ class QNamespaceWidget(QtWidgets.QWidget, Ui_Form):
 
     @QtCore.pyqtSlot(QtWidgets.QTableWidgetItem, name='on_namespace_table_itemDoubleClicked')
     def item_selected(self, item: QtWidgets.QTableWidgetItem):
-        self.selected.emit(item.data(QtCore.Qt.ItemDataRole.UserRole))
+        self.selected.emit(item.data(QtCore.Qt.UserRole))
-        self.sendKey.emit(item.data(QtCore.Qt.ItemDataRole.UserRole+1))
+        self.sendKey.emit(item.data(QtCore.Qt.UserRole+1))

src/gui_qt/lib/pg_objects.py

@@ -183,8 +183,6 @@ class PlotItem(PlotDataItem):
             brush = self.opts['symbolBrush']
             if isinstance(brush, tuple):
                 self.opts['symbolcolor'] = brush
-            elif isinstance(brush, str):
-                self.opts['symbolcolor'] = int(f'0x{brush[1:3]}', 16), int(f'0x{brush[3:5]}', 16), int(f'0x{brush[5:7]}', 16)
             else:
                 c = brush.color()
                 self.opts['symbolcolor'] = c.red(), c.green(), c.blue()
@@ -342,8 +340,7 @@ class PlotItem(PlotDataItem):
 
         opts = self.opts
         item_dic = {
-            'x': x,
+            'x': x, 'y': y,
-            'y': y,
             'name': opts.get('name', ''),
             'symbolsize': opts['symbolSize'],
         }

src/gui_qt/lib/pokemon.py

@@ -1,556 +0,0 @@
-import sqlite3
-import urllib.request
-from functools import cache
-
-from PyQt5 import QtWidgets, QtGui, QtCore
-from numpy.random import randint
-
-from gui_qt._py.pokewindow import Ui_Dialog
-from gui_qt._py.pokeentry import Ui_Form
-
-
-def get_connection(db):
-    connection = sqlite3.connect(db)
-    connection.row_factory = sqlite3.Row
-
-    return connection
-
-
-class QPoke(QtWidgets.QDialog, Ui_Dialog):
-    types = {None: ('', '')}
-    stats = {}
-
-    def __init__(self, parent=None):
-        super().__init__(parent=parent)
-
-        from importlib.resources import path
-        with path('resources', 'pokemon.sqlite') as fp:
-            self._db = str(fp)
-            PokemonEntry._db = str(fp)
-
-        self.setupUi(self)
-
-        self._fetch_names()
-
-        self.add_pokedexes()
-
-        self.tableWidget_2.itemSelectionChanged.connect(self.show_pokemon)
-
-        self.comboBox_2.currentIndexChanged.connect(self.collect_pokemon)
-        self.comboBox.currentIndexChanged.connect(self.collect_pokemon)
-
-        self.pushButton.clicked.connect(self.randomize)
-
-        self.collect_pokemon()
-
-    def _fetch_names(self):
-        connection = get_connection(self._db)
-        cursor = connection.cursor()
-        cursor.execute(
-            'SELECT * FROM types'
-        )
-
-        self.comboBox.addItem('All types', -1)
-        for entry in cursor.fetchall():
-            self.types[entry['id']] = (entry['name_de'], entry['name_en'])
-            self.comboBox.addItem(entry['name_en'], entry['id'])
-
-        connection.close()
-
-    def add_pokedexes(self):
-        connection = get_connection(self._db)
-        cursor = connection.cursor()
-        cursor.execute('SELECT * FROM pokedex_list')
-
-        for entry in cursor.fetchall():
-            self.comboBox_2.addItem(entry['name_en'], entry['id'])
-
-        connection.close()
-
-    def fill_list(self, idx: int = 0):
-        pokedex_id = self.comboBox_2.itemData(idx, QtCore.Qt.ItemDataRole.UserRole)
-        pokedex = self.get_pokedex(pokedex_id)
-
-        self.tableWidget_2.clear()
-        self.tableWidget_2.setColumnCount(4)
-        self.tableWidget_2.setRowCount(0)
-
-        for pokemon in pokedex:
-            poke_id = pokemon['species_id']
-            row_count = self.tableWidget_2.rowCount()
-            self.tableWidget_2.setRowCount(row_count + 1)
-            item = QtWidgets.QTableWidgetItem(f'#{pokemon["entry_number"]:04d}')
-            item.setData(QtCore.Qt.ItemDataRole.UserRole, poke_id)
-            self.tableWidget_2.setItem(row_count, 0, item)
-
-            item = QtWidgets.QTableWidgetItem(pokemon['name_en'])
-            item.setToolTip(pokemon['name_de'])
-            self.tableWidget_2.setItem(row_count, 1, item)
-
-            poke_type = self.types[pokemon['type1']]
-            item = QtWidgets.QTableWidgetItem(poke_type[1])
-            item.setToolTip(poke_type[0])
-            self.tableWidget_2.setItem(row_count, 2, item)
-
-            try:
-                poke_type = self.types[pokemon['type2']]
-                item = QtWidgets.QTableWidgetItem(poke_type[1])
-                item.setToolTip(poke_type[0])
-                self.tableWidget_2.setItem(row_count, 3, item)
-            except KeyError:
-                pass
-
-        self.tableWidget_2.resizeColumnsToContents()
-
-    def collect_pokemon(self, *args):
-        pokedex_id = self.comboBox_2.currentData(QtCore.Qt.ItemDataRole.UserRole)
-        type_id = self.comboBox.currentData(QtCore.Qt.ItemDataRole.UserRole)
-
-        connection = get_connection(self._db)
-        cursor = connection.cursor()
-
-        if pokedex_id == 1:
-            if type_id == -1:
-                cursor.execute(
-                    'SELECT *, pokemon_list.species_id AS entry_number '
-                    'FROM pokemon_list '
-                    'ORDER BY entry_number'
-                )
-            else:
-                cursor.execute(
-                    'SELECT *, pokemon_list.species_id AS entry_number '
-                    'FROM pokemon_list '
-                    'WHERE pokemon_list.type1 = ? OR pokemon_list.type2 = ? '
-                    'ORDER BY entry_number',
-                    (type_id, type_id)
-                )
-        else:
-            if type_id == -1:
-                cursor.execute(
-                    'SELECT pokemon_list.*, pp.entry_number '
-                    'FROM pokemon_list '
-                    'JOIN pokedex_pokemon pp ON pp.species_id = pokemon_list.species_id '
-                    'WHERE pp.pokedex_id = ? '
-                    'ORDER BY pp.entry_number',
-                    (pokedex_id,)
-                )
-            else:
-                cursor.execute(
-                    'SELECT pokemon_list.*, pp.entry_number '
-                    'FROM pokemon_list '
-                    'JOIN pokedex_pokemon pp ON pp.species_id = pokemon_list.species_id '
-                    'WHERE pp.pokedex_id = ? AND (pokemon_list.type1 = ? OR pokemon_list.type2 = ?) '
-                    'ORDER BY pp.entry_number',
-                    (pokedex_id, type_id, type_id)
-                )
-
-        result = cursor.fetchall()
-        connection.close()
-
-        self.fill_sorter(result)
-
-    def fill_sorter(self, result):
-        self.tableWidget_2.clearContents()
-        self.tableWidget_2.setRowCount(0)
-
-        self.tableWidget_2.setSortingEnabled(False)
-
-        for entry in result:
-            row = self.tableWidget_2.rowCount()
-            self.tableWidget_2.setRowCount(row+1)
-
-            item = QtWidgets.QTableWidgetItem(f"{entry['entry_number']:04d}")
-            item.setData(QtCore.Qt.ItemDataRole.UserRole, entry['species_id'])
-            item.setData(QtCore.Qt.ItemDataRole.UserRole+1, entry['pokemon_id'])
-            self.tableWidget_2.setItem(row, 0, item)
-
-            name_en = entry['name_en']
-            if entry['full_name_en']:
-                name_en = entry['full_name_en']
-            elif entry['form_en']:
-                name_en += f" {entry['form_en']}"
-
-            name_de = entry['name_de']
-            if entry['full_name_de']:
-                name_de = entry['full_name_de']
-            elif entry['form_de']:
-                name_de += f" {entry['form_de']}"
-
-            item = QtWidgets.QTableWidgetItem(name_en)
-            item.setToolTip(name_de)
-            self.tableWidget_2.setItem(row, 1, item)
-
-            type_en = []
-            type_de = []
-            for t_id in ('type1', 'type2'):
-                t_de, t_en = self.types[entry[t_id]]
-                if t_en:
-                    type_en.append(t_en)
-                    type_de.append(t_de)
-
-            item = QtWidgets.QTableWidgetItem(' / '.join(type_en))
-            item.setToolTip('\n'.join(type_en))
-            self.tableWidget_2.setItem(row, 2, item)
-
-            total = 0
-            for i, stat_name in enumerate(('hit_points', 'attack', 'defense', 'sp_atk', 'sp_def', 'speed')):
-                stat_value = entry[stat_name]
-                item = QtWidgets.QTableWidgetItem()
-                item.setData(QtCore.Qt.ItemDataRole.DisplayRole, stat_value)
-                item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignRight | QtCore.Qt.AlignmentFlag.AlignVCenter)
-                self.tableWidget_2.setItem(row, i+4, item)
-                total += stat_value
-
-            item = QtWidgets.QTableWidgetItem()
-            item.setData(QtCore.Qt.ItemDataRole.DisplayRole, total)
-            item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignRight | QtCore.Qt.AlignmentFlag.AlignVCenter)
-            self.tableWidget_2.setItem(row, 3, item)
-
-            item = QtWidgets.QTableWidgetItem()
-            item.setData(QtCore.Qt.ItemDataRole.DisplayRole, entry['height'] / 10)
-            item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignRight | QtCore.Qt.AlignmentFlag.AlignVCenter)
-            self.tableWidget_2.setItem(row, 10, item)
-
-            item = QtWidgets.QTableWidgetItem()
-            item.setData(QtCore.Qt.ItemDataRole.DisplayRole, entry['weight'] / 10)
-            item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignRight | QtCore.Qt.AlignmentFlag.AlignVCenter)
-            self.tableWidget_2.setItem(row, 11, item)
-
-            item = QtWidgets.QTableWidgetItem()
-            item.setData(QtCore.Qt.ItemDataRole.DisplayRole, round(entry['weight']/entry['height']**2 * 10, 2))
-            item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignRight | QtCore.Qt.AlignmentFlag.AlignVCenter)
-            self.tableWidget_2.setItem(row, 12, item)
-
-        self.tableWidget_2.resizeColumnToContents(1)
-        self.tableWidget_2.resizeColumnToContents(2)
-        self.tableWidget_2.setSortingEnabled(True)
-
-    def randomize(self):
-        select = randint(0, self.tableWidget_2.rowCount())
-        self.show_pokemon(select)
-
-    def show_pokemon(self, row: int = None):
-        table = self.tableWidget_2
-        if row is None:
-            row = table.currentRow()
-
-        species_id = table.item(row, 0).data(QtCore.Qt.ItemDataRole.UserRole)
-        poke_id = table.item(row, 0).data(QtCore.Qt.ItemDataRole.UserRole+1)
-        pokemon_name = table.item(row, 1).text()
-
-        connection = get_connection(self._db)
-        cursor = connection.cursor()
-
-        cursor.execute(
-            'SELECT p.id FROM pokemon p WHERE p.species_id = ?',
-            (species_id,)
-        )
-
-        pokemon = cursor.fetchall()
-        connection.close()
-
-        self.tabWidget.setCurrentIndex(0)
-        for i in range(1, self.tabWidget.count()):
-            self.tabWidget.setTabVisible(i, False)
-
-        widget_idx = 0
-
-        for i, p in enumerate(pokemon):
-            entry_widget = self.tabWidget.widget(i)
-
-            if poke_id == p[0]:
-                widget_idx = i
-
-            if entry_widget is None:
-                self.tabWidget.addTab(PokemonEntry(p[0]), '')
-
-            self.tabWidget.setTabText(i, pokemon_name)
-            self.tabWidget.setTabVisible(i, True)
-            name = self.tabWidget.widget(i).create_pokemon(p[0])
-            self.tabWidget.setTabText(i, name)
-            self.tabWidget.setCurrentIndex(widget_idx)
-
-
-class PokemonEntry(QtWidgets.QWidget, Ui_Form):
-    _db = ''
-
-    def __init__(self, pokemon_id: int, parent=None):
-        super().__init__(parent=parent)
-
-        self.setupUi(self)
-
-        self.bars = [
-            None, self.hp_bar, self.attack_bar, self.defense_bar, self.spec_attack_bar, self.spec_defense_bar, self.speed_bar
-        ]
-        self.ability_labels = [None, self.ability1_label, self.ability2_label, self.ability3_label]
-        self.type_labels = [None, self.type1_label, self.type2_label]
-
-        self.create_pokemon(pokemon_id)
-
-    def create_pokemon(self, poke_id):
-        pokemon = self.get_pokemon(poke_id)
-        species = self.get_species(pokemon['species_id'])
-
-        self.nationaldex_label.setText(f"{pokemon['species_id']:04d}")
-
-        self.species_label.setText(species['genus_en'])
-        self.species_label.setToolTip(species['genus_de'])
-
-        self.height_label.setText(f"{pokemon['height'] / 10} m")
-        self.weight_label.setText(f"{pokemon['weight'] / 10} kg")
-
-        if species['gender_ratio'] == -1:
-            gender = "Gender unknown"
-        else:
-            gender = f"{species['gender_ratio']*12.5:0.2f}% female, {100-species['gender_ratio']*12.5:0.2f}% male"
-
-        self.gender_label.setText(gender)
-
-        if not QtGui.QPixmapCache.find(str(poke_id)):
-            image = b''
-            if pokemon['artwork'] is not None:
-                try:
-                    res = urllib.request.urlopen(pokemon['artwork'])
-                    image = res.read()
-                except:
-                    pass
-
-            pixmap = QtGui.QPixmap()
-            pixmap.loadFromData(image)
-            sc_pixmap = pixmap.scaled(400, 400, QtCore.Qt.AspectRatioMode.KeepAspectRatio)
-
-            QtGui.QPixmapCache.insert(str(poke_id), sc_pixmap)
-
-        self.artwork_label.setPixmap(QtGui.QPixmapCache.find(str(poke_id)))
-
-        stats = self.get_stats(poke_id)
-        for (stat_id, stat_value) in stats:
-            self.bars[stat_id].setValue(stat_value)
-
-        abilities = self.get_abilities(poke_id)
-        for lab in self.ability_labels[1:]:
-            lab.setVisible(False)
-        for (slot, is_hidden, name_de, name_en) in abilities:
-            self.ability_labels[slot].setVisible(True)
-            t = name_en
-            if is_hidden:
-                t += ' (hidden ability)'
-            self.ability_labels[slot].setText(t)
-            self.ability_labels[slot].setToolTip(name_de)
-
-        form, types = self.get_form_and_type(poke_id)
-        for lab in self.type_labels[1:]:
-            lab.setVisible(False)
-
-        for (type_id, slot) in types:
-            self.type_labels[slot].setVisible(True)
-            self.type_labels[slot].setText(QPoke.types[type_id][1])
-            self.type_labels[slot].setToolTip(QPoke.types[type_id][0])
-
-        evolutions = self.make_evolution(pokemon['evolution_id'])
-
-        self.tableWidget.clear()
-        self.tableWidget.setColumnCount(4)
-        self.tableWidget.setRowCount(len(evolutions))
-
-        for i, e in enumerate(evolutions):
-            item = QtWidgets.QTableWidgetItem(f'{e[0]} (#{e[1]:04d})')
-            self.tableWidget.setItem(i, 0, item)
-            item = QtWidgets.QTableWidgetItem('to')
-            self.tableWidget.setItem(i, 1, item)
-            item = QtWidgets.QTableWidgetItem(f'{e[2]} (#{e[3]:04d})')
-            self.tableWidget.setItem(i, 2, item)
-            item = QtWidgets.QTableWidgetItem(f'{e[4]}')
-            self.tableWidget.setItem(i, 3, item)
-
-        self.tableWidget.resizeColumnsToContents()
-        self.tableWidget.resizeRowsToContents()
-
-        if form['full_name_en'] is not None:
-            return form['full_name_en']
-        elif form['form_en'] is not None:
-            return f"{species['name_en']} ({form['form_en']})"
-        else:
-            return species['name_en']
-
-    @cache
-    def get_pokedex(self, pokedex_id):
-        connection = get_connection(self._db)
-        cursor = connection.cursor()
-        cursor.execute(
-            'SELECT pokemon_list.*, pp.entry_number  FROM pokemon_list '
-            'JOIN pokedex_pokemon pp ON pp.species_id = pokemon_list.species_id '
-            'WHERE pp.pokedex_id = ? '
-            'ORDER BY pp.entry_number',
-            (pokedex_id,)
-        )
-        res = cursor.fetchall()
-        connection.close()
-
-        return res
-
-    @cache
-    def get_abilities(self, pokemon_id):
-        conn = get_connection(self._db)
-        cursor = conn.cursor()
-        cursor.execute(
-            'SELECT slot, ís_hidden, name_de, name_en FROM pokemon_ability '
-            'JOIN main.ability ON pokemon_ability.ability_id = ability.id '
-            'WHERE pokemon_id = ?',
-            (pokemon_id,)
-        )
-
-        abilities = cursor.fetchall()
-        conn.close()
-
-        return abilities
-
-    @cache
-    def get_pokemon(self, poke_id):
-        connection = get_connection(self._db)
-        cursor = connection.cursor()
-
-        cursor.execute(
-            'SELECT p.species_id, p.height, p.weight, p.artwork, p.evolution_id FROM pokemon p WHERE p.id = ?',
-            (poke_id,)
-        )
-        pokemon = cursor.fetchone()
-
-        connection.close()
-
-        return pokemon
-
-    @cache
-    def get_species(self, species_id):
-        connection = get_connection(self._db)
-        cursor = connection.cursor()
-
-        cursor.execute(
-            'SELECT s.id, s.name_en, s.name_de, s.genus_de, s.genus_en, s.color_id, s.is_mythical, s.is_legendary, s.generation, s.gender_ratio '
-            'FROM species s '
-            'WHERE s.id = ?',
-            (species_id,)
-        )
-
-        species = cursor.fetchone()
-
-        connection.close()
-
-        return species
-
-    @cache
-    def get_stats(self, pokemon_id):
-        conn = get_connection(self._db)
-        cursor = conn.cursor()
-
-        cursor.execute(
-            'SELECT stat_id, value FROM pokemon_stat WHERE pokemon_id = ?',
-            (pokemon_id,)
-        )
-        stats = cursor.fetchall()
-        conn.close()
-
-        return stats
-
-    @cache
-    def get_form_and_type(self, pokemon_id):
-        conn = get_connection(self._db)
-        cursor = conn.cursor()
-        cursor.execute(
-            'SELECT id, full_name_en, form_en FROM form WHERE pokemon_id = ? AND is_default = 1',
-            (pokemon_id,)
-        )
-
-        form = cursor.fetchone()
-
-        cursor.execute(
-            'SELECT type_id, slot FROM form_type WHERE form_id = ?',
-            (form['id'],)
-        )
-        types = cursor.fetchall()
-
-        conn.close()
-
-        return form, types
-
-    @cache
-    def make_evolution(self, poke_id: int):
-        steps = []
-
-        conn = get_connection(self._db)
-        cursor = conn.cursor()
-
-        cursor.execute('SELECT * FROM evolution_names WHERE id = ?', (poke_id,))
-        chain = cursor.fetchall()
-        conn.close()
-
-        trigger_texts = [
-            None,
-            'Level up',
-            'Trade',
-            '',
-            'Empty spot in party',
-            'Spin',
-            'Train in the Tower of Darkness',
-            'Train in the Tower of Water',
-            'Land three critical hits in a battle',
-            'Go somewhere after taking damage',
-            '',
-            'Use Psyshield Bash 20 times in Agile Style',
-            'Use Barb Barrage 20 times in Strong Style',
-            'Receive 294 recoil damage in battle',
-        ]
-
-        special_pokemon = {
-            24: 'Use Rage Fist 20 times',
-            317: "Defeat 3 Bisharp that are holding Leader's Crest",
-            528: 'Collect 999 Coins from Roaming Form',
-            484: "Walk 1,000 steps in Let's Go mode",
-            485: "Walk 1,000 steps in Let's Go mode",
-            495: "Walk 1,000 steps in Let's Go mode",
-            499: "Walk 1,000 steps in Let's Go mode",
-            504: "Level up while in multiplayer"
-        }
-
-        condition_text = {
-            'min_level': lambda x: f"Lv. {x['min_level']}",
-            'min_happiness': lambda _: f"high Friendship",
-            'min_beauty': lambda _: f"needs max. Beauty",
-            'min_affection': lambda x: f"{x['min_affection']} Affection",
-            'location_en': lambda x: f"at {x['location_en']}",
-            'held_item_en': lambda x: f"hold {x['held_item_en']}",
-            'item_en': lambda x: f'Use {x["item_en"]}',
-            'known_move_en': lambda x: f"know {x['known_move_en']}",
-            'move_type_en': lambda x: f"know {x['move_type_en']} move",
-            'party_species_en': lambda x: f"{x['party_species_en']} in party",
-            'party_type_en': lambda x: f"{x['party_type_en']} in party",
-            'time_of_day': lambda x: f"at {x['time_of_day']}",
-            'trade_species_en': lambda x: f"with {x['trade_species_en']}",
-            'needs_rain': lambda _: 'during rain',
-            'upside_down': lambda _: 'hold controller upside-down',
-            'relative_stats': lambda x: {1: 'attack > defense', 0: 'attack = defense', -1: 'attack < defense'}[x['relative_stats']],
-        }
-
-        for c in chain:
-            lvl0 = c["name_en"]
-            if c['gender'] == 1:
-                lvl0 += ' (female)'
-            elif c['gender'] == 2:
-                lvl0 += ' (male)'
-
-            trig = c['trigger']
-
-            if trig == 10:
-                level_text = [special_pokemon[poke_id]]
-            else:
-                level_text = [trigger_texts[trig]]
-
-            for k, v in condition_text.items():
-                if c[k] is not None:
-                    level_text.append(v(c))
-
-            steps.append(
-                (lvl0, c['evolves_from'], c['evolve_en'], c['species_id'], ', '.join(filter(lambda x: x, level_text)))
-            )
-
-        return steps

src/gui_qt/lib/spinboxes.py

@@ -34,9 +34,9 @@ class SciSpinBox(QtWidgets.QDoubleSpinBox):
 
         new_value = self._prev_value
         if new_value != 0.0:
-            new_value *= 10**(step/99.)
+            new_value *= 10**(step/19.)
         else:
-            new_value = 0.00001
+            new_value = 0.001
 
         self.setValue(new_value)
         self.lineEdit().setText(f'{new_value:.3e}')

src/gui_qt/lib/update.py

@@ -1,288 +0,0 @@
-from __future__ import annotations
-
-import hashlib
-import os
-import subprocess
-import urllib.request
-from datetime import datetime
-
-from os import getenv, stat
-from os.path import exists
-from pathlib import Path
-from urllib.error import HTTPError
-
-from PyQt5 import QtWidgets, QtCore
-
-from nmreval.lib.logger import logger
-
-
-class UpdateDialog(QtWidgets.QDialog):
-    startDownload = QtCore.pyqtSignal(tuple)
-    restartSignal = QtCore.pyqtSignal()
-
-    def __init__(self, filename: str = None, parent=None):
-        super().__init__(parent=parent)
-        self._init_ui()
-
-        if filename is None:
-            filename = getenv('APPIMAGE')
-        self._appfile = filename
-
-        self.updater = Updater()
-
-        self.thread = QtCore.QThread(self)
-        self.thread.start()
-        self.helper = Downloader()
-        self.startDownload.connect(self.helper.run_download)
-        self.helper.progressChanged.connect(self.status.setText)
-        self.helper.finished.connect(self.finish_update)
-        self.helper.started.connect(self.status.show)
-        self.helper.moveToThread(self.thread)
-
-        self.look_for_updates(self._appfile)
-
-    def _init_ui(self):
-        self.setWindowTitle('Updates')
-
-        layout = QtWidgets.QVBoxLayout()
-
-        self.label = QtWidgets.QLabel()
-        layout.addWidget(self.label)
-
-        layout.addSpacing(10)
-
-        self.status = QtWidgets.QLabel()
-        self.status.hide()
-        layout.addWidget(self.status)
-        layout.addSpacing(10)
-
-        self.dialog_button = QtWidgets.QDialogButtonBox()
-        self.dialog_button.accepted.connect(self.update_appimage)
-        self.dialog_button.rejected.connect(self.close)
-        layout.addWidget(self.dialog_button)
-
-        self.setLayout(layout)
-
-    def look_for_updates(self, filename=None):
-        logger.info(f'Looking for updates, compare to file {filename}')
-        # Download zsync file of latest Appimage, look for SHA-1 hash and compare with hash of AppImage
-        is_updateble, m_time_file, m_time_zsync = self.updater.get_update_information(filename)
-
-        label_text = ''
-
-        if is_updateble is None:
-            label_text += '<p>Could not determine if this version is newer, please update manually (if necessary).</p>'
-            dialog_bttns = QtWidgets.QDialogButtonBox.Close
-        elif is_updateble:
-            label_text += '<p>Different version available. Press Ok to download this version, Cancel to ignore.</p>'
-            dialog_bttns = QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel
-        else:
-            label_text += '<p>Version may be already up-to-date.</p>'
-            dialog_bttns = QtWidgets.QDialogButtonBox.Close
-
-        if m_time_zsync is None:
-            label_text += '<p>Creation date of remote version is unknown.</p>'
-        else:
-            label_text += f'<p>Date of most recent AppImage: {m_time_zsync.strftime("%d %B %Y %H:%M")}</p>'
-
-        if m_time_file is None:
-            label_text += 'No AppImage file found, press Ok to download latest version.'
-            dialog_bttns = QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Close
-        else:
-            label_text += f'<p>Date of used AppImage: {m_time_file.strftime("%d %B %Y %H:%M")}</p>'
-
-        self.label.setText(label_text)
-        self.dialog_button.setStandardButtons(dialog_bttns)
-
-    @QtCore.pyqtSlot()
-    def update_appimage(self):
-        if self._appfile is None:
-            args = (self.updater.zsync_url,)
-        else:
-            # this breaks the download for some reason
-            args = (self.updater.zsync_url, self._appfile)
-
-        self.dialog_button.setEnabled(False)
-
-        self.startDownload.emit(args)
-        self.status.show()
-
-    @QtCore.pyqtSlot(int, str)
-    def finish_update(self, retcode: int, file_loc: str):
-        restart = QRestartWindow(state=retcode, file_loc=file_loc, parent=self)
-        res = restart.exec()
-
-        self.close()
-
-        if res == QtWidgets.QMessageBox.Ok:
-            self.restartSignal.emit()
-
-    def closeEvent(self, evt):
-        self.thread.quit()
-        self.thread.wait()
-
-        super().closeEvent(evt)
-
-
-class QRestartWindow(QtWidgets.QMessageBox):
-    def __init__(self, state: int, file_loc: str, parent=None):
-        super().__init__(parent=parent)
-        self._appfile = file_loc
-
-        if state:
-            self.setText('Download failed')
-            self.setDetailedText(f'Status code of failure is {state}')
-            self.setStandardButtons(QtWidgets.QMessageBox.Close)
-            self.setIcon(QtWidgets.QMessageBox.Warning)
-        else:
-            self.setText('Download completed!')
-            self.setInformativeText("Press Restart to use new AppImage")
-            self.setDetailedText(f'Location of AppImage: {file_loc}')
-
-            self.setIcon(QtWidgets.QMessageBox.Information)
-
-            self.setStandardButtons(QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Close)
-            restart_button = self.button(QtWidgets.QMessageBox.Ok)
-            restart_button.setText('Restart')
-
-        self.buttonClicked.connect(self.maybe_close)
-
-    def maybe_close(self):
-        if self.clickedButton() == self.button(QtWidgets.QMessageBox.Ok):
-            app = QtWidgets.QApplication.instance()
-            app.quit()
-            subprocess.Popen(self._appfile)
-
-
-class Downloader(QtCore.QObject):
-    started = QtCore.pyqtSignal()
-    finished = QtCore.pyqtSignal(int, str)
-    progressChanged = QtCore.pyqtSignal(str)
-
-    @QtCore.pyqtSlot(tuple)
-    def run_download(self, args: tuple[str]):
-        status = 0
-        appimage_location = args[0][:-6]
-        logger.info(f'Download {appimage_location}')
-        if len(args) == 2:
-            new_file = Path(args[1])
-        else:
-            new_file = Path.home() / 'Downloads' / 'NMReval-latest-x86_64.AppImage'
-
-        if new_file.exists():
-            os.rename(new_file, new_file.with_suffix('.AppImage.old'))
-
-        try:
-            with urllib.request.urlopen(appimage_location) as response:
-                with new_file.open('wb') as f:
-                    f.write(response.read())
-
-            new_file.chmod(0o755)
-        except HTTPError as e:
-            logger.exception(f'Download failed with {e}')
-            status = 3
-        except Exception as e:
-            logger.exception(f'Download failed with {e.args}')
-            status = 1
-
-        if status != 0:
-            logger.warning('Download failed, restore previous AppImage')
-            try:
-                os.rename(new_file.with_suffix('.AppImage.old'), new_file)
-            except FileNotFoundError:
-                pass
-        # zsync does not support https
-
-        self.finished.emit(status, str(new_file))
-
-
-class Updater:
-    host = 'gitea.pkm.physik.tu-darmstadt.de/api/packages/IPKM/generic/NMReval/latest/'
-    version = 'NMReval-latest-x86_64'
-
-    @property
-    def zsync_url(self):
-        return f'https://{Updater.host}/{Updater.version}.AppImage.zsync'
-
-    @staticmethod
-    def get_zsync():
-        url_zsync = f'https://{Updater.host}/{Updater.version}.AppImage.zsync'
-        m_time_zsync = None
-        checksum_zsync = None
-        zsync_file = None
-        filename = None
-        try:
-            with urllib.request.urlopen(url_zsync) as response:
-                zsync_file = response.read()
-        except HTTPError as e:
-            logger.error(f'Request for zsync returned code {e}')
-        except Exception as e:
-            logger.exception(f'Download of zsync failed with exception {e.args}')
-
-        if zsync_file is not None:
-            for line in zsync_file.split(b'\n'):
-                try:
-                    kw, val = line.split(b': ')
-                    time_string = str(val, encoding='utf-8')
-                    time_format = '%a, %d %b %Y %H:%M:%S %z'
-                    if kw == b'MTime':
-                        try:
-                            m_time_zsync = datetime.strptime(time_string, time_format).astimezone(None)
-                        except ValueError:
-                            logger.warning(f'zsync time "{time_string}" does not match "{time_format}"')
-                    elif kw == b'SHA-1':
-                        checksum_zsync = str(val, encoding='utf-8')
-                    elif kw == b'Filename':
-                        filename = str(val, encoding='utf-8')
-
-                except ValueError:
-                    # stop when empty line is reached
-                    break
-
-        return m_time_zsync, checksum_zsync, filename
-
-    @staticmethod
-    def get_appimage_info(filename: str):
-        if filename is None:
-            return None, None
-
-        if not exists(filename):
-            return None, None
-
-        stat_mtime = stat(filename).st_mtime
-        m_time_file = datetime.fromtimestamp(stat_mtime).replace(microsecond=0)
-        with open(filename, 'rb') as f:
-            checksum_file = hashlib.sha1(f.read()).hexdigest()
-            if checksum_file is None:
-                logger.warning('No checksum for AppImage calculated')
-
-        return m_time_file, checksum_file
-
-    @staticmethod
-    def get_update_information(filename: str) -> tuple[(bool | None), datetime, datetime]:
-        m_time_zsync, checksum_zsync, appname = Updater.get_zsync()
-        m_time_file, checksum_file = Updater.get_appimage_info(filename)
-
-        logger.debug(f'zsync information {m_time_zsync}, {checksum_zsync}, {appname}')
-        logger.debug(f'file information {m_time_file}, {checksum_file}')
-
-        if not ((checksum_file is not None) and (checksum_zsync is not None)):
-            return None, m_time_file, m_time_zsync
-        else:
-            return checksum_file != checksum_zsync, m_time_file, m_time_zsync
-
-
-if __name__ == '__main__':
-    import sys
-    from gui_qt import App
-
-    app = App(['Team Rocket FTW!'])
-
-    updater = UpdateDialog()
-    updater.show()
-
-    sys.exit(app.exec())
-
-
-
-

src/gui_qt/lib/usermodeleditor.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 
 from ..Qt import QtWidgets, QtCore, QtGui
-from .codeeditor import EditorWidget
+from ..lib.codeeditor import CodeEditor
 
 
 class QUsermodelEditor(QtWidgets.QMainWindow):
@@ -26,7 +26,7 @@ class QUsermodelEditor(QtWidgets.QMainWindow):
         layout.setContentsMargins(3, 3, 3, 3)
         layout.setSpacing(3)
 
-        self.edit_field = EditorWidget(self.centralwidget)
+        self.edit_field = CodeEditor(self.centralwidget)
         font = QtGui.QFont('default')
         font.setStyleHint(font.Monospace)
         font.setPointSize(10)
@@ -50,20 +50,18 @@ class QUsermodelEditor(QtWidgets.QMainWindow):
         self.menuFile.addAction('Close', self.close, QtGui.QKeySequence.Quit)
 
         self.resize(800, 600)
-        self.setGeometry(
+        self.setGeometry(QtWidgets.QStyle.alignedRect(
-            QtWidgets.QStyle.alignedRect(
+            QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,
-                QtCore.Qt.LayoutDirection.LeftToRight,
+            self.size(), QtWidgets.qApp.desktop().availableGeometry()
-                QtCore.Qt.AlignmentFlag.AlignCenter,
+        ))
-                self.size(),
-                QtWidgets.qApp.desktop().availableGeometry()
-            )
-        )
 
+    @property
     def is_modified(self):
-        return self.edit_field.editor.document().isModified()
+        return self.edit_field.document().isModified()
 
-    def set_modified(self, val: bool):
+    @is_modified.setter
-        self.edit_field.editor.document().setModified(val)
+    def is_modified(self, val: bool):
+        self.edit_field.document().setModified(val)
 
     @QtCore.pyqtSlot()
     def open_file(self):
@@ -77,22 +75,17 @@ class QUsermodelEditor(QtWidgets.QMainWindow):
     def read_file(self, fname: str | Path):
         self.set_fname_opts(fname)
 
-        if self.fname is not None:
         with self.fname.open('r') as f:
             self.edit_field.setPlainText(f.read())
 
     def set_fname_opts(self, fname: str | Path):
-        fname = Path(fname)
-        if fname.is_file():
         self.fname = Path(fname)
         self._dir = self.fname.parent
         self.setWindowTitle('Edit ' + str(fname))
-        elif fname.is_dir():
-            self._dir = fname
-
 
+    @property
     def changes_saved(self) -> bool:
-        if not self.is_modified():
+        if not self.is_modified:
             return True
 
         ret = QtWidgets.QMessageBox.question(self, 'Time to think',
@@ -104,9 +97,9 @@ class QUsermodelEditor(QtWidgets.QMainWindow):
             self.save_file()
 
         if ret == QtWidgets.QMessageBox.No:
-            self.set_modified(False)
+            self.is_modified = False
 
-        return not self.is_modified()
+        return not self.is_modified
 
     @QtCore.pyqtSlot()
     def save_file(self):
@@ -118,9 +111,9 @@ class QUsermodelEditor(QtWidgets.QMainWindow):
 
             self.set_fname_opts(outfile)
 
-            self.set_modified(False)
+            self.is_modified = False
 
-        return self.is_modified()
+        return self.is_modified
 
     @QtCore.pyqtSlot()
     def overwrite_file(self):
@@ -130,10 +123,10 @@ class QUsermodelEditor(QtWidgets.QMainWindow):
 
         self.modelsChanged.emit()
 
-        self.set_modified(False)
+        self.is_modified = False
 
     def closeEvent(self, evt: QtGui.QCloseEvent):
-        if not self.changes_saved():
+        if not self.changes_saved:
             evt.ignore()
         else:
             super().closeEvent(evt)

src/gui_qt/lib/utils.py

@@ -1,16 +1,27 @@
 from __future__ import annotations
 
+import os
+import urllib.request
+from os import getenv, stat
+from os.path import exists
+import hashlib
+import subprocess
+from datetime import datetime
 from contextlib import contextmanager
+from pathlib import Path
+from urllib.error import HTTPError
 from numpy import linspace
 from scipy.interpolate import interp1d
 
+from nmreval.lib.logger import logger
+
 from ..Qt import QtGui, QtWidgets, QtCore
 
 
 @contextmanager
 def busy_cursor():
     try:
-        cursor = QtGui.QCursor(QtCore.Qt.CursorShape.ForbiddenCursor)
+        cursor = QtGui.QCursor(QtCore.Qt.ForbiddenCursor)
         QtWidgets.QApplication.setOverrideCursor(cursor)
         yield
 
@@ -52,3 +63,225 @@ class RdBuCMap:
         return col
 
 
+class UpdateDialog(QtWidgets.QDialog):
+    startDownload = QtCore.pyqtSignal(tuple)
+
+    def __init__(self, filename: str = None, parent=None):
+        super().__init__(parent=parent)
+        self._init_ui()
+
+        if filename is None:
+            filename = getenv('APPIMAGE')
+        self._appfile = filename
+
+        self.updater = Updater()
+
+        self.thread = QtCore.QThread(self)
+        self.thread.start()
+        self.helper = Downloader()
+        self.startDownload.connect(self.helper.run_download)
+        self.helper.progressChanged.connect(self.status.setText)
+        self.helper.finished.connect(self.finish_update)
+        self.helper.started.connect(self.status.show)
+        self.helper.moveToThread(self.thread)
+
+        self.look_for_updates(self._appfile)
+
+    def _init_ui(self):
+        self.setWindowTitle('Updates')
+
+        layout = QtWidgets.QVBoxLayout()
+
+        self.label = QtWidgets.QLabel()
+        layout.addWidget(self.label)
+
+        layout.addSpacing(10)
+
+        self.status = QtWidgets.QLabel()
+        self.status.hide()
+        layout.addWidget(self.status)
+        layout.addSpacing(10)
+
+        self.dialog_button = QtWidgets.QDialogButtonBox()
+        self.dialog_button.accepted.connect(self.update_appimage)
+        self.dialog_button.rejected.connect(self.close)
+        layout.addWidget(self.dialog_button)
+
+        self.setLayout(layout)
+
+    def look_for_updates(self, filename=None):
+        logger.info(f'Looking for updates, compare to file {filename}')
+        # Download zsync file of latest Appimage, look for SHA-1 hash and compare with hash of AppImage
+        is_updateble, m_time_file, m_time_zsync = self.updater.get_update_information(filename)
+
+        label_text = ''
+
+        if is_updateble is None:
+            label_text += '<p>Could not determine if this version is newer, please update manually (if necessary).</p>'
+            dialog_bttns = QtWidgets.QDialogButtonBox.Close
+        elif is_updateble:
+            label_text += '<p>Newer version available. Press Ok to download new version, Cancel to ignore.</p>'
+            dialog_bttns = QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel
+        else:
+            label_text += '<p>Version may be already up-to-date.</p>'
+            dialog_bttns = QtWidgets.QDialogButtonBox.Close
+
+        if m_time_zsync is None:
+            label_text += '<p>Creation date of remote version is unknown.</p>'
+        else:
+            label_text += f'<p>Date of most recent AppImage: {m_time_zsync.strftime("%d %B %Y %H:%M")}</p>'
+
+        if m_time_file is None:
+            label_text += 'No AppImage file found, press Ok to download latest version.'
+            dialog_bttns = QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Close
+        else:
+            label_text += f'<p>Date of used AppImage: {m_time_file.strftime("%d %B %Y %H:%M")}</p>'
+
+        self.label.setText(label_text)
+        self.dialog_button.setStandardButtons(dialog_bttns)
+
+    @QtCore.pyqtSlot()
+    def update_appimage(self):
+        if self._appfile is None:
+            args = (self.updater.zsync_url,)
+        else:
+            # this breaks the download for some reason
+            args = (self.updater.zsync_url, self._appfile)
+
+        self.dialog_button.setEnabled(False)
+
+        self.startDownload.emit(args)
+        self.status.show()
+
+    @QtCore.pyqtSlot(int, str)
+    def finish_update(self, retcode: int, file_loc: str):
+        if retcode == 0:
+            self.status.setText(f'Download complete.New AppImage lies in <p><em>{file_loc}</em>.</p>')
+        else:
+            self.status.setText(f'Download failed :( with return code {retcode}.')
+        self.dialog_button.setStandardButtons(QtWidgets.QDialogButtonBox.Close)
+        self.dialog_button.setEnabled(True)
+
+    def closeEvent(self, evt):
+        self.thread.quit()
+        self.thread.wait()
+
+        super().closeEvent(evt)
+
+
+class Downloader(QtCore.QObject):
+    started = QtCore.pyqtSignal()
+    finished = QtCore.pyqtSignal(int, str)
+    progressChanged = QtCore.pyqtSignal(str)
+
+    @QtCore.pyqtSlot(tuple)
+    def run_download(self, args: tuple[str]):
+        status = 0
+        appimage_location = args[0][:-6]
+        logger.info(f'Download {appimage_location}')
+        if len(args) == 2:
+            new_file = Path(args[1])
+        else:
+            new_file = Path.home() / 'Downloads' / 'NMReval-latest-x86_64.AppImage'
+
+        if new_file.exists():
+            os.rename(new_file, new_file.with_suffix('.AppImage.old'))
+
+        try:
+            with urllib.request.urlopen(appimage_location) as response:
+                with new_file.open('wb') as f:
+                    f.write(response.read())
+
+            new_file.chmod(0o755)
+        except HTTPError as e:
+            logger.exception(f'Download failed with {e}')
+            status = 3
+        except Exception as e:
+            logger.exception(f'Download failed with {e.args}')
+            status = 1
+
+        if status != 0:
+            logger.warning('Download failed, restore previous AppImage')
+            try:
+                os.rename(new_file.with_suffix('.AppImage.old'), new_file)
+            except FileNotFoundError:
+                pass
+        # zsync does not support https
+
+        self.finished.emit(status, str(new_file))
+
+
+class Updater:
+    host = 'gitea.pkm.physik.tu-darmstadt.de/api/packages/IPKM/generic/NMReval/latest/'
+    version = 'NMReval-latest-x86_64'
+
+    @property
+    def zsync_url(self):
+        return f'https://{Updater.host}/{Updater.version}.AppImage.zsync'
+
+    @staticmethod
+    def get_zsync():
+        url_zsync = f'https://{Updater.host}/{Updater.version}.AppImage.zsync'
+        m_time_zsync = None
+        checksum_zsync = None
+        zsync_file = None
+        filename = None
+        try:
+            with urllib.request.urlopen(url_zsync) as response:
+                zsync_file = response.read()
+        except HTTPError as e:
+            logger.error(f'Request for zsync returned code {e}')
+        except Exception as e:
+            logger.exception(f'Download of zsync failed with exception {e.args}')
+
+        if zsync_file is not None:
+            for line in zsync_file.split(b'\n'):
+                try:
+                    kw, val = line.split(b': ')
+                    time_string = str(val, encoding='utf-8')
+                    time_format = '%a, %d %b %Y %H:%M:%S %z'
+                    if kw == b'MTime':
+                        try:
+                            m_time_zsync = datetime.strptime(time_string, time_format).astimezone(None)
+                        except ValueError:
+                            logger.warning(f'zsync time "{time_string}" does not match "{time_format}"')
+                    elif kw == b'SHA-1':
+                        checksum_zsync = str(val, encoding='utf-8')
+                    elif kw == b'Filename':
+                        filename = str(val, encoding='utf-8')
+
+                except ValueError:
+                    # stop when empty line is reached
+                    break
+
+        return m_time_zsync, checksum_zsync, filename
+
+    @staticmethod
+    def get_appimage_info(filename: str):
+        if filename is None:
+            return None, None
+
+        if not exists(filename):
+            return None, None
+
+        stat_mtime = stat(filename).st_mtime
+        m_time_file = datetime.fromtimestamp(stat_mtime).replace(microsecond=0)
+        with open(filename, 'rb') as f:
+            checksum_file = hashlib.sha1(f.read()).hexdigest()
+            if checksum_file is None:
+                logger.warning('No checksum for AppImage calculated')
+
+        return m_time_file, checksum_file
+
+    @staticmethod
+    def get_update_information(filename: str) -> tuple[(bool | None), datetime, datetime]:
+        m_time_zsync, checksum_zsync, appname = Updater.get_zsync()
+        m_time_file, checksum_file = Updater.get_appimage_info(filename)
+
+        logger.debug(f'zsync information {m_time_zsync}, {checksum_zsync}, {appname}')
+        logger.debug(f'file information {m_time_file}, {checksum_file}')
+
+        if not ((checksum_file is not None) and (checksum_zsync is not None)):
+            return None, m_time_file, m_time_zsync
+        else:
+            return checksum_file != checksum_zsync, m_time_file, m_time_zsync

src/gui_qt/main/console.py

@@ -1,3 +0,0 @@
-
-
-

src/gui_qt/main/mainwindow.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime
 import os
 import re
 from pathlib import Path
@@ -12,18 +13,17 @@ from nmreval.lib.logger import logger
 from nmreval.io.sessionwriter import NMRWriter
 
 from .management import UpperManagement
-from ..lib.logger import QTextHandler
 from ..Qt import QtGui, QtPrintSupport
 from ..data.shift_graphs import QShift
 from ..data.signaledit import QPreviewDialog, QBaselineDialog
 from ..dsc.glass_dialog import TgCalculator
-from ..fit.fit_toolbar import FitToolbar
 from ..fit.result import FitExtension, QFitResult
 from ..graphs.graphwindow import QGraphWindow
 from ..graphs.movedialog import QMover
 from ..io.fcbatchreader import QFCReader
 from ..io.filedialog import *
 from ..lib.iconloading import make_action_icons, get_icon
+from ..lib.pg_objects import RegionItem
 from ..lib.starter import make_starter
 from ..math.binning import BinningWindow
 from ..math.evaluation import QEvalDialog
@@ -33,7 +33,7 @@ from ..math.smooth import QSmooth
 from ..nmr.coupling_calc import QCoupCalcDialog
 from ..nmr.t1_from_tau import QRelaxCalc
 from .._py.basewindow import Ui_BaseWindow
-from ..lib.update import UpdateDialog
+from ..lib.utils import UpdateDialog, Updater
 
 
 class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
@@ -42,7 +42,7 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
     save_ses_sig = QtCore.pyqtSignal(str)
     rest_ses_sig = QtCore.pyqtSignal(str)
 
-    def __init__(self, parents=None, path=None, bck_file=None):
+    def __init__(self, parents=None, path=None):
         super().__init__(parent=parents)
 
         if path is None:
@@ -62,13 +62,6 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         self.fitresult_dialog = None
         self.eval = None
         self.editor = None
-        self._interpol_dialog = None
-        self.fc_reader = None
-
-        self.logtext = QTextHandler(self)
-        logger.addHandler(self.logtext)
-        self.addDockWidget(QtCore.Qt.DockWidgetArea.BottomDockWidgetArea, self.logtext.console)
-        self.logtext.console.hide()
 
         self.movedialog = QMover(self)
 
@@ -82,16 +75,21 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         self._init_gui()
         self._init_signals()
 
+        if os.getenv('APPIMAGE') is not None:
+            if Updater.get_update_information(os.getenv('APPIMAGE'))[0]:
+                self.look_for_update()
+
+        self.check_for_backup()
+
+        self.__timer = QtCore.QTimer()
+        self.__backup_path = config_paths() / f'{datetime.datetime.now().strftime("%Y-%m-%d_%H%M%S")}.nmr'
+        self.__timer.start(3*60*1000)  # every three minutes
+        self.__timer.timeout.connect(self._autosave)
+
         self.fit_timer = QtCore.QTimer()
         self.fit_timer.setInterval(500)
         self.fit_timer.timeout.connect(
-            lambda: self.status.setText(f'Fit running... ({self.management.fitter.step} evaluations)')
+            lambda: self.status.setText(f'Fit running... ({self.management.fitter.step} evaluations)'))
-        )
-
-        self.__backup_path = pathlib.Path(bck_file)
-        if os.getenv('APPIMAGE'):
-            # ignore AppImages if not running from AppImage
-            self.look_for_update()
 
     def _init_gui(self):
         self.setupUi(self)
@@ -104,6 +102,14 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         self.norm_toolbutton.setIcon(get_icon('normal'))
         self.toolbar_edit.addWidget(self.norm_toolbutton)
 
+        self.fitlim_button = QtWidgets.QToolButton(self)
+        self.fitlim_button.setMenu(self.menuLimits)
+        self.fitlim_button.setPopupMode(self.fitlim_button.InstantPopup)
+        self.fitlim_button.setIcon(get_icon('fit_region'))
+        self.toolBar_fit.addWidget(self.fitlim_button)
+
+        self.area.dragEnterEvent = self.dragEnterEvent
+
         while self.tabWidget.count() > 2:
             self.tabWidget.removeTab(self.tabWidget.count()-1)
 
@@ -121,26 +127,26 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         # noinspection PyUnresolvedReferences
         self.statusBar.addWidget(self.mousepos)
 
+        self.fitregion = RegionItem()
         self._fit_plot_id = None
 
-        self.fit_toolbar = FitToolbar(self.action_FitWidget, self.menuLimits, self)
+        self.setGeometry(QtWidgets.QStyle.alignedRect(QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,
-        self.addToolBar(self.fit_toolbar)
+                                                      self.size(), QtWidgets.qApp.desktop().availableGeometry()))
-
-        self.setGeometry(QtWidgets.QStyle.alignedRect(
-            QtCore.Qt.LayoutDirection.LeftToRight,
-            QtCore.Qt.AlignmentFlag.AlignCenter,
-            self.size(),
-            QtWidgets.qApp.desktop().availableGeometry()),
-        )
 
         self.datawidget.management = self.management
         self.integralwidget.management = self.management
+        # self.drawingswidget.graphs = self.management.graphs
 
         self.ac_group = QtWidgets.QActionGroup(self)
         self.ac_group.addAction(self.action_lm_fit)
         self.ac_group.addAction(self.action_nm_fit)
         self.ac_group.addAction(self.action_odr_fit)
 
+        self.ac_group2 = QtWidgets.QActionGroup(self)
+        self.ac_group2.addAction(self.action_no_range)
+        self.ac_group2.addAction(self.action_x_range)
+        self.ac_group2.addAction(self.action_custom_range)
+
     def _init_signals(self):
         self.actionRedo = self.management.undostack.createRedoAction(self)
         icon = QtGui.QIcon.fromTheme("edit-redo")
@@ -155,8 +161,7 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         self.menuData.insertAction(self.actionRedo, self.actionUndo)
 
         self.action_save_fit_parameter.triggered.connect(self.save_fit_parameter)
-        # noinspection PyUnresolvedReferences
+        self.ac_group2.triggered.connect(self.change_fit_limits)
-        self.fit_toolbar.limit_group.triggered.connect(self.change_fit_limits)
 
         self.t1action.triggered.connect(lambda: self._show_tab('t1_temp'))
         self.action_edit.triggered.connect(self.do_preview)
@@ -196,8 +201,6 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         self.management.unset_state.connect(lambda x: self.datawidget.uncheck_sets(x))
         self.management.fitFinished.connect(self.show_fit_results)
 
-        self.area.newData.connect(lambda x: self.management.load_files(x))
-
         self.fit_dialog._management = self.management
         self.fit_dialog.preview_emit.connect(self.show_fit_preview)
         self.fit_dialog.fitStartSig.connect(self.start_fit)
@@ -230,13 +233,14 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         self.actionNext_window.triggered.connect(lambda: self.area.activateNextSubWindow())
         self.actionPrevious.triggered.connect(lambda: self.area.activatePreviousSubWindow())
 
+        self.closeSignal.connect(self.close)
+
         self.action_norm_max.triggered.connect(lambda: self.management.apply('norm', ('max',)))
         self.action_norm_max_abs.triggered.connect(lambda: self.management.apply('norm', ('maxabs',)))
         self.action_norm_first.triggered.connect(lambda: self.management.apply('norm', ('first',)))
         self.action_norm_last.triggered.connect(lambda: self.management.apply('norm', ('last',)))
         self.action_norm_area.triggered.connect(lambda: self.management.apply('norm', ('area',)))
-        self.action_cut_xaxis.triggered.connect(lambda: self.management.cut(True, False))
+        self.action_cut.triggered.connect(lambda: self.management.cut())
-        self.action_cut_yaxis.triggered.connect(lambda: self.management.cut(False, True))
 
         self.actionConcatenate_sets.triggered.connect(lambda: self.management.cat())
 
@@ -255,11 +259,8 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
 
         filedialog.set_graphs(self.management.graphs.list())
 
-        accepted = filedialog.exec()
+        filedialog.exec()
-        if accepted:
         fname = filedialog.selectedFiles()
-        else:
-            fname = []
 
         if fname:
             self.path = Path(fname[0]).parent
@@ -267,15 +268,12 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
 
     @QtCore.pyqtSlot(name='on_actionOpen_FC_triggered')
     def read_fc(self):
-        if self.fc_reader is None:
+        reader = QFCReader(path=self.path, parent=self)
-            self.fc_reader = QFCReader(path=self.path, parent=self)
+        reader.add_graphs(self.management.graphs.list())
-            self.fc_reader.data_read.connect(self.management.add_new_data)
+        reader.data_read.connect(self.management.add_new_data)
-        else:
+        reader.exec()
-            self.fc_reader(path=self.path)
-        self.fc_reader.add_graphs(self.management.graphs.list())
-        self.fc_reader.exec()
 
-        self.path = self.fc_reader.path
+        del reader
 
     @QtCore.pyqtSlot(name='on_actionPrint_triggered')
     def print(self):
@@ -373,29 +371,25 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         val_figure = self.valuewidget.connected_figure
         self.valuewidget.remove_graph()
 
-        _remove_pts = False
-        _remove_t1 = False
-        _move_to_data_tab = False
-
         w = None
         for w in self.area.subWindowList():
             wdgt = w.widget()
             if wdgt.id == gid:
                 wdgt.disconnect()
                 wdgt.scene.disconnect()
-
                 if wdgt == self.current_graph_widget:
                     if self.ptsselectwidget.connected_figure == gid:
                         self.ptsselectwidget.connected_figure = None
                         for line in self.ptsselectwidget.pts_lines:
                             self.current_graph_widget.remove_external(line)
-                        _remove_pts = True
+
+                        self.tabWidget.removeTab(self.tabWidget.indexOf(self.ptsselectwidget))
 
                     if self.t1tauwidget.connected_figure == gid:
                         self.t1tauwidget.connected_figure = None
-                        self.current_graph_widget.remove_external(self.t1tauwidget.min_pos)
+                        self.current_graph_widget.add_external(self.t1tauwidget.min_pos)
-                        self.current_graph_widget.remove_external(self.t1tauwidget.parabola)
+                        self.current_graph_widget.add_external(self.t1tauwidget.parabola)
-                        _remove_t1 = True
+                        self.tabWidget.removeTab(self.tabWidget.indexOf(self.t1tauwidget))
 
                     if self.fit_dialog.connected_figure == gid:
                         self.fit_dialog.connected_figure = None
@@ -403,10 +397,9 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
                             self.current_graph_widget.remove_external(item)
 
                     if val_figure == gid:
-                        self.valuewidget.connected_figure = None
                         self.current_graph_widget.remove_external(self.valuewidget.selection_real)
                         self.current_graph_widget.remove_external(self.valuewidget.selection_imag)
-                        _move_to_data_tab = True
+                        self.tabWidget.setCurrentIndex(0)
 
                     self.current_graph_widget.enable_picking(False)
 
@@ -422,13 +415,6 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
 
                 break
 
-        if _remove_t1:
-            self.tabWidget.removeTab(self.tabWidget.indexOf(self.t1tauwidget))
-        if _remove_pts:
-            self.tabWidget.removeTab(self.tabWidget.indexOf(self.ptsselectwidget))
-        if _move_to_data_tab:
-            self.tabWidget.setCurrentIndex(0)
-
         if w is not None:
             self.area.removeSubWindow(w)
             w.close()
@@ -466,7 +452,6 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         w.mousePositionChanged.connect(self.mousemoved)
         w.aboutToClose.connect(self.management.delete_sets)
         w.positionClicked.connect(self.point_selected)
-        w.newData.connect(lambda x, y: self.management.load_files(x, new_plot=y))
         w.show()
 
         graph_list = self.management.graphs.list()
@@ -579,12 +564,10 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
             self.ptsselectwidget.connected_figure = self.management.current_graph
             pick_required = True
         else:
-            if self.ptsselectwidget.connected_figure in self.management.graphs:
+            if self.ptsselectwidget.connected_figure:
                 g = self.management.graphs[self.ptsselectwidget.connected_figure]
                 for line in self.ptsselectwidget.pts_lines:
                     g.remove_external(line)
-            else:
-                self.ptsselectwidget.connected_figure = None
             # self.ptsselectwidget.clear()
 
         return pick_required, block_window
@@ -597,12 +580,10 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
                 self.management.graphs[current_graph].add_external(self.valuewidget.selection_real)
                 self.management.graphs[current_graph].add_external(self.valuewidget.selection_imag)
         else:
-            if self.valuewidget.connected_figure in self.management.graphs:
+            if self.valuewidget.connected_figure is not None:
                 conn_fig = self.valuewidget.connected_figure
                 self.management.graphs[conn_fig].remove_external(self.valuewidget.selection_real)
                 self.management.graphs[conn_fig].remove_external(self.valuewidget.selection_imag)
-            else:
-                self.valuewidget.connected_figure = None
 
     def _select_integralwidget(self, onoff: bool, pick_required: bool, block_window: bool) -> tuple[bool, bool]:
         if self.current_graph_widget is None:
@@ -616,13 +597,11 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
             pick_required = True
             block_window = True
         else:
-            if self.integralwidget.connected_figure in self.management.graphs:
+            if self.integralwidget.connected_figure:
                 g = self.management.graphs[self.integralwidget.connected_figure]
                 for line in self.integralwidget.lines:
                     g.remove_external(line[0])
                     g.remove_external(line[1])
-            else:
-                self.integralwidget.connected_figure = None
             self.integralwidget.clear()
 
         return pick_required, block_window
@@ -651,12 +630,10 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
             pick_required = True
             block_window = True
         else:
-            if self.t1tauwidget.connected_figure in self.management.graphs:
+            if self.t1tauwidget.connected_figure:
                 g = self.management.graphs[self.t1tauwidget.connected_figure]
                 g.remove_external(self.t1tauwidget.min_pos)
                 g.remove_external(self.t1tauwidget.parabola)
-            else:
-                self.t1tauwidget.connected_figure = None
 
         return pick_required, block_window
 
@@ -677,9 +654,8 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         from ..math.skipping import QSkipDialog
 
         dial = QSkipDialog(self)
-        res = dial.exec()
+        dial.exec()
 
-        if res:
         self.management.skip_points(**dial.get_arguments())
 
     @QtCore.pyqtSlot(name='on_action_coup_calc_triggered')
@@ -706,13 +682,10 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
             return
 
         gnames = self.management.graphs.tree()
-        if self._interpol_dialog is None:
+        dialog = InterpolDialog(parent=self)
-            self._interpol_dialog = InterpolDialog(parent=self)
+        dialog.set_data(gnames, self.current_graph_widget.id)
-            self._interpol_dialog.new_data.connect(self.management.interpolate_data)
+        dialog.new_data.connect(self.management.interpolate_data)
-        else:
+        dialog.show()
-            self._interpol_dialog()
-        self._interpol_dialog.set_data(gnames, self.current_graph_widget.id)
-        self._interpol_dialog.show()
 
     @QtCore.pyqtSlot(name='on_action_calc_triggered')
     def open_eval_dialog(self):
@@ -863,6 +836,10 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
     def item_from_graph(self, item, graph_id):
         self.management.graphs[graph_id].remove_external(item)
 
+    def closeEvent(self, evt):
+        # self._write_settings()
+        self.close()
+
     @QtCore.pyqtSlot(int)
     def request_data(self, idx):
         idd = self.datawidget.get_indexes(idx=idx-1)
@@ -902,29 +879,30 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
             self.fit_dialog.load(self.management.active_sets)
             for item in self.fit_dialog.preview_lines:
                 self.current_graph_widget.add_external(item)
-            if self.action_custom_range.isChecked() or self.actionExclude_region.isChecked():
+            if self.action_custom_range.isChecked():
-                self.current_graph_widget.add_external(self.fit_toolbar.region)
+                self.current_graph_widget.add_external(self.fitregion)
 
             block_window = True
         else:
             for item in self.fit_dialog.preview_lines:
                 self.current_graph_widget.remove_external(item)
-            self.current_graph_widget.remove_external(self.fit_toolbar.region)
+            self.current_graph_widget.remove_external(self.fitregion)
 
         return block_window
 
     @QtCore.pyqtSlot(QtWidgets.QAction)
     def change_fit_limits(self, action: QtWidgets.QAction):
-        if self.current_graph_widget is None:
+        if action == self.action_custom_range and self.fit_dialog.isVisible():
-            return
+            self.current_graph_widget.add_external(self.fitregion)
-
-        if action in [self.action_custom_range, self.actionExclude_region] and self.fit_dialog.isVisible():
-            self.current_graph_widget.add_external(self.fit_toolbar.region)
         else:
-            self.current_graph_widget.remove_external(self.fit_toolbar.region)
+            self.current_graph_widget.remove_external(self.fitregion)
 
     def start_fit(self, parameter, links, fit_options):
-        fit_options['limits'] = self.fit_toolbar.get_limit()
+        fit_options['limits'] = {
+            self.action_no_range: 'none',
+            self.action_x_range: 'x',
+            self.action_custom_range: self.fitregion.getRegion()
+        }[self.ac_group2.checkedAction()]
 
         fit_options['fit_mode'] = {
             self.action_lm_fit: 'lsq',
@@ -960,19 +938,19 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
             for item in self.fit_dialog.preview_lines:
                 g.add_external(item)
 
-    @QtCore.pyqtSlot(list, dict)
+    @QtCore.pyqtSlot(list)
-    def show_fit_results(self, results: list, sub_colors: dict[str, tuple[float, float, float]]):
+    def show_fit_results(self, results: list):
         self.fit_dialog.fit_button.setEnabled(True)
         self.fit_timer.stop()
         self.status.setText('')
         if results:
             if self.fitresult_dialog is None:
-                self.fitresult_dialog = QFitResult(results, sub_colors, self.management, parent=self)
+                self.fitresult_dialog = QFitResult(results, self.management, parent=self)
                 self.fitresult_dialog.add_graphs(self.management.graphs.list())
                 self.fitresult_dialog.closed.connect(self.accepts_fit)
                 self.fitresult_dialog.redoFit.connect(self.management.redo_fits)
             else:
-                self.fitresult_dialog(results, sub_colors)
+                self.fitresult_dialog(results)
                 self.fitresult_dialog.add_graphs(self.management.graphs.list())
             self.fitresult_dialog.show()
 
@@ -985,34 +963,21 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
     @QtCore.pyqtSlot(name='on_actionFunction_editor_triggered')
     def edit_models(self):
         if self.editor is None:
-            from ..editors.usermodeleditor import QUsermodelEditor
+            from ..lib.usermodeleditor import QUsermodelEditor
 
             self.editor = QUsermodelEditor(config_paths() / 'usermodels.py', parent=self)
             self.editor.modelsChanged.connect(lambda: self.fit_dialog.read_and_load_functions())
-            self.editor.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
+            self.editor.setWindowModality(QtCore.Qt.ApplicationModal)
         self.editor.show()
 
-    @QtCore.pyqtSlot(name='on_actionUse_script_triggered')
+    @QtCore.pyqtSlot(list)
-    def open_editor(self):
+    def extend_fit(self, sets: list):
-        from ..editors.script_editor import QEditor
-
-        editor = QEditor(self.path, parent=self)
-        editor.runSignal.connect(self.management.run_script)
-        editor.show()
-
-    @QtCore.pyqtSlot(list, bool)
-    def extend_fit(self, sets: list, only_subplots: bool):
-        if only_subplots:
-            self.management.extend_fits(sets, None, True)
-            return
-
         w = FitExtension(self)
         res = w.exec()
         if res:
             p = w.values
-            spacefunc = geomspace if p[3] else linspace
+            x = linspace(p[0], p[1], num=p[2])
-            x = spacefunc(p[0], p[1], num=p[2])
+            self.management.extend_fits(sets, x)
-            self.management.extend_fits(sets, x, False)
 
     @QtCore.pyqtSlot(name='on_action_create_fit_function_triggered')
     def open_fitmodel_wizard(self):
@@ -1036,10 +1001,9 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
     @staticmethod
     @QtCore.pyqtSlot(name='on_actionDocumentation_triggered')
     def open_doc():
-        pass
+        docpath = '/autohome/dominik/auswerteprogramm3/doc/_build/html/index.html'
-        # docpath = '/autohome/dominik/auswerteprogramm3/doc/_build/html/index.html'
+        import webbrowser
-        # import webbrowser
+        webbrowser.open(docpath)
-        # webbrowser.open(docpath)
 
     def dropEvent(self, evt):
         if evt.mimeData().hasUrls():
@@ -1068,13 +1032,13 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
         if self.sender() == self.actionLife:
             from ..lib.gol import QGameOfLife
             game = QGameOfLife(parent=self)
-            game.setWindowModality(QtCore.Qt.WindowModality.NonModal)
+            game.setWindowModality(QtCore.Qt.NonModal)
             game.show()
 
         elif self.sender() == self.actionMine:
             from ..lib.stuff import QMines
             game = QMines(parent=self)
-            game.setWindowModality(QtCore.Qt.WindowModality.NonModal)
+            game.setWindowModality(QtCore.Qt.NonModal)
             game.show()
 
         else:
@@ -1102,6 +1066,9 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
     def close(self):
         write_state({'History': {'recent path': str(self.path)}})
 
+        # remove backup file when closing
+        self.__backup_path.unlink(missing_ok=True)
+
         super().close()
 
     def read_state(self):
@@ -1125,16 +1092,40 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
 
         QLog(parent=self).show()
 
-    def autosave(self) -> bool:
+    def _autosave(self):
+        # TODO better separate thread may it takes some time to save
         self.status.setText('Autosave...')
         success = NMRWriter(self.management.graphs, self.management.data).export(self.__backup_path.with_suffix('.nmr.0'))
-
         if success:
             self.__backup_path.with_suffix('.nmr.0').rename(self.__backup_path)
 
         self.status.setText('')
 
-        return success
+    def check_for_backup(self):
+        backups = []
+        for filename in config_paths().glob('*.nmr'):
+            try:
+                backups.append((filename, datetime.datetime.strptime(filename.stem, "%Y-%m-%d_%H%M%S")))
+            except ValueError:
+                continue
+
+        if backups:
+            backup_by_date = sorted(backups, key=lambda x: x[1])
+            msg = QtWidgets.QMessageBox.information(
+                self, 'Backup found',
+                f'{len(backups)} backup files in directory {backup_by_date[-1][0].parent} found.\n\n'
+                f'Latest backup date: {backup_by_date[-1][1]}\n\n'
+                f'Press Ok to load, Cancel to delete backup, Close to do nothing.',
+                QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel | QtWidgets.QMessageBox.Close
+            )
+
+            if msg == QtWidgets.QMessageBox.Ok:
+                self.management.load_files([str(backup_by_date[-1][0])])
+                backup_by_date[-1][0].unlink()
+            elif msg == QtWidgets.QMessageBox.Cancel:
+                backup_by_date[-1][0].unlink()
+            else:
+                pass
 
     @QtCore.pyqtSlot(name='on_actionCreate_starter_triggered')
     def create_starter(self):

src/gui_qt/main/management.py

@@ -85,7 +85,7 @@ class UpperManagement(QtCore.QObject):
     newData = QtCore.pyqtSignal([list, str], [list, str, bool])
     deleteData = QtCore.pyqtSignal(list)
     dataChanged = QtCore.pyqtSignal(str)
-    fitFinished = QtCore.pyqtSignal(list, dict)
+    fitFinished = QtCore.pyqtSignal(list)
     stopFit = QtCore.pyqtSignal()
     properties_collected = QtCore.pyqtSignal(dict)
     unset_state = QtCore.pyqtSignal(list)
@@ -279,16 +279,13 @@ class UpperManagement(QtCore.QObject):
 
     @QtCore.pyqtSlot()
     @QtCore.pyqtSlot(list, str)
-    def copy_sets(self, sets: list = None, src: str = None, dest: str = None):
+    def copy_sets(self, sets: list = None, src: str = None):
+        if sets is None:
+            sets = self.graphs[self.current_graph].active[:]
+
         if src is None:
             src = self.current_graph
 
-        if sets is None:
-            sets = self.graphs[src].active[:]
-
-        if dest is None:
-            dest = src
-
         new_ids = []
         for s in sets:
             copy_of_s = self.data[s].copy(full=True)
@@ -296,23 +293,10 @@ class UpperManagement(QtCore.QObject):
             new_ids.append(copy_of_s.id)
             self.data[copy_of_s.id] = copy_of_s
 
-        self.newData.emit(new_ids, dest)
+        self.newData.emit(new_ids, src)
 
         return new_ids
 
-    def copy_graph(self, gid):
-        # Use state of old graph but removes actual references to old graph
-        src_state = self.graphs[gid].get_state()
-        src_state.pop('id')
-        src_state['children'] = []
-        src_state['active'] = []
-
-        new_graph = QGraphWindow.set_state(src_state)
-        self.graphs[new_graph.id] = new_graph
-        self.restoreGraph.emit(new_graph.id)
-
-        self.copy_sets(src=gid, dest=new_graph.id)
-
     @QtCore.pyqtSlot(list)
     @QtCore.pyqtSlot(str)
     @QtCore.pyqtSlot()
@@ -330,22 +314,18 @@ class UpperManagement(QtCore.QObject):
             if k in self.data:
                 parent_graph = self.data[k].graph
                 if parent_graph not in rm_set_by_graph:
-                    rm_set_by_graph[parent_graph] = set()
+                    rm_set_by_graph[parent_graph] = []
 
-                rm_set_by_graph[parent_graph].add(k)
+                rm_set_by_graph[parent_graph].append(k)
 
             elif k in self.graphs:
                 rm_graphs.append(k)
-                if k not in rm_set_by_graph:
-                    rm_set_by_graph[k] = set()
-                for ss in self.graphs[k].sets:
-                    rm_set_by_graph[k].add(ss)
 
             else:
                 logger.warning(f'delete_sets: {k} is not in data or graph found')
 
         for gid, sid_list in rm_set_by_graph.items():
-            cmd = DeleteCommand(self.data, list(sid_list), self.graphs, gid, self.newData, self.deleteData)
+            cmd = DeleteCommand(self.data, sid_list, self.graphs, gid, self.newData, self.deleteData)
             self.undostack.push(cmd)
 
         for k in rm_graphs:
@@ -363,7 +343,6 @@ class UpperManagement(QtCore.QObject):
         group_set = set()
         name_set = set()
         value_set = set()
-        graph_set = set()
 
         if src_sets is None:
             if self.current_graph:
@@ -381,7 +360,6 @@ class UpperManagement(QtCore.QObject):
             name_set.add(data_i.name)
             group_set.add(data_i.group)
             value_set.add(data_i.value)
-            graph_set.add(data_i.graph)
 
         if joined is not None:
             joined.group = '+'.join(group_set)
@@ -392,9 +370,7 @@ class UpperManagement(QtCore.QObject):
             else:
                 joined.value = 0.0
 
-            dest_graph = graph_set.pop() if len(graph_set) == 1 else self.current_graph
+            self.newData.emit([self.add(joined)], self.current_graph)
-
-            self.newData.emit([self.add(joined)], dest_graph)
 
     def get_data(self, sid: str, xy_only: bool = False):
         """
@@ -428,7 +404,6 @@ class UpperManagement(QtCore.QObject):
             self.graphs[d.graph].update_legend(identifier, name)
         elif identifier in self.graphs:
             self.graphs[identifier].title = name
-            self.graphs.valueChanged.emit()
         else:
             raise KeyError('Unknown ID ' + str(identifier))
 
@@ -450,17 +425,10 @@ class UpperManagement(QtCore.QObject):
             self.undostack.push(single_undo)
         self.undostack.endMacro()
 
-    def cut(self, x: bool = False, y: bool = False) -> None:
+    def cut(self):
         if self.current_graph:
-            xlim, ylim = self.graphs[self.current_graph].ranges
+            xlim, _ = self.graphs[self.current_graph].ranges
-
+            self.apply('cut', xlim)
-            if x is False:
-                xlim = (None, None)
-
-            if y is False:
-                ylim = (None, None)
-
-            self.apply('cut', (*xlim, *ylim))
 
     @QtCore.pyqtSlot()
     def unmask(self):
@@ -481,11 +449,6 @@ class UpperManagement(QtCore.QObject):
 
         self.fitter.fitmethod = fit_mode
 
-        # sets are not in active order but in order they first appeared in fit dialog
-        # iterate over order of set id in active order and access parameter inside loop
-        # instead of directly looping
-        list_ids = list(self.active_id)
-
         # all-encompassing error catch
         try:
             for model_id, model_p in parameter.items():
@@ -494,16 +457,27 @@ class UpperManagement(QtCore.QObject):
 
                 m_complex = model_p['complex']
 
-                for set_id in list_ids:
+                # sets are not in active order but in order they first appeared in fit dialog
-                    if set_id not in model_p['data_parameter']:
+                # iterate over order of set id in active order and access parameter inside loop
-                        continue
+                # instead of directly looping
+                try:
+                    list_ids = list(self.active_id)
+                    set_order = [self.active_id.index(i) for i in model_p['data_parameter'].keys()]
+                except ValueError as e:
+                    raise Exception('Getting order failed') from e
+
+                for pos in set_order:
+                    set_id = list_ids[pos]
 
                     try:
                         data_i = self.data[set_id]
                     except KeyError as e:
                         raise KeyError(f'{set_id} not found') from e
 
+                    try:
                         set_params = model_p['data_parameter'][set_id]
+                    except KeyError as e:
+                        raise KeyError(f'No parameter found for {set_id}') from e
 
                     if we_option.lower() == 'deltay':
                         we = data_i.y_err**2
@@ -511,46 +485,29 @@ class UpperManagement(QtCore.QObject):
                         we = we_option
 
                     if m_complex is None or m_complex == 1:
-                        # model is not complex: m_complex = None
-                        # model is complex, fit real part: m_complex = 1
                         _y = data_i.y.real
-                        data_complex = 1
+                    elif m_complex == 2 and np.iscomplexobj(data_i.y):
-                    elif m_complex == 2:
-                        # model is complex, fit imag part: m_complex = 2
-                        if np.iscomplexobj(data_i.y):
-                            # data is complex, use imag part
                         _y = data_i.y.imag
-                            data_complex = 2
                     else:
-                            # data is real
                         _y = data_i.y
-                            data_complex = 1
-                    else:
-                        # model is complex, fit complex: m_complex = 0
-                        # use data as given (complex or not)
-                        _y = data_i.y
-                        data_complex = 0
 
                     _x = data_i.x
 
-                    # options for fit limits 'none', 'x', ('in', custom region), ('out', excluded region)
                     if fit_limits == 'none':
                         inside = slice(None)
                     elif fit_limits == 'x':
                         x_lim, _ = self.graphs[self.current_graph].ranges
                         inside = np.where((_x >= x_lim[0]) & (_x <= x_lim[1]))
-                    elif fit_limits[0] == 'in':
-                        inside = np.where((_x >= fit_limits[1][0]) & (_x <= fit_limits[1][1]))
                     else:
-                        inside = np.where((_x < fit_limits[1][0]) | (_x > fit_limits[1][1]))
+                        inside = np.where((_x >= fit_limits[0]) & (_x <= fit_limits[1]))
 
                     try:
                         if isinstance(we, str):
-                            d = fit_d.Data(_x[inside], _y[inside], we=we, idx=set_id, complex_type=data_complex)
+                            d = fit_d.Data(_x[inside], _y[inside], we=we, idx=set_id)
                         else:
-                            d = fit_d.Data(_x[inside], _y[inside], we=we[inside], idx=set_id, complex_type=data_complex)
+                            d = fit_d.Data(_x[inside], _y[inside], we=we[inside], idx=set_id)
                     except Exception as e:
-                        raise Exception(f'Setting data failed for {data_i.name}') from e
+                        raise Exception(f'Setting data failed for {set_id}')
 
                     d.set_model(m)
                     try:
@@ -566,7 +523,7 @@ class UpperManagement(QtCore.QObject):
             return True
 
         except Exception as e:
-            logger.error(f'Fit preparation failed with error: {e.args}')
+            logger.error('Fit preparation failed', *e.args)
             QtWidgets.QMessageBox.warning(QtWidgets.QWidget(),
                                           'Fit prep failed',
                                           f'Fit preparation failed:\n'
@@ -594,23 +551,13 @@ class UpperManagement(QtCore.QObject):
     def end_fit(self, result: list, success: bool):
         if success:
             logger.info('Successful fit')
-
+            self.fitFinished.emit(result)
-            sub_colors = {}
-            for k, v in self.__fit_options[0].items():
-                sub_colors.update({set_id: v['color'] for set_id in v['data_parameter']})
-
-            self.fitFinished.emit(result, sub_colors)
-
         else:
             e = result[0]
             logger.exception(e, exc_info=True)
-            QtWidgets.QMessageBox.warning(
+            QtWidgets.QMessageBox.warning(QtWidgets.QWidget(), 'Fit failed',
-                QtWidgets.QWidget(),
+                                          f'Fit kaput with exception: \n\n{e!r}')
-                'Fit failed',
+            self.fitFinished.emit([])
-                f'Fit kaput with exception: \n\n{e!r}'
-            )
-            self.fitFinished.emit([], {})
-
         self._fit_active = False
 
     @QtCore.pyqtSlot(dict)
@@ -648,7 +595,7 @@ class UpperManagement(QtCore.QObject):
                 continue
 
             if not all(e is None for e in extrapolate):
-                spacefunc = np.geomspace if extrapolate[3] else np.linspace
+                spacefunc = np.geomspace if fit.islog else np.linspace
 
                 xmin = fit.x.min()
                 xmax = fit.x.max()
@@ -711,20 +658,16 @@ class UpperManagement(QtCore.QObject):
 
         self.newData.emit(f_id_list, gid)
 
-    def extend_fits(self, set_id: list, x_range: np.ndarray | None, only_subplots: bool):
+    def extend_fits(self, set_id: list, x_range: np.ndarray):
         graphs = {}
         for sid in set_id:
-            data = fit = self[sid]
+            data = self[sid]
+            fit = data.copy(full=True, keep_color=True)
+            fit.data = fit.data.with_new_x(x_range)
 
             graph_id = data.graph
             if graph_id not in graphs:
                 graphs[graph_id] = []
-
-            if not only_subplots:
-                fit = data.copy(full=True, keep_color=True)
-                if x_range is not None:
-                    fit.data = fit.data.with_new_x(x_range)
-
             graphs[graph_id].append(self.add(fit))
 
             color_scheme = available_cycles['colorblind']
@@ -791,27 +734,14 @@ class UpperManagement(QtCore.QObject):
         _active = self.graphs[self.current_graph].active
 
         new_datasets = {}
-        groupby = params.pop('groupby')
-
         for sid in _active:
             data_i = self.data[sid]
-            pts = data_i.points(params)
-
-            if groupby == 'group':
             if data_i.group not in new_datasets:
                 new_datasets[data_i.group] = [], []
             new_x_axis, _temp = new_datasets[data_i.group]
-                if pts:
-                    new_x_axis.append(data_i.value)
-                    _temp.append(pts)
 
-            else:
-                for (_x, _y, _yerr) in pts:
-                    if _x not in new_datasets:
-                        new_datasets[_x] = [], []
-                    new_x_axis, _temp = new_datasets[_x]
             new_x_axis.append(data_i.value)
-                    _temp.append([[_x, _y, _yerr]])
+            _temp.append(data_i.points(params))
 
         key_list = []
         for label, (new_x_axis, _temp) in new_datasets.items():
@@ -892,23 +822,9 @@ class UpperManagement(QtCore.QObject):
             new_x = self.data[new_axis[0]].x
 
         new_key = []
-        missed = []
         for ids in data_ids:
-            try:
             k = self.add(interpolate(self.data[ids], new_x, xlog=xlog, ylog=ylog, kind=mode, extrapolate=True))
             new_key.append(k)
-            except ValueError:
-                missed.append(self.data[ids].name)
-
-        if missed:
-            missed_str = '\n'.join(missed)
-            _ = QtWidgets.QMessageBox.warning(
-                QtWidgets.QWidget(),
-                'Interpolation failed',
-                f'Interpolation failed for the following sets:\n\n'
-                f'{missed_str}\n\n'
-                f'(Probably because of duplicate x values)'
-            )
 
         self.newData.emit(new_key, dest_graph)
 
@@ -1044,7 +960,7 @@ class UpperManagement(QtCore.QObject):
             else:
                 data = self.data[sets[0]]
                 if isinstance(data.data, new_type):
-                    error_list.append(f'{data.name} is already of type {new_type.__name__}')
+                    error_list.append(f'{data.name} is alreade of type {new_type.__name__}')
                     continue
 
                 new_data = new_type(data.x, np.zeros(data.x.size))
@@ -1078,8 +994,6 @@ class UpperManagement(QtCore.QObject):
 
     @QtCore.pyqtSlot(list, list, bool)
     def eval_expression(self, cmds: list, set_ids: list, overwrite: bool):
-        if self.namespace is None:
-            self.namespace = self.get_namespace()
         ns = self.namespace.flatten()
 
         if overwrite:
@@ -1112,28 +1026,13 @@ class UpperManagement(QtCore.QObject):
 
         if failures:
             err_msg = QtWidgets.QMessageBox(parent=self.sender())
-            err_msg.setText('One or more errors occurred during evaluation.')
+            err_msg.setText('One or more errors occured during evaluation.')
             err_msg.setDetailedText('\n'.join(f'{d.name} failed with error: {err.args}' for d, err in failures))
             err_msg.exec()
 
         self.sender().success = not failures
         self.sender().add_data(self.active_sets)
 
-    @QtCore.pyqtSlot(str)
-    def run_script(self, text):
-        self.namespace = self.get_namespace()
-        ns = self.namespace.flatten()
-        ns['return_list'] = []
-
-        # custom namespace must be available in global namespace of exec, otherwise imports do not work in functions
-        exec(text, ns, ns)
-
-        new_sets = []
-        for new_data in ns['return_list']:
-            new_sets.append(self.add(new_data))
-
-        self.newData.emit(new_sets, '')
-
     @QtCore.pyqtSlot(list, dict)
     def create_from_function(self, cmds: list, opts: dict):
         ns = dict(self.namespace.flatten())

src/gui_qt/math/interpol.py

@@ -16,12 +16,6 @@ class InterpolDialog(QtWidgets.QDialog, Ui_Dialog):
         self.step_lineEdit.setValidator(QtGui.QIntValidator())
 
         self._data = {}
-        self._src_id = None
-        self._dest_graph = ''
-
-    def __call__(self):
-        self.listWidget.clear()
-        self._data = {}
 
     @QtCore.pyqtSlot(int,  name='on_xaxis_comboBox_currentIndexChanged')
     def change_x_source(self, idx: int):
@@ -31,41 +25,29 @@ class InterpolDialog(QtWidgets.QDialog, Ui_Dialog):
     def set_data(self, data, current_gid):
         self.graph_combobox.blockSignals(True)
         self._data = {}
-        dest_idx = 0
         for (gid, graph_name), sets in data.items():
             self.graph_combobox.addItem(graph_name, userData=gid)
             self.dest_combobox.addItem(graph_name, userData=gid)
-            if self._dest_graph == gid:
-                dest_idx = self.dest_combobox.currentIndex()
             if gid == current_gid:
                 self.make_list(sets)
             self._data[gid] = sets
         self.graph_combobox.blockSignals(False)
-        self.change_graph(dest_idx)
+        self.change_graph(0)
 
     def make_list(self, current_sets):
         for sid, set_name in current_sets:
             item = QtWidgets.QListWidgetItem(set_name)
-            item.setData(QtCore.Qt.ItemDataRole.UserRole, sid)
+            item.setData(QtCore.Qt.UserRole, sid)
-            item.setCheckState(QtCore.Qt.CheckState.Checked)
+            item.setCheckState(QtCore.Qt.Checked)
             self.listWidget.addItem(item)
 
     @QtCore.pyqtSlot(int, name='on_graph_combobox_currentIndexChanged')
     def change_graph(self, idx: int):
         self.set_combobox.clear()
-        gid = self.graph_combobox.itemData(idx, QtCore.Qt.ItemDataRole.UserRole)
+        gid = self.graph_combobox.itemData(idx, QtCore.Qt.UserRole)
-        set_idx = -1
         if gid is not None:
-            for i, (set_key, set_name) in enumerate(self._data[gid]):
+            for set_key, set_name in self._data[gid]:
-                print(self._src_id, set_key, set_name, i)
                 self.set_combobox.addItem(set_name, userData=set_key)
-                print(self.set_combobox.currentIndex())
-                if self._src_id == set_key:
-                    set_idx = i
-
-            print(set_idx)
-            if set_idx > -1:
-                self.set_combobox.setCurrentIndex(set_idx)
 
     def collect_parameter(self):
         xlog = self.xlog_checkBox.isChecked()
@@ -89,35 +71,21 @@ class InterpolDialog(QtWidgets.QDialog, Ui_Dialog):
 
             x_src = (start, stop, step, loggy)
         else:
-            self._src_id = self.set_combobox.currentData(QtCore.Qt.ItemDataRole.UserRole)
+            x_src = (self.set_combobox.currentData(QtCore.Qt.UserRole),)
-            x_src = (self._src_id,)
 
-        self._dest_graph = self.dest_combobox.currentData(QtCore.Qt.ItemDataRole.UserRole)
+        dest_graph = self.dest_combobox.currentData(QtCore.Qt.UserRole)
 
         use_data = []
         for i in range(self.listWidget.count()):
             item = self.listWidget.item(i)
-            if item.checkState() == QtCore.Qt.CheckState.Checked:
+            if item.checkState() == QtCore.Qt.Checked:
-                use_data.append(item.data(QtCore.Qt.ItemDataRole.UserRole))
+                use_data.append(item.data(QtCore.Qt.UserRole))
 
-        self.new_data.emit(use_data, mode, xlog, ylog, x_src, self._dest_graph)
+        self.new_data.emit(use_data, mode, xlog, ylog, x_src, dest_graph)
 
         return True
 
-    def _save_state(self):
+    def accept(self):
-        self._src_id = self.set_combobox.currentData(QtCore.Qt.ItemDataRole.UserRole)
-        self._dest_graph = self.dest_combobox.currentData(QtCore.Qt.ItemDataRole.UserRole)
-
-    @QtCore.pyqtSlot(QtWidgets.QAbstractButton, name='on_buttonBox_clicked')
-    def check_next_actions(self, bttn: QtWidgets.QAbstractButton):
-        role = self.buttonBox.buttonRole(bttn)
-        self._save_state()
-
-        if role == self.buttonBox.ButtonRole.RejectRole:
-            self.close()
-        else:
         success = self.collect_parameter()
-
+        if success:
-            if success and role == self.buttonBox.ButtonRole.AcceptRole:
+            super().accept()
-                self.close()
-

src/gui_qt/math/smooth.py

@@ -12,10 +12,10 @@ class QSmooth(QtWidgets.QDialog, Ui_SmoothDialog):
 
     @QtCore.pyqtSlot(int, name='on_comboBox_currentIndexChanged')
     def change_mode(self, idx: int):
-        if idx == 1:
+        if idx == 2:
             self.widget.show()
             self.widget_2.hide()
-        elif idx == 2:
+        elif idx == 3:
             self.widget.show()
             self.widget_2.show()
         else:
@@ -29,24 +29,12 @@ class QSmooth(QtWidgets.QDialog, Ui_SmoothDialog):
         idx = self.comboBox.currentIndex()
 
         # this order must match the combobox
-        para['mode'] = [
+        para['mode'] = ['mean', 'savgol', 'loess', 'median', 'std', 'var', 'max', 'min', 'sum'][idx]
-            'mean',
-            'savgol',
-            'loess',
-            'median',
-            'std',
-            'var',
-            'max',
-            'min',
-            'sum',
-        ][idx]
 
-        # Savitzky-Golay needs also polynomial degree
+        if idx == 2:
-        if idx == 1:
             para['deg'] = self.polynom_spinBox.value()
 
-        # LOESS needs also polynomial degree and number of iterations
+        if idx == 3:
-        if idx == 2:
             para['deg'] = self.polynom_spinBox.value()
             para['it'] = self.iter_spinBox.value()
 

src/gui_qt/nmr/t1_from_tau.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from nmreval.nmr.coupling import *
-from nmreval.distributions import ColeCole, ColeDavidson, HavriliakNegami, KWW, LogGaussian, GGAlpha
+from nmreval.distributions import ColeCole, ColeDavidson, HavriliakNegami, KWW, LogGaussian
 from nmreval.utils import pi
 from nmreval.utils.text import convert
 
@@ -19,7 +19,7 @@ class QRelaxCalc(QtWidgets.QDialog, Ui_Dialog):
 
         self.graphs = {}
 
-        self.specdens = [ColeCole, ColeDavidson, HavriliakNegami, KWW, LogGaussian, GGAlpha]
+        self.specdens = [ColeCole, ColeDavidson, HavriliakNegami, KWW, LogGaussian]
         self.coupling = [Quadrupolar, HomoDipolar, Czjzek]
         self.tau_parameter = []
 

src/gui_qt/nmr/t1widget.py

@@ -31,7 +31,7 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
         self.t1calculator = RelaxationEvaluation()
 
         self.sd_parameter = []
-        self.sdmodels = [Debye, ColeCole, ColeDavidson, KWW, HavriliakNegami, LogGaussian, GGAlpha]
+        self.sdmodels = [Debye, ColeCole, ColeDavidson, KWW, HavriliakNegami, LogGaussian]
         for i in self.sdmodels:
             self.specdens_combobox.addItem(i.name)
         self.specdens_combobox.currentIndexChanged.connect(self.update_specdens)
@@ -51,14 +51,8 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
         self.conv_y = QT1Widget.time_conversion[self.t1_combobox.currentIndex()]
 
         self.minimum = (1, np.inf)
-        self.min_pos = PlotItem(
+        self.min_pos = PlotItem(x=np.array([]), y=np.array([]),
-            x=np.array([]),
+                                symbol='+', symbolBrush=mkBrush(color='r'), symbolPen=mkPen(color='r'), symbolSize=14)
-            y=np.array([]),
-            symbol='+',
-            symbolBrush=mkBrush(color='r'),
-            symbolPen=mkPen(color='r'),
-            symbolSize=14,
-        )
         self.parabola = PlotItem(x=np.array([]), y=np.array([]))
 
         self.lineEdit_2.setValidator(QtGui.QDoubleValidator())
@@ -89,10 +83,10 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
         right_b = min(np.argmin(y)+3, len(x)-1)
 
         self.lineEdit_2.blockSignals(True)
-        self.lineEdit_2.setText(f'{x[left_b]:.2f}')
+        self.lineEdit_2.setText('{:.2f}'.format(x[left_b]))
         self.lineEdit_2.blockSignals(False)
         self.lineEdit_3.blockSignals(True)
-        self.lineEdit_3.setText(f'{x[right_b]:.2f}')
+        self.lineEdit_3.setText('{:.2f}'.format(x[right_b]))
         self.lineEdit_3.blockSignals(False)
 
         self.t1calculator.set_data(x, y)
@@ -116,7 +110,6 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
 
         if self.sdmodels[idx].parameter is not None:
             for name in self.sdmodels[idx].parameter:
-                print(name)
                 _temp = FormWidget(parent=self, name=name, fixable=True)
                 _temp.value = 1
                 _temp.setChecked(True)
@@ -140,7 +133,7 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
         try:
             for i, v, in enumerate(values):
                 self.sd_parameter[i].blockSignals(True)
-                self.sd_parameter[i].value = f'{v:.3g}'
+                self.sd_parameter[i].value = '{:.3g}'.format(round(v, 3))
                 self.sd_parameter[i].blockSignals(False)
         except IndexError:
             pass
@@ -226,7 +219,7 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
         self.update_model()
 
     @QtCore.pyqtSlot(int, name='on_interpol_combobox_currentIndexChanged')
-    def determine_minimum(self, idx: int):
+    def determine_minimum(self, idx):
         if idx == 0:
             self.checkBox_interpol.setChecked(False)
             self.checkBox_interpol.hide()
@@ -236,10 +229,9 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
             self.checkBox_interpol.show()
             self.frame.show()
             try:
-                m, i_func = self.t1calculator.calculate_t1_min(
+                m, i_func = self.t1calculator.calculate_t1_min(interpolate=idx,
-                    interpolate=idx,
+                                                               trange=(float(self.lineEdit_2.text()),
-                    trange=(float(self.lineEdit_2.text()), float(self.lineEdit_3.text())),
+                                                                       float(self.lineEdit_3.text())))
-                )
             except ValueError:
                 m, i_func = self.t1calculator.calculate_t1_min(interpolate=None)
 
@@ -281,13 +273,11 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
             return
 
         with busy_cursor():
-            calc_stretching, mini = self.t1calculator.get_increase(
+            calc_stretching, mini = self.t1calculator.get_increase(height=self.minimum[1],
-                height=self.minimum[1],
                                                                    idx=var_idx, mode=notfix,
                                                                    omega=2*np.pi*self.frequency,
                                                                    dist_parameter=sd_args, prefactor=cp_args,
-                coupling_kwargs=cp_kwargs
+                                                                   coupling_kwargs=cp_kwargs)
-            )
 
         self.label_t1min.setText(f'{mini:.4g} s')
 
@@ -302,13 +292,9 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
         sd_args, _ = self.get_sd_values()
         cp_args, cp_kwargs, _ = self.get_cp_values()
         tau_mode = ['fit', 'peak', 'mean', 'logmean'][self.tau_combox.currentIndex()]
-        corr, opts = self.t1calculator.correlation_from_t1(
+        corr, opts = self.t1calculator.correlation_from_t1(omega=2*np.pi*self.frequency, dist_parameter=sd_args,
-            omega=2*np.pi*self.frequency,
-            dist_parameter=sd_args,
                                                            coupling_param=cp_args, coupling_kwargs=cp_kwargs,
-            mode=tau_mode,
+                                                           mode=tau_mode, interpolate=self.checkBox_interpol.isChecked())
-            interpolate=self.checkBox_interpol.isChecked()
-        )
 
         name = self.name + '-' + str(self.t1calculator) + '('
         name += ','.join([f'{a:.3g}' for a in sd_args])
@@ -346,4 +332,4 @@ class QT1Widget(QtWidgets.QDialog, Ui_t1dialog):
 
     @QtCore.pyqtSlot(int, name='on_graph_checkbox_stateChanged')
     def changed_state(self, checked):
-        self.graph_combobox.setEnabled(checked != QtCore.Qt.CheckState.Checked)
+        self.graph_combobox.setEnabled(checked != QtCore.Qt.Checked)

src/nmreval/clib/integrate.c

@@ -156,20 +156,3 @@ double energyDistCorrelation(double x, void *user_data) {
     return normalDist(x, e_m, e_b) * exp(-t * r);
 }
 
-// Generalised Gamma Function
-double genGammaAlphaDist(double x, void *user_data) {
-    double *c = (double *)user_data;
-
-    double omega = c[0];
-    double tau0 = c[1];
-    double alpha = c[2];
-    double beta = c[3];
-
-    double b_to_a = beta / alpha;
-    double tau_to_tau0 = tau / tau0;
-
-    double norm = exp(-lgamma(b_to_a) + b_to_a * log(b_to_a)) * alpha;
-
-    return norm * exp(-b_to_a * pow(tau_to_tau0, alpha)) * pow(tau_to_tau0, beta);
-}
-

src/nmreval/data/points.py

@@ -273,14 +273,9 @@ class Points:
     def length(self):
         return len(self._x)
 
-    def points(
+    def points(self, idx: list = None, special: str = None,
-            self,
+               avg_range: tuple[int, int] = (0, 0), avg_mode: str = 'mean',
-            idx: list = None,
+               pts: list = None) -> list[tuple]:
-            special: str = None,
-            avg_range: tuple[int, int] = (0, 0),
-            avg_mode: str = 'mean',
-            pts: list = None,
-    ) -> list[tuple]:
         """
         Return (x, y) values at specified positions.
 
@@ -299,7 +294,7 @@ class Points:
 
             avg_range (tuple of int) :
                 Region for average of y values. Tuple (a, b) uses ``y[i-a:i+b+1]`` around index `i`. Default is (0, 0).
-            avg_mode (str {'mean', 'sum', 'integral', 'std'} , optional) :
+            avg_mode (str {'mean', 'sum', 'integral'} , optional) :
                 Averaging type
 
                 `mean` : Arithmetic average
@@ -308,8 +303,6 @@ class Points:
 
                 'integral`: Integration over range using Simpson's rule
 
-                'std': Standard deviation
-
             pts (list, optional) :
                 If given, points will be appended.
 
@@ -320,90 +313,66 @@ class Points:
         if (idx is None) and (special is None):
             raise ValueError('Either `idx` or `special` must be given')
 
-        if avg_mode not in ['mean', 'sum', 'integral', 'std']:
+        if avg_mode not in ['mean', 'sum', 'integral']:
-            raise ValueError(f'Parameter `avg_mode` is `mean`, `sum`, `integral`, `std`, not `{avg_mode}`' )
+            raise ValueError(f'Parameter `avg_mode` is `mean`, `sum`, `integral`, not `{avg_mode}`' )
 
         if pts is None:
             pts = []
 
-        _tmp_x = self._x[self.mask]
-        x_order = np.argsort(_tmp_x)
-        _tmp_x = _tmp_x[x_order]
-        _tmp_y = self._y[self.mask][x_order]
-        _tmp_yerr = self._y_err[self.mask][x_order]
-
         if idx is not None:
-            for idx_i in idx:
+            for x in idx:
-                if isinstance(idx_i, tuple):
+                if isinstance(x, tuple):
-                    in_region = np.where((_tmp_x - idx_i[0] > 0) & (idx_i[1] - _tmp_x > 0))[0]
+                    x_idx = np.argmin(np.abs(self._x[self.mask] - (x[0]+x[1])/2))
-                    if len(in_region) > 0:
+                    left_b = np.argmin(np.abs(self._x[self.mask] - x[0]))
-                        x_idx = in_region[in_region.size//2]
+                    right_b = np.argmin(np.abs(self._x[self.mask] - x[1]))
-                        left_b = in_region[0]
-                        right_b = in_region[-1] + 1
                 else:
-                        continue
+                    x_idx = np.argmin(np.abs(self._x[self.mask]-x))
-
-                else:
-                    x_idx = np.argmin(np.abs(_tmp_x-idx_i))
                     left_b = int(max(0, x_idx - avg_range[0]))
                     right_b = int(min(len(self), x_idx + avg_range[1] + 1))
 
                 if left_b < right_b:
-                    pts.append([_tmp_x[x_idx], *self._average(_tmp_x, _tmp_y, _tmp_yerr, avg_mode, x_idx, left_b, right_b)])
+                    pts.append([self._x[x_idx], *self._average(avg_mode, x_idx, left_b, right_b)])
                 else:
-                    pts.append([_tmp_x[x_idx], _tmp_y[x_idx], self._y_err[x_idx]])
+                    pts.append([self._x[x_idx], self._y[x_idx], self._y_err[x_idx]])
 
         if special is not None:
             if special not in ['max', 'min', 'absmax', 'absmin']:
                 raise ValueError('Parameter "special" must be "max", "min", "absmax", "absmin".')
 
             if special == 'max':
-                x_idx = np.argmax(_tmp_y.real)
+                x_idx = np.argmax(self._y.real[self.mask])
             elif special == 'min':
-                x_idx = np.argmax(_tmp_y.real)
+                x_idx = np.argmax(self._y.real[self.mask])
             elif special == 'absmax':
-                x_idx = np.argmax(np.abs(_tmp_y))
+                x_idx = np.argmax(np.abs(self._y[self.mask]))
             else:
-                x_idx = np.argmin(np.abs(_tmp_y))
+                x_idx = np.argmin(np.abs(self._y[self.mask]))
 
             left_b = int(max(0, x_idx - avg_range[0]))
             right_b = int(min(len(self), x_idx + avg_range[1] + 1))
 
-            pts.append([_tmp_x[x_idx], *self._average(_tmp_x, _tmp_y, _tmp_yerr, avg_mode, x_idx, left_b, right_b)])
+            pts.append([self._x[self.mask][x_idx], *self._average(avg_mode, x_idx, left_b, right_b)])
 
         return pts
 
-    @staticmethod
+    def _average(self, mode: str, idx, left: int, right: int) -> tuple[float, float]:
-    def _average(
-            x: np.ndarray,
-            y: np.ndarray,
-            y_err: np.ndarray,
-            mode: str,
-            idx: int,
-            left: int,
-            right: int,
-    ) -> tuple[float, float]:
         if mode == 'mean':
-            y_mean = np.mean(y[left:right].real)
+            y_mean = np.mean(self._y[self.mask][left:right].real)
-            y_err_mean = np.linalg.norm(y_err[left:right]) / (right - left)
+            y_err = np.linalg.norm(self._y_err[self.mask][left:right]) / (right - left)
 
         elif mode == 'sum':
-            y_mean = np.sum(y[left:right].real)
+            y_mean = np.sum(self._y[self.mask][left:right].real)
-            y_err_mean = np.linalg.norm(y_err[left:right])
+            y_err = np.linalg.norm(self._y_err[self.mask][left:right])
 
         elif mode == 'integral':
-            y_mean = simpson(y[left:right].real, x=x[left:right])
+            y_mean = simpson(self._y[self.mask][left:right].real, x=self._x[left:right])
-            y_err_mean = np.linalg.norm(cumulative_trapezoid(y_err[left:right].real, x=x[left:right]))
+            y_err = np.linalg.norm(cumulative_trapezoid(self._y_err[self.mask][left:right].real, x=self._x[left:right]))
-
-        elif mode == 'std':
-            y_mean = np.std(y[left:right])
-            y_err_mean = 0.
 
         else:
-            y_mean = y[idx].real
+            y_mean = self._y[self.mask][idx].real
-            y_err_mean = y_err[idx]
+            y_err = self._y_err[self.mask][idx]
 
-        return y_mean, y_err_mean
+        return y_mean, y_err
 
     def concatenate(self, other):
         """
@@ -551,37 +520,26 @@ class Points:
 
         return self
 
-    def cut(self, x_low: float = None, x_high: float = None, y_low: float = None, y_high: float = None):
+    def cut(self, low_lim: float = None, high_lim: float = None):
         """
         Cut
         Args:
-            x_low:  Lower limit
+            low_lim:
-            x_high: Upper limit for x values
+            high_lim:
-            y_low:  Lower limit
-            y_high: Upper limit for x valuew
 
         Returns:
 
         """
-
+        if low_lim is None and high_lim is None:
-        if x_low is None and x_high is None and y_low is None and y_high is None:
             return self
 
-        if x_low is None:
+        if low_lim is None:
-            x_low = np.min(self._x)-1
+            low_lim = np.min(self._x)
 
-        if x_high is None:
+        if high_lim is None:
-            x_high = np.max(self._x)+1
+            high_lim = np.max(self._x)
 
-        if y_low is None:
+        _mask = np.ma.masked_inside(self._x, low_lim, high_lim).mask
-            y_low = np.min(self._y.real)-1
-
-        if y_high is None:
-            y_high = np.max(self._y.real)+1
-
-        x_mask = (self._x >= x_low) & (self._x <= x_high)
-        y_mask = (self._y.real >= y_low) & (self._y.real <= y_high)
-        _mask = x_mask & y_mask
 
         self._x = self._x[_mask]
         self._y = self._y[_mask]
@@ -732,20 +690,17 @@ class Points:
             np.savetxt(path, self.toarray(err=err), header=header, fmt='%.10e')
         else:
             with path.open('w') as f:
-                f.write('# ' + '\n# '.join(header.split('\n')))
+                f.write(header)
-                f.write('\n')
                 for i, l in enumerate(self.toarray(err=err)):
                     if self.mask[i]:
                         f.write('\t'.join(map(lambda _x: f'{_x:.10e}', l.tolist())) + '\n')
                     else:
-                        f.write('# ' + '\t'.join(map(lambda _x: f'{_x:.10e}', l.tolist())) + '\n')
+                        f.write('#' + '\t'.join(map(lambda _x: f'{_x:.10e}', l.tolist())) + '\n')
 
     def get_state(self) -> dict:
-        ret_dic = {
+        ret_dic = {'x': self._x.tolist(),
-            'x': self._x.tolist(),
                    'y': self._y.tolist(),
-            'mask': (np.where(~self.mask)[0]).tolist()
+                   'mask': (np.where(~self.mask)[0]).tolist()}
-        }
 
         if np.all(self._y_err == 0):
             ret_dic['y_err'] = 0.0

src/nmreval/distributions/__init__.py

@@ -26,4 +26,3 @@ from .coledavidson import ColeDavidson
 from .debye import Debye
 from .kww import KWW
 from .loggaussian import LogGaussian
-from .gengamma import GGAlpha

src/nmreval/distributions/energy.py

@@ -3,12 +3,7 @@ from ctypes import c_double, cast, pointer, c_void_p
 
 import numpy as np
 from scipy import LowLevelCallable
-
+from scipy.integrate import quad, simps as simpson
-from scipy.integrate import quad
-try:
-    from scipy.integrate import simps as simpson
-except ImportError:
-    from scipy.integrate import simpson
 
 from .base import Distribution
 from ..lib.utils import ArrayLike
@@ -95,7 +90,7 @@ def _integrate_c(func, omega: np.ndarray, temperature: np.ndarray, tau0: float,
     for o, t in product(omega, temperature):
         c = (c_double * 5)(o, tau0, e_m, e_b, t)
         user_data = cast(pointer(c), c_void_p)
-        area = quad(LowLevelCallable(func, user_data), 0, np.inf, epsabs=1e-13)[0]
+        area = quad(LowLevelCallable(func, user_data), 0, np.infty, epsabs=1e-13)[0]
 
         res.append(area)
 
@@ -111,7 +106,7 @@ def _integrate_py(func, axis, temp, tau0, e_m, e_b):
     e_axis = np.linspace(max(0., e_m - 50*e_b), e_m + 50*e_b, num=5001)
     ret_val = []
     for o, tt in product(x, temperature):
-        ret_val.append(simpson(y=func(e_axis, o, tau0, e_m, e_b, tt), x=e_axis))
+        ret_val.append(simpson(func(e_axis, o, tau0, e_m, e_b, tt), e_axis))
 
     ret_val = np.array(ret_val).reshape(x.shape[0], temperature.shape[0])
 

src/nmreval/distributions/gengamma.py

@@ -7,7 +7,7 @@ try:
     from scipy.integrate import simpson
 except ImportError:
     from scipy.integrate import simps as simpson
-from scipy.special import gammaln, gamma as scipy_gamma
+from scipy.special import gammaln
 
 from nmreval.distributions.base import Distribution
 from nmreval.math.logfourier import logft
@@ -20,10 +20,10 @@ class AbstractGG(Distribution, ABC):
 
     @classmethod
     def correlation(cls, t, tau0, *args):
-        tt = np.atleast_1d(t)
+        tt = np.asanyarray(t)
         taus, ln_tau = AbstractGG._prepare_integration(tau0)
         g_tau = cls.distribution(taus, tau0, *args)
-        ret_val = np.array([simpson(np.exp(-t_i/taus) * g_tau, x=ln_tau) for t_i in tt]).squeeze()
+        ret_val = np.array([simpson(np.exp(-t_i/taus) * g_tau, ln_tau) for t_i in tt])
 
         return ret_val
 
@@ -32,41 +32,30 @@ class AbstractGG(Distribution, ABC):
         r"""
         Calculate spectral density \int G(ln(tau) tau/(1+(w*tau)^2) dln(tau)
         """
-        _w = np.atleast_1d(omega)
+        w = np.asanyarray(omega)
-        _t = np.atleast_1d(tau0)
+        taus, ln_tau = AbstractGG._prepare_integration(tau0)
-        ret_val = np.zeros((_w.size, _t.size), dtype=complex)
+        g_tau = cls.distribution(taus, tau0, *args)
 
-        for (i, tau_i) in enumerate(_t):
+        ret_val = np.array([simpson(g_tau / (1 - 1j*w_i*taus), ln_tau) for w_i in w])
-            taus, ln_tau = AbstractGG._prepare_integration(tau_i)
-            g_tau = cls.distribution(taus, tau_i, *args)
 
-            ret_val[:, i].real = np.array([simpson(g_tau * taus / (1 + (w_i*taus)**2), x=ln_tau) for w_i in _w])
+        return ret_val
-            ret_val[:, i].imag = np.array([simpson(g_tau * w_i * taus / (1 + (w_i*taus)**2), x=ln_tau) for w_i in _w])
-
-        return ret_val.squeeze()
 
     @classmethod
-    def specdens(cls, omega: float | np.ndarray, tau0: float | np.ndarray, *args) -> float | np.ndarray:
+    def specdens(cls, omega, tau0, *args):
         r"""
         Calculate spectral density \int G(ln(tau) tau/(1+(w*tau)^2) dln(tau)
         """
-        _w = np.atleast_1d(omega)
+        w = np.asanyarray(omega)
-        _t = np.atleast_1d(tau0)
+        taus, ln_tau = AbstractGG._prepare_integration(tau0)
-        ret_val = np.zeros((_w.size, _t.size))
+        g_tau = cls.distribution(taus, tau0, *args)
 
-        for (i, tau_i) in enumerate(_t):
+        ret_val = np.array([simpson(g_tau * taus / (1 + (w_i*taus)**2), ln_tau) for w_i in w])
-            taus, ln_tau = AbstractGG._prepare_integration(tau_i)
-            g_tau = cls.distribution(taus, tau_i, *args)
 
-            ret_val[:, i] = np.array([simpson(g_tau * taus / (1 + (w_i*taus)**2), x=ln_tau) for w_i in _w])
+        return ret_val
-
-        return ret_val.squeeze()
 
     @staticmethod
     def _prepare_integration(
-            tau0: float,
+            tau0: float, limits: tuple[int, int] = (20, 20), num_steps: int = 4001
-            limits: tuple[int, int] = (20, 20),
-            num_steps: int = 4001,
     ) -> tuple[np.ndarray, np.ndarray]:
         """
         Create array of correlation times for integration over ln(tau)
@@ -77,6 +66,7 @@ class AbstractGG(Distribution, ABC):
 
         Returns:
             array of taus and array of ln(tau)
+
         """
 
         ln_tau0 = np.log(tau0)
@@ -87,29 +77,23 @@ class AbstractGG(Distribution, ABC):
 
 # noinspection PyMethodOverriding
 class GGAlpha(AbstractGG):
-    name = r'General Gamma (alpha)'
+    name = r'General \Gamma (\alpha)'
-    parameter = [r'\alpha', r'\beta']
+    parameter = [r'\tau', r'\alpha', r'\beta']
 
     @staticmethod
     def distribution(taus: float | np.ndarray, tau: float, alpha: float, beta: float) -> float | np.ndarray:
         b_to_a = beta / alpha
-        inv_norm = alpha * np.exp(-gammaln(b_to_a) + b_to_a * np.log(b_to_a))
+        norm = np.exp(gammaln(b_to_a) - b_to_a * np.log(b_to_a)) / alpha
         t_to_t0 = taus / tau
         ret_val = np.exp(-b_to_a * t_to_t0**alpha) * t_to_t0**beta
 
-        return ret_val * inv_norm
+        return ret_val / norm
-
-    @staticmethod
-    def mean(tau: float | np.ndarray, alpha: float, beta: float) -> float | np.ndarray:
-        beta_by_alpha = beta/alpha
-        inv_alpha = 1/alpha
-        return tau * (1/beta_by_alpha)**inv_alpha * scipy_gamma(beta_by_alpha + inv_alpha) / scipy_gamma(beta_by_alpha)
 
 
 # noinspection PyMethodOverriding
 class GGAlphaEW(AbstractGG):
-    name = r'General Gamma (alpha + EW)'
+    name = r'General \Gamma (\alpha + EW)'
-    parameter = [r'\alpha', r'\beta', r'\sigma', r'\gamma']
+    parameter = [r'\tau', r'\alpha', r'\beta', r'\sigma', r'\gamma']
 
     @staticmethod
     def distribution(tau: float | np.ndarray, tau0: float,
@@ -133,8 +117,8 @@ class GGAlphaEW(AbstractGG):
 
 # noinspection PyMethodOverriding
 class GGBeta(AbstractGG):
-    name = r'General Gamma (beta)'
+    name = r'General \Gamma (\beta)'
-    parameter = ['a', 'b']
+    parameter = [r'\tau', 'a', 'b']
 
     @staticmethod
     def distribution(tau: float | np.ndarray, tau0: float, a: float, b: float) -> float | np.ndarray:

src/nmreval/fit/_meta.py

@@ -9,13 +9,7 @@ from inspect import signature, Parameter
 class ModelFactory:
 
     @staticmethod
-    def create_from_list(
+    def create_from_list(funcs: list, left=None, func_order=None, param_len=None, left_cnt=None):
-            funcs: list,
-            left=None,
-            func_order: list[int] = None,
-            param_len: list[int] = None,
-            left_cnt: int = 0,
-    ):
         if func_order is None:
             func_order = []
 
@@ -26,50 +20,32 @@ class ModelFactory:
             if not func['active']:
                 continue
 
+            func_order.append(func['cnt'])
+            param_len.append(len(func['func'].params))
+
             if func['children']:
-                f = func.copy()
+                right, _, _ = ModelFactory.create_from_list(func['children'], left_cnt=func['pos'],
-                f['children'] = []
+                                                            func_order=func_order, param_len=param_len)
-                right, _, _, right_cnt = ModelFactory.create_from_list(
+                right_cnt = None
-                    [f] + func['children'],
+                right = MultiModel(func['func'], right, func['children'][0]['op'], left_idx=func['cnt'], right_idx=None)
-                    left_cnt=func['pos'],
-                    func_order=func_order,
-                    param_len=param_len,
-                )
             else:
                 right = func['func']
                 right_cnt = func['cnt']
 
-                func_order.append(func['cnt'])
-                param_len.append(len(func['func'].params))
-
             if left is None:
                 left = right
                 left_cnt = right_cnt
             else:
-                left = MultiModel(left, right, func['op'], left_idx=left_cnt, right_idx=right_cnt)
+                left = MultiModel(left, right, func['op'],
+                                  left_idx=left_cnt, right_idx=right_cnt)
 
-        return left, func_order, param_len, left_cnt
+        return left, func_order, param_len
 
 
 class MultiModel:
-    op_repr = {
+    op_repr = {operator.add: ' + ', operator.mul: ' * ', operator.sub: ' - ', operator.truediv: ' / '}
-        operator.add: ' + ',
+    str_op = {'+': operator.add, '*': operator.mul, '-': operator.sub, '/': operator.truediv}
-        operator.mul: ' * ',
+    int_op = {0: operator.add, 1: operator.mul, 2: operator.sub, 3: operator.truediv}
-        operator.sub: ' - ',
-        operator.truediv: ' / ',
-    }
-    str_op = {
-        '+': operator.add,
-        '*': operator.mul,
-        '-': operator.sub,
-        '/': operator.truediv,
-    }
-    int_op = {
-        0: operator.add,
-        1: operator.mul,
-        2: operator.sub,
-        3: operator.truediv,
-    }
 
     def __init__(self,
                  left: Any,
@@ -93,9 +69,6 @@ class MultiModel:
         if self._op is None:
             raise ValueError('Invalid binary operator.')
 
-        if right_idx is None:
-            right_idx = left_idx + 1
-
         self.name = '('
         self.params = []
         self.bounds = []

src/nmreval/fit/data.py

@@ -6,13 +6,10 @@ from .model import Model
 from .parameter import Parameters, Parameter
 
 
-class Data:
+class Data(object):
-    def __init__(self, x, y, we=None, idx=None, complex_type: int = 0):
+    def __init__(self, x, y, we=None, idx=None):
         self.x = np.asarray(x)
         self.y = np.asarray(y)
-        if self.x.size == 0 or self.y.size == 0:
-            raise ValueError("Data is empty")
-
         if self.y.shape[0] != self.x.shape[0]:
             raise ValueError(f'x and y have different lengths {self.x.shape[0]} and {self.y.shape[0]}')
 
@@ -23,7 +20,6 @@ class Data:
         self.parameter = Parameters()
         self.para_keys: list = []
         self.fun_kwargs = {}
-        self.complex_type = complex_type
 
     def __len__(self):
         return self.y.shape[0]

src/nmreval/fit/minimizer.py

@@ -234,10 +234,6 @@ class FitRoutine(object):
                 # get variable parameter for fitter
                 p0_k, lb_k, ub_k, var_pars_k = self._prep_data(data)
 
-                if p0_k is None:
-                    self.make_results(data, data.para_keys, var_pars_k, data.para_keys, (len(data.para_keys), len(data.para_keys)),
-                                      err=None, corr=None, partial_corr=None)
-                else:
                 if mode == 'lsq':
                     self._least_squares_single(data, p0_k, lb_k, ub_k, var_pars_k)
 
@@ -251,12 +247,6 @@ class FitRoutine(object):
             else:
                 data_pars, p0, lb, ub, var_pars = self._prep_global(data_groups, linked_parameter)
 
-                if not p0:
-                    for data_k, p_k in zip(data_groups, data_pars):
-                        self.make_results(data_k, p_k, [], p_k, (len(p_k), len(p_k)),
-                                          err=None, corr=None, partial_corr=None)
-
-                else:
                 if mode == 'lsq':
                     self._least_squares_global(data_groups, p0, lb, ub, var_pars, data_pars)
 
@@ -301,10 +291,7 @@ class FitRoutine(object):
                 vals.append([v_k.scaled_value, v_k.lb / v_k.scale, v_k.ub / v_k.scale])
                 var_pars.append(p_k)
 
-        if vals:
         pp, lb, ub = zip(*vals)
-        else:
-            pp = lb = ub = None
 
         return pp, lb, ub, var_pars
 
@@ -332,10 +319,10 @@ class FitRoutine(object):
                 actual_pars.append(p_k_used)
                 # parameter is variable and was not found before as shared parameter
                 if v_k_used.var and p_k_used not in var:
-                    var.append(p_k_used)
                     p0.append(v_k_used.scaled_value)
                     lb.append(v_k_used.lb / v_k_used.scale)
                     ub.append(v_k_used.ub / v_k_used.scale)
+                    var.append(p_k_used)
 
             data_pars.append(actual_pars)
 
@@ -361,7 +348,7 @@ class FitRoutine(object):
         with np.errstate(all='ignore'):
             res = optimize.least_squares(cost, p0, bounds=(lb, ub), max_nfev=500 * len(p0))
 
-        err, corr, partial_corr = _calc_error(res.jac, np.sum(res.fun**2), *res.jac.shape)
+        err, corr, partial_corr = self._calc_error(res.jac, np.sum(res.fun**2), *res.jac.shape)
         self.make_results(data, res.x, var, data.para_keys, res.jac.shape,
                           err=err, corr=corr, partial_corr=partial_corr)
 
@@ -375,7 +362,7 @@ class FitRoutine(object):
         with np.errstate(all='ignore'):
             res = optimize.least_squares(cost, p0, bounds=(lb, ub), max_nfev=500 * len(p0))
 
-        err, corr, partial_corr = _calc_error(res.jac, np.sum(res.fun**2), *res.jac.shape)
+        err, corr, partial_corr = self._calc_error(res.jac, np.sum(res.fun**2), *res.jac.shape)
         for v, var_pars_k in zip(data, data_pars):
             self.make_results(v, res.x, var, var_pars_k, res.jac.shape,
                               err=err, corr=corr, partial_corr=partial_corr)
@@ -458,17 +445,9 @@ class FitRoutine(object):
             self.make_results(v, res.beta, var, var_pars_k, (sum(len(d) for d in data), len(p0)),
                               err=res.sd_beta, corr=corr, partial_corr=partial_corr)
 
-    def make_results(
+    def make_results(self, data, p, var_pars, used_pars, shape,
-            self,
+                     err=None, corr=None, partial_corr=None):
-            data: Data,
+
-            p: list[float],
-            var_pars: list[str],
-            used_pars: list[str],
-            shape: tuple[int, int],
-            err: list[float] = None,
-            corr: np.ndarray = None,
-            partial_corr: np.ndarray = None,
-    ):
         if err is None:
             err = [0] * len(p)
 
@@ -493,7 +472,7 @@ class FitRoutine(object):
                     pass
 
         # reshape the correlation matrices
-        if corr is None or not corr_idx:
+        if corr is None:
             actual_corr = None
             actual_pcorr = None
         else:
@@ -506,24 +485,22 @@ class FitRoutine(object):
         model = data.get_model()
 
         self.result[idx] = FitResultCreator.make_with_model(
-            model=model,
+            model,
-            x_orig=data.x,
+            data.x,
-            y_orig=data.y,
+            data.y,
-            p=actual_parameters,
+            actual_parameters,
-            fun_kwargs=data.fun_kwargs,
+            data.fun_kwargs,
-            we=data.we_string,
+            data.we_string,
-            idx=data.idx,
+            data.idx,
-            nobs=shape[0],
+            *shape,
-            nvar=shape[1],
             corr=actual_corr,
             pcorr=actual_pcorr,
-            data_mode=data.complex_type,
         )
 
         return self.result
 
-
+    @staticmethod
-def _calc_error(jac, chi, nobs, nvars):
+    def _calc_error(jac, chi, nobs, nvars):
         # copy of scipy.curve_fit to calculate covariance
         # noinspection PyTupleAssignmentBalance
         try:

src/nmreval/fit/model.py

@@ -9,7 +9,7 @@ from ._meta import MultiModel
 from .parameter import Parameters, Parameter
 
 
-class Model:
+class Model(object):
     def __init__(self, model, *args, **kwargs):
         self.idx = kwargs.pop('idx', None)
 

src/nmreval/fit/parameter.py

@@ -102,10 +102,12 @@ class Parameters(dict):
                 p._expr = expression
 
     def prepare_bounds(self):
+        print('prepare_bounds')
         original_values = list(self.values())
         for param in original_values:
             already_with_expression = False
             for mode, value in (('lower', param.lb), ('upper', param.ub)):
+                print(mode, value)
                 if already_with_expression:
                     raise ValueError('Only one boundary can be an expression')
                 already_with_expression = self.parse(param, value, bnd=mode)

src/nmreval/fit/result.py

@@ -11,7 +11,6 @@ from scipy.stats import f as fdist
 from scipy.interpolate import interp1d
 
 from ._meta import MultiModel
-from .model import Model
 from .parameter import Parameter
 from ..data.points import Points
 from ..data.signals import Signal
@@ -37,30 +36,17 @@ class FitResultCreator:
         else:
             resid = kwargs['y'] - y_orig
 
-        stats = calc_statistics(resid, _y)
+        stats = FitResultCreator.calc_statistics(resid, _y)
 
-        return FitResult(
+        return FitResult(kwargs['x'], kwargs['y'], x_orig, y_orig, params, dict(kwargs['choice']), resid, 0, 0,
-            x=kwargs['x'],
+                         kwargs['name'], stats, idx)
-            y=kwargs['y'],
-            x_data=x_orig,
-            y_data=y_orig,
-            params=params,
-            fun_kwargs=dict(kwargs['choice']),
-            resid=resid,
-            nobs=0,
-            nvar=0,
-            we='',
-            name=kwargs['name'],
-            stats=stats,
-            idx=idx,
-        )
 
     @staticmethod
     def make_with_model(
             model: 'Model',
             x_orig: np.ndarray,
             y_orig: np.ndarray,
-            p: list,
+            p: 'Parameters',
             fun_kwargs: dict,
             we: str,
             idx: str | None,
@@ -68,7 +54,6 @@ class FitResultCreator:
             nvar: int,
             corr:  np.ndarray,
             pcorr: np.ndarray,
-            data_mode: int,
     ) -> FitResult:
         if np.all(x_orig > 0) and (np.max(x_orig) > 100 * np.min(x_orig)):
             islog = True
@@ -98,11 +83,17 @@ class FitResultCreator:
             actual_mode = fun_kwargs['complex_mode']
             fun_kwargs['complex_mode'] = 0
 
-        _y = check_complex(model.func(p_final, _x, **fun_kwargs), actual_mode, data_mode)
+        _y = model.func(p_final, _x, **fun_kwargs)
+
+        if not actual_mode < 0:
+            if actual_mode == 1:
+                _y.imag = 0
+            elif actual_mode == 2:
+                _y.real = 0
 
             fun_kwargs['complex_mode'] = actual_mode
 
-        stats = calc_statistics(_y, resid, nobs, nvar)
+        stats = FitResultCreator.calc_statistics(_y, resid, nobs, nvar)
         varied = [p.var for p in parameters.values()]
 
         if corr is None:
@@ -143,9 +134,41 @@ class FitResultCreator:
             pcorr=partial_correlation,
             islog=islog,
             func=model,
-            data_complex=data_mode,
         )
 
+    @staticmethod
+    def calc_statistics(y, residual, nobs=None, nvar=None):
+        chi = (residual**2).sum()
+        try:
+            r = 1 - chi/((y-np.mean(y))**2).sum()
+        except RuntimeWarning:
+            r = -9999
+
+        if nobs is None:
+            nobs = 1
+
+        if nvar is None:
+            nvar = 0
+
+        dof = nobs - nvar
+        loglikehood = nobs * np.log(chi / nobs)
+
+        stats = {
+            'chi^2': chi,
+            'R^2': r,
+            'AIC': loglikehood + 2 * nvar,
+            'BIC': loglikehood + np.log(nobs) * nvar
+        }
+
+        if dof != 0:
+            stats['adj. R^2'] = 1 - (nobs-1)/dof * (1-r)
+            stats['red. chi^2'] = chi / dof if dof != 0 else 0
+
+        if dof != 1:
+            stats['AICc'] = stats['AIC'] + 2*(nvar+1)*nvar / (dof-1)
+
+        return stats
+
 
 class FitResult(Points):
 
@@ -168,8 +191,7 @@ class FitResult(Points):
             pcorr: np.ndarray = None,
             islog: bool = False,
             func=None,
-            data_complex: int = 1,
+            **kwargs
-            **kwargs,
     ):
 
         self.parameter, name = self._prepare_names(params, name)
@@ -191,7 +213,6 @@ class FitResult(Points):
         self.y_data = y_data
         self._model_name = name
         self._func = func
-        self._data_complex = data_complex
 
     @staticmethod
     def _prepare_names(parameter: dict, modelname: str):
@@ -372,7 +393,8 @@ class FitResult(Points):
     def get_state(self):
         state = super().get_state()
 
-        for attr in ['idx', 'fun_kwargs', 'nobs', 'nvar', 'we', 'islog', 'iscomplex', 'x_data', 'y_data']:
+        for attr in ['idx', 'fun_kwargs', 'nobs', 'nvar',
+                     'islog', 'iscomplex', 'x_data', 'y_data']:
             state[attr] = getattr(self, attr)
 
         state['name'] = self._model_name
@@ -390,8 +412,6 @@ class FitResult(Points):
     @staticmethod
     def set_state(state, **kwargs):
         state['params'] = {k: Parameter.set_state(v) for k, v in state.pop('params').items()}
-        if 'we' not in state:
-            state['we'] = '?'
         data = FitResult(**state)
 
         return data
@@ -400,32 +420,41 @@ class FitResult(Points):
         if self.func is None:
             raise ValueError('no fit function available to calculate new y values')
 
+        actual_mode = -1
+        if 'complex_mode' in self.fun_kwargs:
+            actual_mode = self.fun_kwargs['complex_mode']
+            self.fun_kwargs['complex_mode'] = 0
+
         new_fit = self.copy()
-        fun_kwargs = {k: v for k, v in self.fun_kwargs.items()}
+        y_values = self.func.func(self.p_final, x_values, **self.fun_kwargs)
-        if self.fun_kwargs.get('complex_mode', -1) == -1:
+        if not actual_mode < 0:
-            fun_kwargs.pop('complex_mode', None)
+            if actual_mode == 1:
-        y_values = self.func.func(self.p_final, x_values, **fun_kwargs)
+                y_values.imag = 0
-        y_values = check_complex(y_values, self.fun_kwargs.get('complex_mode', -1), self._data_complex)
+            elif actual_mode == 2:
+                y_values.real = 0
+
+            self.fun_kwargs['complex_mode'] = actual_mode
 
         new_fit.set_data(x_values, y_values, y_err=0.0)
 
         return new_fit
 
     def sub(self, x_values):
-        if self.func is None:
-            raise ValueError('no fit function available to calculate new y values')
-
         part_functions = []
-        actual_mode = self.fun_kwargs.get('complex_mode', -1)
+        actual_mode = -1
-        fun_kwargs = {k: v for k, v in self.fun_kwargs.items()}
+        if 'complex_mode' in self.fun_kwargs:
-        if self.fun_kwargs.get('complex_mode', -1) == -1:
+            actual_mode = self.fun_kwargs['complex_mode']
-            fun_kwargs.pop('complex_mode', None)
+            self.fun_kwargs['complex_mode'] = 0
 
         for sub_name, sub_y in zip(self.func.sub_name(), self.func.sub(self.p_final, x_values, **self.fun_kwargs)):
-            sub_y = check_complex(sub_y, actual_mode, self._data_complex)
+            if not actual_mode < 0:
+                if actual_mode == 1:
+                    sub_y.imag = 0
+                elif actual_mode == 2:
+                    sub_y.real = 0
 
-            if np.iscomplexobj(sub_y):
                 part_functions.append(Signal(x_values, sub_y, name=sub_name))
+
             else:
                 part_functions.append(Points(x_values, sub_y, name=sub_name))
 
@@ -433,49 +462,3 @@ class FitResult(Points):
             self.fun_kwargs['complex_mode'] = actual_mode
 
         return part_functions
-
-
-def check_complex(y, model_complex, data_complex):
-    if not np.iscomplexobj(y):
-        return y
-
-    if model_complex == 1:
-        y.imag = 0
-        if data_complex == 1:
-            y = y.real
-    elif model_complex == 2:
-        y.real = 0
-        if data_complex == 1:
-            y = y.imag
-
-    return y
-
-
-def calc_statistics(y, residual, nobs=None, nvar=None):
-    chi = (residual**2).sum()
-    try:
-        r = 1 - chi/((y-np.mean(y))**2).sum()
-    except RuntimeWarning:
-        r = -9999
-
-    if nobs is None:
-        nobs = 1
-
-    if nvar is None:
-        nvar = 0
-
-    dof = nobs - nvar
-    loglikehood = nobs * np.log(chi / nobs)
-
-    stats = {
-        'chi^2': chi,
-        'R^2': r,
-        'AIC': loglikehood + 2 * nvar,
-        'BIC': loglikehood + np.log(nobs) * nvar,
-        'adj. R^2': 1 - (nobs-1) / (dof+1e-13) * (1-r),
-        'red. chi^2': chi / (dof + 1e-13),
-    }
-
-    stats['AICc'] = stats['AIC'] + 2*(nvar+1)*nvar / (dof - 1 + 1e-13)
-
-    return stats

src/nmreval/io/asciireader.py

@@ -49,7 +49,7 @@ class AsciiReader:
         with self.fname.open('r') as f:
             for i, line in enumerate(islice(f, len(self.header)+len(self.lines), num_lines)):
                 line = line.strip('\n\t\r, ')
-                line = re.sub(r'[\t ;,]+', ';', line)
+                line = re.sub(r'[\t ;,] *', ';', line)
                 line = line.split(';')
 
                 try:
@@ -121,9 +121,6 @@ class AsciiReader:
         if y is None:
             y = list(range(int(len(x) != 0), max(self.width)))
 
-        if col_names is not None:
-            col_names = [col_names[y_i] for y_i in y]
-
         cols = x + y + yerr
         with self.fname.open('rb') as fh:
             tmp_ = re.sub(b'[;,]', b' ', fh.read())
@@ -183,13 +180,7 @@ class AsciiReader:
                 single_len = 2
                 stepsize = 2
 
-            cls = {
+            cls = {'points': Points, 'fid': FID, 'spectrum': Spectrum, 'bds': BDS, 'dsc': DSC}[mode]
-                'points': Points,
-                'fid': FID,
-                'spectrum': Spectrum,
-                'bds': BDS,
-                'dsc': DSC,
-            }[mode]
 
             for j in range(1, num_y+1, stepsize):
                 if col_names is not None:
@@ -197,7 +188,7 @@ class AsciiReader:
                     kwargs['name'] = col_names[j-1]
                 elif num_y > single_len:
                     # more than one axis, append column number
-                    kwargs['name'] = f'{filename}_{y[j-1]+1}'
+                    kwargs['name'] = filename + '_' + str(y[j-1])
 
                 if j+num_y < raw_data.shape[2]:
                     kwargs['y_err'] = raw_data[i, :, j+num_y]

src/nmreval/io/dsc.py

@@ -11,8 +11,7 @@ try:
     from scipy.integrate import simpson
 except ImportError:
     from scipy.integrate import simps as simpson
-from scipy.interpolate import CubicSpline
+from scipy.interpolate import interp1d
-
 
 ReferenceValue = namedtuple('Reference', ['name', 'transitions'])
 Cyclohexane = ReferenceValue('Cyclohexane', [(-87.06+273.15, 79.58), (6.54+273.15, None)])
@@ -39,7 +38,7 @@ class DSCSample:
     def read_file(self, fname: str | Path) -> None:
         fname = Path(fname)
 
-        # file contains weird deg C character in stupid ISO encoding
+        # file contains weird deg C character in stupiod ISO encoding
         with fname.open('r', encoding='iso-8859-15') as f:
             ii = 1
             for line in f:
@@ -145,12 +144,9 @@ class DSCCalibrator:
         self.reference = []
         self.ref_list = []
 
-    def set_measurement(
+    def set_measurement(self,
-            self: DSCCalibrator,
+                        fname: str | Path | DSCSample, mode: str = 'sample',
-            fname: str | Path | DSCSample,
+                        reference: ReferenceValue = Cyclohexane):
-            mode: str = 'sample',
-            reference: ReferenceValue = Cyclohexane
-    ):
         if mode not in ['sample', 'empty', 'reference']:
             raise ValueError(f'Unknown mode {mode}, not "sample", "empty", "reference"')
         if mode == 'reference' and not isinstance(reference, ReferenceValue):
@@ -270,12 +266,7 @@ class DSCCalibrator:
 
         return sol
 
-    def get_data(
+    def get_data(self, idx: int, slope: str = 'iso', limits: tuple[float, float] = None):
-            self: DSCCalibrator,
-            idx: int,
-            slope: str = 'iso',
-            limits: tuple[float, float] = None
-    ) -> tuple[np.ndarray, np.ndarray, np.ndarray,np.ndarray | None, np.ndarray]:
         if self.sample.steps[idx][0] == 'i':
             raise ValueError('baseline correction is not implemented for isotherms')
 
@@ -301,7 +292,7 @@ class DSCCalibrator:
             empty_y = empty_data[1]
             if self.sample.length(idx) != self.empty.length(idx_empty):
                 with np.errstate(all='ignore'):
-                    empty_y = CubicSpline(empty_data[2]-empty_data[2, 0], empty_data[1], extrapolate=True)(sample_data[2] - sample_data[2, 0])
+                    empty_y = interp1d(empty_data[2]-empty_data[2, 0], empty_data[1], fill_value='extrapolate')(sample_data[2, 0])
 
         sample_data[1] -= empty_y
         drift_value = sample_data.copy()[(2, 1), :]
@@ -355,10 +346,9 @@ class DSCCalibrator:
 
             offset = region[0, 0]
             sample_data[1] -= m * (sample_data[2] - region[1, 0]) + offset
-            line = np.array([
+            line = np.array([[sample_data[2, 0], sample_data[2, -1]],
-                [sample_data[2, 0], sample_data[2, -1]],
+                             [m * (sample_data[2, 0] - region[1, 0]) + offset,
-                [m * (sample_data[2, 0] - region[1, 0]) + offset, m * (sample_data[2, -1] - region[1, 0]) + offset]
+                              m * (sample_data[2, -1] - region[1, 0]) + offset]])
-            ])
 
         else:
             line = np.array([[sample_data[2, 0], sample_data[2, -1]], [0, 0]])

src/nmreval/io/fcbatchreader.py

@@ -48,7 +48,7 @@ class FCReader:
                 found_temperature = filename.stem
 
             if filename.is_file():
-                if (region is None) or (region == (None, None)):
+                if region is None:
                     _temp = self._read_from_hdf(filename)
                 else:
                     _temp = self._read_signals(filename, region)

src/nmreval/io/graceeditor.py

@@ -115,7 +115,6 @@ class GraceEditor:
         return s
 
     def parse(self, filename: str | pathlib.Path):
-        self.clear()
         self.file = pathlib.Path(filename)
 
         # we start always with the header
@@ -216,8 +215,9 @@ class GraceEditor:
     def _make_graph(self, line: str):
         m = self._RE_GRAPH_START.match(line)
         g_idx = int(m.group(1))
-        while g_idx < len(self.graphs):
+        if g_idx < len(self.graphs):
             # this assumes that graphs are ordered in agr file even if missing, e.g. we read gß, g1, g3, ...
+            while g_idx != len(self.graphs):
                 self.graphs.append(GraceGraph(len(self.graphs)))
 
         self.graphs.append(GraceGraph(g_idx))
@@ -354,8 +354,8 @@ class GraceHeader(list):
 class GraceProperties(list):
     _RE_ENTRY = re.compile(r'(?!.*(on|off)$)'  # ignore lines that end with on or off
                            r'@\s*(?P<graph>[gs]\d+)?\s*'  # @ maybe followed by g0 or s12 
-                           r'(?P<key>[\w\s]*\w)*\s+'   # key: stops at last space unless comma-separated values 
+                           r'(?P<key>[\w\s]*)\s+'   # key: stops at last space unless comma-separated values 
-                           r'(?P<val>(?<!^)(?:\s*[\d\w.+-]+\s*,)*\s*[\S ]+)',  # one value, maybe more with commas
+                           r'(?P<val>(?:\s*[\d\w.+-]+\s*,)*\s*[\\{}\"\w.+\- ]+)',  # one value, maybe more with commas
                            re.IGNORECASE | re.VERBOSE)
     _RE_ONOFF = re.compile(r'@\s(?P<graph>[gs]\d+)*\s*(?P<val>[\w\s]*)\s+(on|off)')
 
@@ -730,11 +730,7 @@ class GraceRegion(list):
 
 
 def _convert_to_value(parse_string):
-    if re.match(r'\".*\"', parse_string):
-        tuples = [parse_string]
-    else:
     tuples = parse_string.split(',')
-
     for i, v in enumerate(tuples):
         v = v.strip()
 

src/nmreval/math/smooth.py

@@ -3,21 +3,14 @@ import numpy.polynomial.polynomial as poly
 from scipy import signal as signal
 
 
-__all__ = [
+__all__ = ['smooth', 'loess', 'savgol',
-    'smooth',
+           'running_max', 'running_min',
-    'loess',
+           'running_var', 'running_std',
-    'savgol',
+           'running_median', 'running_mean',
-    'running_max',
+           'running_sum']
-    'running_min',
-    'running_var',
-    'running_std',
-    'running_median',
-    'running_mean',
-    'running_sum',
-]
 
 
-def loess(x, y, window_size: int, it: int = 0, deg: int = 2):
+def loess(x, y, window_size, it=0, deg=2):
     # ULTRA LANGSAM !!!
     it = max(it, 0)
 
@@ -88,19 +81,19 @@ def savgol(x, y, window_size: int, deg: int = 2, mode: str = 'mirror'):
     return new_y
 
 
-def running_mean(x, y, window_size: int):
+def running_mean(x, y, window_size):
     return _running_func(np.nanmean, x, y, window_size)
 
 
-def running_median(x, y, window_size: int):
+def running_median(x, y, window_size):
     return _running_func(np.nanmedian, x, y, window_size)
 
 
-def running_std(x, y, window_size: int):
+def running_std(x, y, window_size):
     return _running_func(np.nanstd, x, y, window_size)
 
 
-def running_var(x, y, window_size: int):
+def running_var(x, y, window_size):
     return _running_func(np.nanvar, x, y, window_size)
 
 
@@ -139,27 +132,11 @@ def _moving_window(arr, nn):
     return np.lib.stride_tricks.as_strided(arr, shapes, strides)
 
 
-_funcs = {
+_funcs = {'loess': loess, 'savgol': savgol, 'mean': running_mean, 'median': running_median,
-    'loess': loess,
+          'std': running_std, 'var': running_var, 'max': running_max, 'min': running_min, 'sum': running_sum}
-    'savgol': savgol,
-    'mean': running_mean,
-    'median': running_median,
-    'std': running_std,
-    'var': running_var,
-    'max': running_max,
-    'min': running_min,
-    'sum': running_sum,
-}
 
 
-def smooth(
+def smooth(data, window_size, mode='mean', logx=False, logy=False, **kwargs):
-        data: 'Data',
-        window_size: int,
-        mode: str = 'mean',
-        logx: bool = False,
-        logy: bool = False,
-        **kwargs
-):
     try:
         func = _funcs[mode]
     except KeyError:
@@ -185,6 +162,6 @@ def smooth(
         new_y = 10**new_y
 
     new_data = data.copy()
-    new_data.set_data(x=new_x, y=new_y, y_err=np.zeros_like(new_y))
+    new_data.set_data(x=new_x, y=new_y, y_err=None)
 
     return new_data

src/nmreval/models/basic.py

@@ -191,18 +191,6 @@ class PowerLawCross:
         return ret_val
 
 
-class Sinc:
-    type = 'Basic'
-    name = 'Sinc'
-    equation = 'C * sinc((x-x_{0})/w)'
-    params = ['C', 'x_{0}', 'w']
-
-    @staticmethod
-    def func(x, c: float, x0: float, w: float):
-        # numpy sinc is defined as sin(pi*x)/(pi*x)
-        return c * np.sinc(((x-x0)/w)/np.pi)
-
-
 class Sine:
     """
     Wavy sine function

src/nmreval/models/bds.py

@@ -1,6 +1,5 @@
 import numpy as np
 
-from . import PowerLaw
 from ..distributions import Debye, ColeCole, ColeDavidson, KWW, HavriliakNegami
 from ..utils.constants import epsilon0
 
@@ -233,8 +232,8 @@ class DCCondBDS:
 
 
 class DerivativeHavriliakNegami:
-    name = 'Havriliak-Negami (der.)'
+    name = 'Derivative HN'
-    type = 'Dielectric Spectroscopy (derivative)'
+    type = 'Dielectric Spectroscopy'
     params = [r'\Delta\epsilon', r'\tau', r'\alpha', r'\gamma']
     choices = [
         ('x axis', 'xaxis', {'Frequency': 'freq', 'Omega': 'omega'})
@@ -255,8 +254,8 @@ class DerivativeHavriliakNegami:
 
 
 class DerivativeColeCole:
-    name = 'Cole-Cole (der.)'
+    name = 'Derivative CC'
-    type = 'Dielectric Spectroscopy (derivative)'
+    type = 'Dielectric Spectroscopy'
     params = [r'\Delta\epsilon', r'\tau', r'\alpha']
     bounds = [(0, None), (0, None), (0, 1)]
     choices = [
@@ -277,8 +276,8 @@ class DerivativeColeCole:
 
 
 class DerivativeColeDavidson:
-    name = 'Cole-Davidson (der.)'
+    name = 'Derivative CD'
-    type = 'Dielectric Spectroscopy (derivative)'
+    type = 'Dielectric Spectroscopy'
     params = [r'\Delta\epsilon', r'\tau', r'\gamma']
     bounds = [(0, None), (0, None), (0, 1)]
     choices = [
@@ -296,8 +295,8 @@ class DerivativeColeDavidson:
 
 
 class _DerivativeHNWithHF:
-    name = 'HN + HF wing (der.)'
+    name = 'Derivative (HN + HF wing)'
-    type = 'Dielectric Spectroscopy (derivative)'
+    type = 'Dielectric Spectroscopy'
     params = [r'\Delta\epsilon', r'\tau', r'\alpha', r'\gamma', r'\tau_{c}', r'\delta']
     bounds = [(0, None), (0, None), (0, 1), (0, 1), (0, None), (0, 1)]
     choices = [
@@ -326,8 +325,8 @@ class _DerivativeHNWithHF:
 
 
 class DerivativeCCWithHF:
-    name = 'CC + HF wing (der.)'
+    name = 'Derivative (CC + HF wing)'
-    type = 'Dielectric Spectroscopy (derivative)'
+    type = 'Dielectric Spectroscopy'
     params = [r'\Delta\epsilon', r'\tau', r'\alpha', r'\tau_{c}', r'\delta']
     bounds = [(0, None), (0, None), (0, 1), (0, None), (0, 1)]
     choices = [
@@ -340,8 +339,8 @@ class DerivativeCCWithHF:
 
 
 class DerivativeCDWithHF:
-    name = 'CD + HF wing (der.)'
+    name = 'Derivative (CD + HF wing)'
-    type = 'Dielectric Spectroscopy (derivative)'
+    type = 'Dielectric Spectroscopy'
     params = [r'\Delta\epsilon', r'\tau', r'\gamma', r'\tau_{c}', r'\delta']
     bounds = [(0, None), (0, None), (0, 1), (0, None), (0, 1)]
     choices = [
@@ -353,22 +352,6 @@ class DerivativeCDWithHF:
         return _DerivativeHNWithHF.func(x, deps, tau, 1, gamma, tauc, delta, xaxis=xaxis)
 
 
-class PowerLawBDSDer:
-    name = 'Power Law'
-    type = 'Dielectric Spectroscopy (derivative)'
-    equation = r'A * \omega^{n}'
-    params = ['A', 'n']
-    bounds = [(None, None), (None, None)]
-    choices = [
-        ('x axis', 'xaxis', {'Frequency': 'freq', 'Omega': 'omega'})
-    ]
-
-    @staticmethod
-    def func(x, a, n, xaxis: str = 'freq'):
-        _w = _convert_x_to_omega(x, xaxis=xaxis)
-        return a * _w ** n
-
-
 def _convert_x_to_omega(x, xaxis: str = 'freq'):
     if xaxis not in ['freq', 'omega']:
         raise ValueError(f'Argument `xaxis` is `freq` or `omega`, given is {xaxis!r}')

src/nmreval/models/fieldcycling.py

@@ -2,7 +2,6 @@ import numpy as np
 
 from ..distributions import *
 from ..distributions.energy import EnergyBarriers
-from ..distributions.gengamma import GGAlpha
 from ..distributions.intermolecular import FFHS
 from ..nmr.relaxation import Relaxation
 from ..utils.constants import gamma
@@ -83,13 +82,6 @@ class FFHSFC(_AbstractFC):
     relax = Relaxation(distribution=FFHS)
 
 
-class GGAFC(_AbstractFC):
-    name = 'GG(alpha)'
-    params = _AbstractFC.params + [r'\alpha', r'\beta']
-    bounds = _AbstractFC.bounds + [(None, None), (None, None)]
-    relax = Relaxation(distribution=GGAlpha)
-
-
 class EnergyFC(_AbstractFC):
     name = 'Energy distribution'
     params = ['C', 'T'] + EnergyBarriers.parameter

src/nmreval/models/transitions.py

@@ -1,31 +1,19 @@
-from __future__ import annotations
-
 import numpy as np
 from scipy import special as special
 
 from ..utils import kB
 
 
-class Weight:
+class Weight2Phase:
     type = 'Line shape'
     name = 'Weighting factor'
-    equation = r'A * [0.5 \pm 0.5 erf[(x-T_{0})/\DeltaT]] + A_{0}'
+    equation = r'A*[0.5 + 0.5 erf[(x-T_{0})/\DeltaT]] + A_{0}'
     params = ['T_{0}', r'\DeltaT', 'A', 'A_{0}']
-    choices = [('Direction', 'sign', {'increase': '+', 'decrease': '-'})]
     bounds = [(0, None), (0, None), (None, None), (None, None)]
 
     @staticmethod
-    def func(x: np.ndarray | float, t0: float, dt: float, amp: float, off: float, sign: str = '+') -> np.ndarray | float:
+    def func(x, t0, dt, amp, off):
-        if sign not in '+-':
+        return amp*(0.5 + 0.5*special.erf((x-t0)/dt)) + off
-            raise ValueError(f"`value` is `+` or `-`, not {sign}")
-
-        error_func = 1
-        if sign == '+':
-            error_func += special.erf((x-t0)/dt)
-        else:
-            error_func -= special.erf((x - t0) / dt)
-
-        return amp * error_func / 2. + off
 
 
 class HendricksonBray:
@@ -36,5 +24,5 @@ class HendricksonBray:
     bounds = [(0, None)] * 4
 
     @staticmethod
-    def func(x: np.ndarray | float, a: float, b: float, e: float, w0: float) -> np.ndarray | float:
+    def func(x, a, b, e, w0):
         return a*b / (b + (a-b)*np.exp(-e/kB/x)) + w0

src/nmreval/nmr/relaxation.py

@@ -525,7 +525,7 @@ class RelaxationEvaluation(Relaxation):
             dist_parameter: tuple | list = None,
             prefactor: tuple | list | float = None,
             coupling_kwargs: dict = None,
-    ) -> tuple[float, float] :
+    ) -> None:
         """
         Determine a single parameter from a T1 minimum.
         It replaces the previously set value.

src/nmreval/utils/__init__.py

@@ -5,10 +5,3 @@ from .constants import *
 
 NUMBER_RE = re.compile(r'[-+]?\d*[+p.]?\d+([eE][-+]?\d+)?', re.MULTILINE)
 UNSIGNED_NUMBER_RE = re.compile(r'[-+]?\d*[+p.]?\d+([eE][-+]?\d+)?', re.MULTILINE)
-
-
-def numbers_from_string(any_string: str) -> list[float]:
-    matches = []
-    for m in NUMBER_RE.finditer(any_string):
-        matches.append(float(m.group().replace('p', '.')))
-    return matches

src/nmreval/utils/text.py

@@ -33,9 +33,9 @@ big_greek = [
 special_chars = [
     r'\infty \int \sum \langle \rangle \pm \perp \para \leftarrow \rightarrow \leftrightarrow \cdot \hbar \n',
     '\u221e \u222b \u2211 \u27e8 \u27e9 \u00b1 \u27c2 \u2225 \u21d0 \u21d2 \u21d4 \u00b7 \u0127 <br>',
-    r'\f{Symbol}¥\f{} \f{Symbol}ò\f{} \f{Symbol}å\f{} \f{Symbol}á\f{} \f{Symbol}ñ\f{} \f{Symbol}±\f{} '
+    r'\f{Symbol}¥\f{} \f{Symbol}ò\f{} \f{Symbol}å\f{} \f{Symbol}á\f{} \f{Symbol}ñ\f{} \f{Symbol}±\f{} \n'
     r'\f{Symbol}^\f{} \f{Symbol}||\f{} \f{Symbol}¬\f{} \f{Symbol}®\f{} \f{Symbol}«\f{} \f{Symbol}×\f{Symbol} '
-    r'h\h{-0.6}\v{0.3}-\v{-0.3}\h{0.3} \n',
+    r'h\h{-0.6}\v{0.3}-\v{-0.3}\h{0.3}',
     r'infty int sum < > \+- perp para <- -> <-> \* hbar \s',
 ]
 funcs = [

src/resources/_ui/asciidialog.ui

@@ -336,7 +336,7 @@
             </sizepolicy>
            </property>
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Token:&lt;br/&gt;[abc]: Matches any of a, b, or c&lt;br/&gt;[a-z]: Matches any digit in the range a-z&lt;br/&gt;\d: Matches any digit in the range 0-9 (equal to [0-9}&lt;/p&gt;&lt;p&gt;Quantifiers:&lt;br/&gt;a+: 0 or more of a&lt;br/&gt;a*: 1 or more of a&lt;br/&gt;a?: 0 or 1 of a&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Token:&lt;br/&gt;[abc]: Matches any of a, b, or c&lt;br/&gt;[a-z]: Matches any digit in the range a-z&lt;br/&gt;\d: Matches any digit in the range 0-9 (equal to [0-9}&lt;/p&gt;&lt;p&gt;Quantifiers:&lt;br/&gt;a*: 0 or more of a&lt;br/&gt;a*: 1 or more of a&lt;br/&gt;a?: 0 or 1 of a&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
           </widget>
          </item>

src/resources/_ui/basewindow.ui

@@ -172,14 +172,6 @@
     <property name="title">
      <string>&amp;Data</string>
     </property>
-    <widget class="QMenu" name="menuCut_to_visible_range">
-     <property name="title">
-      <string>Cut to visible range</string>
-     </property>
-     <addaction name="separator"/>
-     <addaction name="action_cut_xaxis"/>
-     <addaction name="action_cut_yaxis"/>
-    </widget>
     <addaction name="action_new_set"/>
     <addaction name="action_delete_sets"/>
     <addaction name="actionMove_between_plots"/>
@@ -189,10 +181,9 @@
     <addaction name="action_sort_pts"/>
     <addaction name="actionSkip_points"/>
     <addaction name="separator"/>
-    <addaction name="menuCut_to_visible_range"/>
+    <addaction name="action_cut"/>
     <addaction name="separator"/>
     <addaction name="actionChange_datatypes"/>
-    <addaction name="actionUse_script"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -256,7 +247,6 @@
      <addaction name="action_no_range"/>
      <addaction name="action_x_range"/>
      <addaction name="action_custom_range"/>
-     <addaction name="actionExclude_region"/>
     </widget>
     <addaction name="action_FitWidget"/>
     <addaction name="separator"/>
@@ -447,6 +437,30 @@
    <addaction name="t1action"/>
    <addaction name="actionCalculateT1"/>
   </widget>
+  <widget class="QToolBar" name="toolBar_fit">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="windowTitle">
+    <string>Fit</string>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>24</width>
+     <height>24</height>
+    </size>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="action_FitWidget"/>
+  </widget>
   <widget class="QToolBar" name="toolBar_spectrum">
    <property name="sizePolicy">
     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -871,6 +885,11 @@
     <string>Integration...</string>
    </property>
   </action>
+  <action name="action_cut">
+   <property name="text">
+    <string>Cut to visible range</string>
+   </property>
+  </action>
   <action name="actionMove_between_plots">
    <property name="text">
     <string>Move sets...</string>
@@ -1026,35 +1045,6 @@
     <string>TNMH...</string>
    </property>
   </action>
-  <action name="actionExclude_region">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Exclude region</string>
-   </property>
-  </action>
-  <action name="action_cut_xaxis">
-   <property name="text">
-    <string>x axis</string>
-   </property>
-   <property name="toolTip">
-    <string>Remove data points outside visible x range.</string>
-   </property>
-  </action>
-  <action name="action_cut_yaxis">
-   <property name="text">
-    <string>y axis</string>
-   </property>
-   <property name="toolTip">
-    <string>Remove data points outside visible y range. Uses real part of points.</string>
-   </property>
-  </action>
-  <action name="actionUse_script">
-   <property name="text">
-    <string>Use script...</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>

src/resources/_ui/datawidget.ui

@@ -106,19 +106,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QToolButton" name="pokemon_toolbutton">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonTextOnly</enum>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

src/resources/_ui/fcreader.ui

@@ -96,14 +96,11 @@
    <item>
     <widget class="QGroupBox" name="region_box">
      <property name="title">
-      <string>Evaluate region (empty values default to values of the script)</string>
+      <string>Evaluate region (empty values default to start/end)</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
        <number>3</number>
@@ -314,11 +311,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="QComboBox" name="graph_comboBox">
+       <widget class="QComboBox" name="graph_comboBox"/>
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-       </widget>
       </item>
       <item row="3" column="0">
        <widget class="QCheckBox" name="graph_checkbox">

src/resources/_ui/fitcreationdialog.ui

@@ -86,7 +86,11 @@
        <layout class="QVBoxLayout" name="verticalLayout_6"/>
       </widget>
      </widget>
-     <widget class="EditorWidget" name="editor" native="true"/>
+     <widget class="CodeEditor" name="plainTextEdit">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+     </widget>
     </widget>
    </item>
    <item>
@@ -103,10 +107,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>EditorWidget</class>
+   <class>CodeEditor</class>
-   <extends>QWidget</extends>
+   <extends>QPlainTextEdit</extends>
    <header>..lib.codeeditor</header>
-   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>

src/resources/_ui/fitmodelwidget.ui

@@ -67,12 +67,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>160</width>
-         <height>16777215</height>
-        </size>
-       </property>
        <property name="toolTip">
         <string>Initial values</string>
        </property>
@@ -98,13 +92,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="reset_button">
-       <property name="text">
-        <string>Use global</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
@@ -164,12 +151,6 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>100</width>
-          <height>16777215</height>
-         </size>
-        </property>
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lower bound. Same bound is used for all data. Leave empty for no boundary condition.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
@@ -214,12 +195,6 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>100</width>
-          <height>16777215</height>
-         </size>
-        </property>
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Upper bound. Same bound is used for all data. Leave empty for no boundary condition.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>

src/resources/_ui/fitresult.ui

@@ -31,13 +31,13 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <property name="leftMargin">
-        <number>6</number>
+        <number>3</number>
        </property>
        <property name="topMargin">
         <number>3</number>
        </property>
        <property name="rightMargin">
-        <number>6</number>
+        <number>3</number>
        </property>
        <property name="bottomMargin">
         <number>3</number>
@@ -45,104 +45,27 @@
        <property name="spacing">
         <number>3</number>
        </property>
-       <item row="2" column="3">
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="4">
-        <widget class="QToolButton" name="autoscale_box">
-         <property name="toolTip">
-          <string>Auto-scale graph for all sets</string>
-         </property>
-         <property name="text">
-          <string>Autoscale all sets</string>
-         </property>
-        </widget>
-       </item>
        <item row="2" column="1">
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="2">
-        <widget class="QGroupBox" name="verticalGroupBox_2">
-         <property name="title">
-          <string>Logarithmic axes</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <item>
-           <widget class="QCheckBox" name="logx_box">
-            <property name="layoutDirection">
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="text">
-             <string>x axis</string>
-            </property>
-           </widget>
-          </item>
-          <item>
         <widget class="QCheckBox" name="logy_box">
          <property name="layoutDirection">
-             <enum>Qt::LeftToRight</enum>
+          <enum>Qt::RightToLeft</enum>
          </property>
          <property name="text">
-             <string>y axis</string>
+          <string>logarithmic y axis</string>
          </property>
         </widget>
        </item>
-         </layout>
-        </widget>
-       </item>
        <item row="2" column="0">
-        <widget class="QGroupBox" name="verticalGroupBox">
+        <widget class="QCheckBox" name="logx_box">
-         <property name="title">
+         <property name="layoutDirection">
-          <string>Residuals</string>
+          <enum>Qt::RightToLeft</enum>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QRadioButton" name="rel_dev_button">
          <property name="text">
-             <string>relative deviation</string>
+          <string>logarithmic x axis</string>
          </property>
-            <attribute name="buttonGroup">
-             <string notr="true">buttonGroup</string>
-            </attribute>
         </widget>
        </item>
-          <item>
+       <item row="0" column="0" colspan="2">
-           <widget class="QRadioButton" name="abs_dev_button">
-            <property name="text">
-             <string>absolute deviation</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">buttonGroup</string>
-            </attribute>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="5">
         <widget class="GraphicsLayoutWidget" name="graphicsView"/>
        </item>
       </layout>
@@ -252,6 +175,13 @@
      </widget>
     </widget>
    </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Retry</set>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="0">
     <widget class="QTableWidget" name="param_tableWidget">
      <property name="sizePolicy">
@@ -301,6 +231,152 @@
      </property>
     </widget>
    </item>
+   <item row="7" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Output</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <property name="spacing">
+       <number>3</number>
+      </property>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="extrapolate_box">
+        <property name="toolTip">
+         <string>Extrapolates only main function</string>
+        </property>
+        <property name="text">
+         <string>Extrapolate curves</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="5">
+       <widget class="QCheckBox" name="parameter_checkbox">
+        <property name="text">
+         <string>Plot parameter</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="6">
+       <widget class="QComboBox" name="graph_comboBox">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="5">
+       <widget class="QCheckBox" name="graph_checkBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>New graph for parameter</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="minx_line">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Leave empty to start at lowest point</string>
+        </property>
+        <property name="placeholderText">
+         <string>min x</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4" rowspan="2">
+       <widget class="Line" name="line_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLineEdit" name="maxx_line">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Leave empty to start at highest point</string>
+        </property>
+        <property name="placeholderText">
+         <string>max x</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QLineEdit" name="numx_line">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="placeholderText">
+         <string># pts</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QCheckBox" name="curve_checkbox">
+          <property name="text">
+           <string>Plot fit curve</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="partial_checkBox">
+          <property name="text">
+           <string>Plot partial functions</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="ElideComboBox" name="sets_comboBox">
      <property name="sizePolicy">
@@ -333,193 +409,6 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Output</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="leftMargin">
-       <number>3</number>
-      </property>
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="rightMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
-       <number>3</number>
-      </property>
-      <property name="spacing">
-       <number>3</number>
-      </property>
-      <item row="1" column="7">
-       <widget class="QComboBox" name="graph_comboBox">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="minx_line">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Leave empty to start at lowest point</string>
-        </property>
-        <property name="placeholderText">
-         <string>min x</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="extrapolate_box">
-        <property name="toolTip">
-         <string>Extrapolates only main function</string>
-        </property>
-        <property name="text">
-         <string>Extrapolate curves</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QLineEdit" name="numx_line">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="placeholderText">
-         <string># pts</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="6">
-       <widget class="QCheckBox" name="graph_checkBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>New graph for parameter</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="maxx_line">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Leave empty to start at highest point</string>
-        </property>
-        <property name="placeholderText">
-         <string>max x</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="5" rowspan="2">
-       <widget class="Line" name="line_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="QCheckBox" name="newx_log_checkbox">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>log-spaced?</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="5">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QCheckBox" name="curve_checkbox">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Plot fit curve</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="partial_checkBox">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Plot partial functions</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="6" colspan="2">
-       <widget class="QCheckBox" name="parameter_checkbox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Plot parameter</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Retry</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -536,7 +425,4 @@
  </customwidgets>
  <resources/>
  <connections/>
- <buttongroups>
-  <buttongroup name="buttonGroup"/>
- </buttongroups>
 </ui>

src/resources/_ui/graph.ui

@@ -449,11 +449,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="title_lineedit">
+       <widget class="QLineEdit" name="title_lineedit"/>
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Uses simple latex syntax, does not support italic/math environment. Sub-/superscripts need curly brackets.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Example: \alpha^{123}&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-       </widget>
       </item>
       <item>
        <spacer name="horizontalSpacer_3">
@@ -479,11 +475,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="xaxis_linedit">
+       <widget class="QLineEdit" name="xaxis_linedit"/>
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Uses simple latex syntax, does not support italic/math environment. Sub-/superscripts need curly brackets.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Example: \alpha^{123}&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-       </widget>
       </item>
       <item>
        <spacer name="horizontalSpacer_4">
@@ -509,11 +501,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="yaxis_linedit">
+       <widget class="QLineEdit" name="yaxis_linedit"/>
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Uses simple latex syntax, does not support italic/math environment. Sub-/superscripts need curly brackets.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Example: \alpha^{123}&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-       </widget>
       </item>
      </layout>
     </widget>

src/resources/_ui/interpol_dialog.ui

@@ -119,7 +119,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -300,5 +300,38 @@
   <tabstop>dest_combobox</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>251</x>
+     <y>490</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>319</x>
+     <y>490</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

src/resources/_ui/pokeentry.ui

@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>640</width>
-    <height>642</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
-    <widget class="QLabel" name="artwork_label">
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="verticalSpacing">
-      <number>12</number>
-     </property>
-     <property name="leftMargin">
-      <number>3</number>
-     </property>
-     <property name="topMargin">
-      <number>3</number>
-     </property>
-     <property name="rightMargin">
-      <number>3</number>
-     </property>
-     <property name="bottomMargin">
-      <number>3</number>
-     </property>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>National No.</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="nationaldex_label">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_1">
-       <property name="text">
-        <string>Species</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLabel" name="species_label">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Type</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QLabel" name="type1_label">
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="type2_label">
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Abilities</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QLabel" name="ability1_label">
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="ability2_label">
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="ability3_label">
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Height</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QLabel" name="height_label">
-       <property name="text">
-        <string>0.0 m</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Weight</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QLabel" name="weight_label">
-       <property name="text">
-        <string>0.0 kg</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="gender_label">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Stats</string>
-     </property>
-     <property name="flat">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <property name="leftMargin">
-       <number>3</number>
-      </property>
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="rightMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
-       <number>3</number>
-      </property>
-      <item row="0" column="3">
-       <widget class="QProgressBar" name="spec_attack_bar">
-        <property name="styleSheet">
-         <string notr="true">QProgressBar{
-    border: none;
-	background-color: transparent;
-    text-align: center;
-}
-
-QProgressBar::chunk {
-    background-color: #009cda;
-	border-radius: 3px;
-}</string>
-        </property>
-        <property name="maximum">
-         <number>194</number>
-        </property>
-        <property name="value">
-         <number>24</number>
-        </property>
-        <property name="format">
-         <string>%v</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Special Attack</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QProgressBar" name="spec_defense_bar">
-        <property name="styleSheet">
-         <string notr="true">QProgressBar{
-    border: none;
-	background-color: transparent;
-    text-align: center;
-}
-
-QProgressBar::chunk {
-    background-color: #009cda;
-	border-radius: 3px;
-}</string>
-        </property>
-        <property name="maximum">
-         <number>250</number>
-        </property>
-        <property name="value">
-         <number>24</number>
-        </property>
-        <property name="format">
-         <string>%v</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="frameShadow">
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="text">
-         <string>HP</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QProgressBar" name="hp_bar">
-        <property name="styleSheet">
-         <string notr="true">QProgressBar{
-    border: none;
-	background-color: transparent;
-    text-align: center;
-}
-
-QProgressBar::chunk {
-    background-color: #009cda;
-	border-radius: 3px;
-}</string>
-        </property>
-        <property name="maximum">
-         <number>255</number>
-        </property>
-        <property name="value">
-         <number>24</number>
-        </property>
-        <property name="format">
-         <string>%v</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3">
-       <widget class="QProgressBar" name="speed_bar">
-        <property name="styleSheet">
-         <string notr="true">QProgressBar{
-    border: none;
-	background-color: transparent;
-    text-align: center;
-}
-
-QProgressBar::chunk {
-    background-color: #009cda;
-	border-radius: 3px;
-}</string>
-        </property>
-        <property name="maximum">
-         <number>200</number>
-        </property>
-        <property name="value">
-         <number>24</number>
-        </property>
-        <property name="format">
-         <string>%v</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLabel" name="label_11">
-        <property name="text">
-         <string>Speed</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>Special Defense</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QProgressBar" name="defense_bar">
-        <property name="styleSheet">
-         <string notr="true">QProgressBar{
-    border: none;
-	background-color: transparent;
-    text-align: center;
-}
-
-QProgressBar::chunk {
-    background-color: #009cda;
-	border-radius: 3px;
-}</string>
-        </property>
-        <property name="maximum">
-         <number>250</number>
-        </property>
-        <property name="value">
-         <number>24</number>
-        </property>
-        <property name="format">
-         <string>%v</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QProgressBar" name="attack_bar">
-        <property name="styleSheet">
-         <string notr="true">QProgressBar{
-    border: none;
-	background-color: transparent;
-    text-align: center;
-}
-
-QProgressBar::chunk {
-    background-color: #009cda;
-	border-radius: 3px;
-}</string>
-        </property>
-        <property name="maximum">
-         <number>190</number>
-        </property>
-        <property name="value">
-         <number>24</number>
-        </property>
-        <property name="format">
-         <string>%v</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Attack</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>Defense</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Evolution chain</string>
-     </property>
-     <property name="flat">
-      <bool>true</bool>
-     </property>
-     <property name="checkable">
-      <bool>false</bool>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="leftMargin">
-       <number>3</number>
-      </property>
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="rightMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
-       <number>3</number>
-      </property>
-      <item>
-       <widget class="QTableWidget" name="tableWidget">
-        <property name="styleSheet">
-         <string notr="true">background-color: transparent;</string>
-        </property>
-        <property name="editTriggers">
-         <set>QAbstractItemView::NoEditTriggers</set>
-        </property>
-        <property name="showGrid">
-         <bool>false</bool>
-        </property>
-        <property name="gridStyle">
-         <enum>Qt::NoPen</enum>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-        <attribute name="horizontalHeaderVisible">
-         <bool>false</bool>
-        </attribute>
-        <attribute name="verticalHeaderVisible">
-         <bool>false</bool>
-        </attribute>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/resources/_ui/pokemon.ui

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>359</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Random Pokémon</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>National-Dex</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="pokedex_nr">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Name</string>
+       </property>
+       <property name="buddy">
+        <cstring>name</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="name"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Kategorie</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="category">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Typ</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLabel" name="poketype">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Größe</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLabel" name="height">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Gewicht</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLabel" name="weight">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Farbe</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLabel" name="color">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>Mehr...</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLabel" name="info">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QToolButton" name="prev_button">
+       <property name="text">
+        <string>Prev.</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="next_button">
+       <property name="text">
+        <string>Next</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close|QDialogButtonBox::Retry</set>
+       </property>
+       <property name="centerButtons">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/resources/_ui/pokewindow.ui

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1687</width>
-    <height>991</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Gotta catch 'em all!</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="2">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Random</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QComboBox" name="comboBox_2"/>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="comboBox"/>
-   </item>
-   <item row="0" column="4">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="5">
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QTableWidget" name="tableWidget_2">
-      <property name="editTriggers">
-       <set>QAbstractItemView::NoEditTriggers</set>
-      </property>
-      <property name="alternatingRowColors">
-       <bool>true</bool>
-      </property>
-      <property name="selectionMode">
-       <enum>QAbstractItemView::SingleSelection</enum>
-      </property>
-      <property name="selectionBehavior">
-       <enum>QAbstractItemView::SelectRows</enum>
-      </property>
-      <property name="showGrid">
-       <bool>false</bool>
-      </property>
-      <property name="gridStyle">
-       <enum>Qt::NoPen</enum>
-      </property>
-      <property name="sortingEnabled">
-       <bool>true</bool>
-      </property>
-      <attribute name="horizontalHeaderDefaultSectionSize">
-       <number>80</number>
-      </attribute>
-      <attribute name="horizontalHeaderStretchLastSection">
-       <bool>false</bool>
-      </attribute>
-      <attribute name="verticalHeaderVisible">
-       <bool>false</bool>
-      </attribute>
-      <column>
-       <property name="text">
-        <string>#</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Pokemon</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Type</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Total</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>HP</string>
-       </property>
-       <property name="toolTip">
-        <string>Hit Points; Kraftpunkte</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Attack</string>
-       </property>
-       <property name="toolTip">
-        <string>Attacke</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Defense</string>
-       </property>
-       <property name="toolTip">
-        <string>Verteidigung</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Sp. Attack</string>
-       </property>
-       <property name="toolTip">
-        <string>Special Attack; Spezial-Attacke</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Sp. Defense</string>
-       </property>
-       <property name="toolTip">
-        <string>Special Defense; Spezial-Verteidigung</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Speed</string>
-       </property>
-       <property name="toolTip">
-        <string>Initiative</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Height</string>
-       </property>
-       <property name="toolTip">
-        <string>Größe</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Weight</string>
-       </property>
-       <property name="toolTip">
-        <string>Gewicht</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>BMI</string>
-       </property>
-       <property name="toolTip">
-        <string>Body-Mass-Index</string>
-       </property>
-      </column>
-     </widget>
-     <widget class="QTabWidget" name="tabWidget">
-      <property name="minimumSize">
-       <size>
-        <width>418</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="currentIndex">
-       <number>-1</number>
-      </property>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>Dialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>762</x>
-     <y>969</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>762</x>
-     <y>495</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

src/resources/_ui/ptstab.ui

@@ -6,25 +6,27 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>417</width>
+    <width>316</width>
-    <height>746</height>
+    <height>747</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
-   <item row="0" column="0" colspan="2">
+   <property name="leftMargin">
-    <widget class="QLabel" name="label_2">
+    <number>3</number>
-     <property name="text">
-      <string>Selected points and regions</string>
    </property>
-     <property name="buddy">
+   <property name="topMargin">
-      <cstring>peaktable</cstring>
+    <number>3</number>
    </property>
-    </widget>
+   <property name="rightMargin">
-   </item>
+    <number>3</number>
-   <item row="1" column="0" colspan="2">
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
+   </property>
+   <item>
     <widget class="QListWidget" name="peaktable">
      <property name="toolTip">
       <string>Edit by entering new value: 
@@ -37,18 +39,110 @@ Changing between regions and points is NOT possible</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item>
-    <widget class="QCheckBox" name="special_checkbox">
+    <widget class="QGroupBox" name="groupBox">
-     <property name="text">
+     <property name="title">
-      <string>Use special value</string>
+      <string>Average</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="QSpinBox" name="left_pt">
+        <property name="suffix">
+         <string> pts</string>
+        </property>
+        <property name="prefix">
+         <string>- </string>
+        </property>
+        <property name="maximum">
+         <number>999</number>
         </property>
        </widget>
       </item>
-   <item row="3" column="1">
+      <item>
-    <widget class="QComboBox" name="special_comboBox">
+       <widget class="QSpinBox" name="right_pt">
-     <property name="enabled">
+        <property name="suffix">
+         <string> pts</string>
+        </property>
+        <property name="prefix">
+         <string>+ </string>
+        </property>
+        <property name="maximum">
+         <number>999</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="average_combobox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name="text">
+          <string>Mean</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Sum</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Integral</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Special value</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <property name="checked">
       <bool>false</bool>
      </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="QComboBox" name="special_comboBox">
         <property name="toolTip">
          <string>Automatic selection of respective points</string>
         </property>
@@ -74,113 +168,38 @@ Changing between regions and points is NOT possible</string>
         </item>
        </widget>
       </item>
-   <item row="4" column="0">
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Preferred</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>30</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Region around points</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLineEdit" name="left_limit"/>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="right_limit"/>
-     </item>
-     <item>
-      <widget class="QComboBox" name="limit_combobox">
-       <item>
-        <property name="text">
-         <string>points</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>range</string>
-        </property>
-       </item>
-      </widget>
-     </item>
      </layout>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Aggregation</string>
-     </property>
-     <property name="buddy">
-      <cstring>average_combobox</cstring>
-     </property>
     </widget>
    </item>
-   <item row="6" column="1">
-    <widget class="QComboBox" name="average_combobox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
    <item>
-      <property name="text">
+    <widget class="QGroupBox" name="groupBox_3">
-       <string>Mean</string>
+     <property name="title">
+      <string>Result</string>
      </property>
-     </item>
+     <layout class="QGridLayout" name="gridLayout">
-     <item>
+      <property name="leftMargin">
-      <property name="text">
+       <number>3</number>
-       <string>Sum</string>
       </property>
-     </item>
+      <property name="topMargin">
-     <item>
+       <number>3</number>
-      <property name="text">
-       <string>Integral</string>
       </property>
-     </item>
+      <property name="rightMargin">
-     <item>
+       <number>3</number>
-      <property name="text">
-       <string>Std. deviation</string>
       </property>
-     </item>
+      <property name="bottomMargin">
-    </widget>
+       <number>3</number>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>New set based on</string>
       </property>
-     <property name="buddy">
+      <property name="spacing">
-      <cstring>xbutton</cstring>
+       <number>3</number>
       </property>
-    </widget>
+      <item row="0" column="0">
-   </item>
-   <item row="7" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
        <widget class="QCheckBox" name="xbutton">
         <property name="text">
          <string>x</string>
         </property>
        </widget>
       </item>
-     <item>
+      <item row="0" column="1">
        <widget class="QCheckBox" name="ybutton">
         <property name="text">
          <string>y</string>
@@ -190,49 +209,7 @@ Changing between regions and points is NOT possible</string>
         </property>
        </widget>
       </item>
-    </layout>
+      <item row="1" column="0">
-   </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Group by</string>
-     </property>
-     <property name="buddy">
-      <cstring>group_box</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
-    <widget class="QComboBox" name="group_box">
-     <item>
-      <property name="text">
-       <string>&quot;Group&quot; value</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>x value</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="9" column="0">
-    <spacer name="verticalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Preferred</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="10" column="0">
        <widget class="QCheckBox" name="graph_checkbox">
         <property name="text">
          <string>New graph?</string>
@@ -242,30 +219,25 @@ Changing between regions and points is NOT possible</string>
         </property>
        </widget>
       </item>
-   <item row="10" column="1">
+      <item row="1" column="1">
        <widget class="QComboBox" name="graph_combobox">
         <property name="enabled">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-   <item row="12" column="0">
+     </layout>
-    <spacer name="verticalSpacer">
+    </widget>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
    </item>
-   <item row="11" column="0" colspan="2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="spacing">
+      <number>2</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <item>
       <widget class="QPushButton" name="okButton">
        <property name="text">
         <string>Apply</string>
@@ -276,10 +248,10 @@ Changing between regions and points is NOT possible</string>
        </property>
       </widget>
      </item>
-   <item row="2" column="0" colspan="2">
+     <item>
       <widget class="QPushButton" name="deleteButton">
        <property name="text">
-      <string>Delete selection</string>
+        <string>Delete selected</string>
        </property>
        <property name="icon">
         <iconset theme="dialog-cancel">
@@ -288,17 +260,9 @@ Changing between regions and points is NOT possible</string>
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
- <tabstops>
-  <tabstop>peaktable</tabstop>
-  <tabstop>limit_combobox</tabstop>
-  <tabstop>average_combobox</tabstop>
-  <tabstop>xbutton</tabstop>
-  <tabstop>ybutton</tabstop>
-  <tabstop>group_box</tabstop>
-  <tabstop>graph_checkbox</tabstop>
-  <tabstop>graph_combobox</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>