Merge remote-tracking branch 'origin/gga_relaxation' into gga_relaxation

add basic Generalized Gamma for alpha relaxation
plot sub-functions; fixes #282
2024-09-07 19:21:01 +02:00 · 2024-09-07 19:20:32 +02:00 · 2024-09-07 19:19:02 +02:00 · 2024-09-05 18:16:27 +02:00 · 2024-01-13 16:21:19 +01:00 · 2024-01-09 14:20:20 +01:00
28 changed files with 554 additions and 858 deletions
--- a/src/gui_qt/_py/asciidialog.py
+++ b/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"))
--- a/src/gui_qt/_py/basewindow.py
+++ b/src/gui_qt/_py/basewindow.py
@ -372,8 +372,6 @@ class Ui_BaseWindow(object):
        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)
@ -401,7 +399,6 @@ class Ui_BaseWindow(object):
        self.menuData.addAction(self.menuCut_to_visible_range.menuAction())
        self.menuData.addSeparator()
        self.menuData.addAction(self.actionChange_datatypes)
        self.menuData.addAction(self.actionUse_script)
        self.menuHelp.addAction(self.actionShow_error_log)
        self.menuHelp.addAction(self.actionUpdate)
        self.menuHelp.addAction(self.actionBugs)
@ -650,7 +647,6 @@ class Ui_BaseWindow(object):
        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
--- a/src/gui_qt/_py/pokeentry.py
+++ b/src/gui_qt/_py/pokeentry.py
@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file './nmreval/src/resources/_ui/pokeentry.ui'
+# Form implementation generated from reading ui file 'untitled2.ui'
 #
 # Created by: PyQt5 UI code generator 5.15.10
 #
@ -21,26 +21,13 @@ class Ui_Form(object):
        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.gridLayout = QtWidgets.QGridLayout()
-        self.formLayout.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout.setVerticalSpacing(12)
-        self.formLayout.setVerticalSpacing(12)
+        self.gridLayout.setObjectName("gridLayout")
        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.gridLayout.addWidget(self.label_4, 2, 0, 1, 1)
        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
        self.verticalLayout_2.setObjectName("verticalLayout_2")
        self.type1_label = QtWidgets.QLabel(Form)
@ -49,11 +36,24 @@ class Ui_Form(object):
        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.gridLayout.addLayout(self.verticalLayout_2, 2, 1, 1, 1)
-        self.label_5 = QtWidgets.QLabel(Form)
+        self.label_3 = QtWidgets.QLabel(Form)
-        self.label_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.label_3.setObjectName("label_3")
-        self.label_5.setObjectName("label_5")
+        self.gridLayout.addWidget(self.label_3, 5, 0, 1, 1)
-        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
        self.gridLayout.addItem(spacerItem, 7, 0, 1, 1)
        self.label_2 = QtWidgets.QLabel(Form)
        self.label_2.setObjectName("label_2")
        self.gridLayout.addWidget(self.label_2, 4, 0, 1, 1)
        self.height_label = QtWidgets.QLabel(Form)
        self.height_label.setObjectName("height_label")
        self.gridLayout.addWidget(self.height_label, 4, 1, 1, 1)
        self.weight_label = QtWidgets.QLabel(Form)
        self.weight_label.setObjectName("weight_label")
        self.gridLayout.addWidget(self.weight_label, 5, 1, 1, 1)
        self.label_1 = QtWidgets.QLabel(Form)
        self.label_1.setObjectName("label_1")
        self.gridLayout.addWidget(self.label_1, 1, 0, 1, 1)
        self.verticalLayout = QtWidgets.QVBoxLayout()
        self.verticalLayout.setObjectName("verticalLayout")
        self.ability1_label = QtWidgets.QLabel(Form)
@ -65,23 +65,24 @@ class Ui_Form(object):
        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.gridLayout.addLayout(self.verticalLayout, 3, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(Form)
+        self.species_label = QtWidgets.QLabel(Form)
-        self.label_2.setObjectName("label_2")
+        self.species_label.setObjectName("species_label")
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_2)
+        self.gridLayout.addWidget(self.species_label, 1, 1, 1, 1)
-        self.height_label = QtWidgets.QLabel(Form)
+        self.label_5 = QtWidgets.QLabel(Form)
-        self.height_label.setObjectName("height_label")
+        self.label_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.height_label)
+        self.label_5.setObjectName("label_5")
-        self.label_3 = QtWidgets.QLabel(Form)
+        self.gridLayout.addWidget(self.label_5, 3, 0, 1, 1)
        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.gridLayout.addWidget(self.gender_label, 6, 0, 1, 2)
-        self.verticalLayout_4.addLayout(self.formLayout)
+        self.label = QtWidgets.QLabel(Form)
        self.label.setObjectName("label")
        self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
        self.nationaldex_label = QtWidgets.QLabel(Form)
        self.nationaldex_label.setObjectName("nationaldex_label")
        self.gridLayout.addWidget(self.nationaldex_label, 0, 1, 1, 1)
        self.verticalLayout_4.addLayout(self.gridLayout)
        self.groupBox = QtWidgets.QGroupBox(Form)
        self.groupBox.setFlat(True)
        self.groupBox.setObjectName("groupBox")
@ -205,21 +206,13 @@ class Ui_Form(object):
        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.evolution_bar = QtWidgets.QLabel(self.groupBox_2)
-        self.tableWidget.setStyleSheet("background-color: transparent;")
+        self.evolution_bar.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.evolution_bar.setFrameShadow(QtWidgets.QFrame.Raised)
-        self.tableWidget.setShowGrid(False)
+        self.evolution_bar.setLineWidth(0)
-        self.tableWidget.setGridStyle(QtCore.Qt.NoPen)
+        self.evolution_bar.setObjectName("evolution_bar")
-        self.tableWidget.setWordWrap(False)
+        self.verticalLayout_3.addWidget(self.evolution_bar)
        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)
@ -228,22 +221,22 @@ class Ui_Form(object):
        _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.label_3.setText(_translate("Form", "Weight"))
        self.label_2.setText(_translate("Form", "Height"))
        self.height_label.setText(_translate("Form", "0.0 m"))
        self.weight_label.setText(_translate("Form", "0.0 kg"))
        self.label_1.setText(_translate("Form", "Species"))
        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.species_label.setText(_translate("Form", "TextLabel"))
-        self.height_label.setText(_translate("Form", "0.0 m"))
+        self.label_5.setText(_translate("Form", "Abilities"))
        self.label_3.setText(_translate("Form", "Weight"))
        self.weight_label.setText(_translate("Form", "0.0 kg"))
        self.gender_label.setText(_translate("Form", "TextLabel"))
        self.label.setText(_translate("Form", "National No."))
        self.nationaldex_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"))
@ -258,3 +251,4 @@ class Ui_Form(object):
        self.label_7.setText(_translate("Form", "Attack"))
        self.label_9.setText(_translate("Form", "Defense"))
        self.groupBox_2.setTitle(_translate("Form", "Evolution chain"))
        self.evolution_bar.setText(_translate("Form", "TextLabel"))
--- a/src/gui_qt/_py/pokewindow.py
+++ b/src/gui_qt/_py/pokewindow.py
@ -14,29 +14,15 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
    def setupUi(self, Dialog):
        Dialog.setObjectName("Dialog")
-        Dialog.resize(1687, 991)
+        Dialog.resize(1526, 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.comboBox_2 = QtWidgets.QComboBox(Dialog)
-        self.gridLayout.addItem(spacerItem, 0, 4, 1, 1)
+        self.comboBox_2.setObjectName("comboBox_2")
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.gridLayout.addWidget(self.comboBox_2, 0, 0, 1, 1)
        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")
@ -80,9 +66,12 @@ class Ui_Dialog(object):
        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.gridLayout.addWidget(self.splitter, 2, 0, 1, 2)
        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close)
        self.buttonBox.setObjectName("buttonBox")
        self.gridLayout.addWidget(self.buttonBox, 3, 0, 1, 2)
        self.retranslateUi(Dialog)
        self.tabWidget.setCurrentIndex(-1)
@ -92,7 +81,6 @@ class Ui_Dialog(object):
    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", "#"))
--- a/src/gui_qt/_py/ptstab.py
+++ b/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"))
--- a/src/gui_qt/data/point_select.py
+++ b/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()
--- a/src/gui_qt/editors/init.py
+++ b/src/gui_qt/editors/init.py
--- a/src/gui_qt/editors/script_editor.py
+++ b/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())
--- a/src/gui_qt/fit/fit_parameter.py
+++ b/src/gui_qt/fit/fit_parameter.py
@ -12,13 +12,12 @@ from ..lib.forms import SelectionWidget
 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 = []
@ -302,10 +301,8 @@ class ParameterSingleWidget(QtWidgets.QWidget):
        self.name = name
        self.parametername.setText(convert(name))
-        self.parametername.setToolTip(
+        self.parametername.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)
--- a/src/gui_qt/fit/fitwindow.py
+++ b/src/gui_qt/fit/fitwindow.py
@ -77,12 +77,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 +104,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)
@ -210,7 +206,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)
--- a/src/gui_qt/fit/function_creation_dialog.py
+++ b/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']
--- a/src/gui_qt/graphs/graphwindow.py
+++ b/src/gui_qt/graphs/graphwindow.py
@ -539,10 +539,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]:
@ -858,7 +854,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])
--- a/src/gui_qt/io/fcbatchreader.py
+++ b/src/gui_qt/io/fcbatchreader.py
@ -88,6 +88,7 @@ class QFCReader(QtWidgets.QDialog, Ui_FCEval_dialog):
    def accept(self):
        items = [self.listWidget.item(i).text() for i in range(self.listWidget.count())]
        print(items)
        if items:
            with busy_cursor():
                self.read(items)
--- a/src/gui_qt/editors/codeeditor.py
+++ b/src/gui_qt/editors/codeeditor.py
@ -187,10 +187,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 +225,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 +237,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 +252,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)
--- a/src/gui_qt/lib/logger.py
+++ b/src/gui_qt/lib/logger.py
@ -3,7 +3,7 @@ from pathlib import Path
 from PyQt5 import QtWidgets
-from ..editors.codeeditor import _make_textformats
+from .codeeditor import _make_textformats
 from ..Qt import QtWidgets, QtCore, QtGui
 from nmreval.configs import config_paths
--- a/src/gui_qt/lib/namespace.py
+++ b/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_
@ -30,7 +28,6 @@ class Namespace:
                    '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'),
            )
--- a/src/gui_qt/lib/pokemon.py
+++ b/src/gui_qt/lib/pokemon.py
@ -3,10 +3,8 @@ import urllib.request
 from functools import cache
 from PyQt5 import QtWidgets, QtGui, QtCore
-from numpy.random import randint
+from .._py.pokewindow import Ui_Dialog
-
+from .._py.pokeentry import Ui_Form
 from gui_qt._py.pokewindow import Ui_Dialog
 from gui_qt._py.pokeentry import Ui_Form
 def get_connection(db):
@ -39,8 +37,6 @@ class QPoke(QtWidgets.QDialog, Ui_Dialog):
        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):
@ -153,15 +149,12 @@ class QPoke(QtWidgets.QDialog, Ui_Dialog):
        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']
@ -188,7 +181,7 @@ class QPoke(QtWidgets.QDialog, Ui_Dialog):
                    type_en.append(t_en)
                    type_de.append(t_de)
-            item = QtWidgets.QTableWidgetItem(' / '.join(type_en))
+            item = QtWidgets.QTableWidgetItem('\n'.join(type_en))
            item.setToolTip('\n'.join(type_en))
            self.tableWidget_2.setItem(row, 2, item)
@ -222,20 +215,11 @@ class QPoke(QtWidgets.QDialog, Ui_Dialog):
            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):
+    def show_pokemon(self):
-        select = randint(0, self.tableWidget_2.rowCount())
+        table = self.sender()
-        self.show_pokemon(select)
+        row = table.currentRow()
-
+        poke_id = table.item(row, 0).data(QtCore.Qt.ItemDataRole.UserRole)
    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)
@ -243,7 +227,7 @@ class QPoke(QtWidgets.QDialog, Ui_Dialog):
        cursor.execute(
            'SELECT p.id FROM pokemon p WHERE p.species_id = ?',
-            (species_id,)
+            (poke_id,)
        )
        pokemon = cursor.fetchall()
@ -253,14 +237,9 @@ class QPoke(QtWidgets.QDialog, Ui_Dialog):
        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]), '')
@ -268,13 +247,12 @@ class QPoke(QtWidgets.QDialog, Ui_Dialog):
            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):
+    def __init__(self, pokemon_id, parent=None):
        super().__init__(parent=parent)
        self.setupUi(self)
@ -297,7 +275,7 @@ class PokemonEntry(QtWidgets.QWidget, Ui_Form):
        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")
+        self.weight_label.setText(f"{pokemon['weight']} kg")
        if species['gender_ratio'] == -1:
            gender = "Gender unknown"
@ -348,23 +326,10 @@ class PokemonEntry(QtWidgets.QWidget, Ui_Form):
            self.type_labels[slot].setToolTip(QPoke.types[type_id][0])
        evolutions = self.make_evolution(pokemon['evolution_id'])
-
+        evo_text = []
-        self.tableWidget.clear()
+        for e in evolutions:
-        self.tableWidget.setColumnCount(4)
+            evo_text.append(f'{e[0]} (#{e[1]:04d}) to {e[2]} (#{e[3]:04d}) \t\t ({e[4]})')
-        self.tableWidget.setRowCount(len(evolutions))
+        self.evolution_bar.setText('<br>'.join(evo_text))
        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']
@ -473,6 +438,7 @@ class PokemonEntry(QtWidgets.QWidget, Ui_Form):
        return form, types
    @cache
    def make_evolution(self, poke_id: int):
        steps = []
@ -482,7 +448,6 @@ class PokemonEntry(QtWidgets.QWidget, Ui_Form):
        cursor.execute('SELECT * FROM evolution_names WHERE id = ?', (poke_id,))
        chain = cursor.fetchall()
        conn.close()
        trigger_texts = [
            None,
@ -532,6 +497,7 @@ class PokemonEntry(QtWidgets.QWidget, Ui_Form):
        }
        for c in chain:
            lvl0 = c["name_en"]
            if c['gender'] == 1:
                lvl0 += ' (female)'
@ -553,4 +519,17 @@ class PokemonEntry(QtWidgets.QWidget, Ui_Form):
                (lvl0, c['evolves_from'], c['evolve_en'], c['species_id'], ', '.join(filter(lambda x: x, level_text)))
            )
        conn.close()
        return steps
 if __name__ == '__main__':
    app = QtWidgets.QApplication([])
    sourcedb = 'pokemon.sqlite'
    w = QPoke(sourcedb)
    w.show()
    app.exec()
--- a/src/gui_qt/editors/usermodeleditor.py
+++ b/src/gui_qt/editors/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 EditorWidget
 class QUsermodelEditor(QtWidgets.QMainWindow):
@ -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:
-            with self.fname.open('r') as f:
+            self.edit_field.setPlainText(f.read())
                self.edit_field.setPlainText(f.read())
    def set_fname_opts(self, fname: str | Path):
-        fname = Path(fname)
+        self.fname = Path(fname)
-        if fname.is_file():
+        self._dir = self.fname.parent
-            self.fname = Path(fname)
+        self.setWindowTitle('Edit ' + str(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)
--- a/src/gui_qt/main/mainwindow.py
+++ b/src/gui_qt/main/mainwindow.py
@ -677,10 +677,9 @@ 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())
            self.management.skip_points(**dial.get_arguments())
    @QtCore.pyqtSlot(name='on_action_coup_calc_triggered')
    def coupling_dialog(self):
@ -985,21 +984,13 @@ 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.show()
    @QtCore.pyqtSlot(name='on_actionUse_script_triggered')
    def open_editor(self):
        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:
--- a/src/gui_qt/main/management.py
+++ b/src/gui_qt/main/management.py
@ -791,27 +791,16 @@ 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]
            if data_i.group not in new_datasets:
                new_datasets[data_i.group] = [], []
            new_x_axis, _temp = new_datasets[data_i.group]
            pts = data_i.points(params)
-
+            if pts:
-            if groupby == 'group':
+                new_x_axis.append(data_i.value)
-                if data_i.group not in new_datasets:
+                _temp.append(pts)
                    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]])
        key_list = []
        for label, (new_x_axis, _temp) in new_datasets.items():
@ -1044,7 +1033,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 +1067,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 +1099,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())
--- a/src/nmreval/data/points.py
+++ b/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,8 +313,8 @@ 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 = []
@ -395,10 +388,6 @@ class Points:
            y_mean = simpson(y[left:right].real, x=x[left:right])
            y_err_mean = np.linalg.norm(cumulative_trapezoid(y_err[left:right].real, x=x[left:right]))
        elif mode == 'std':
            y_mean = np.std(y[left:right])
            y_err_mean = 0.
        else:
            y_mean = y[idx].real
            y_err_mean = y_err[idx]
--- a/src/nmreval/distributions/energy.py
+++ b/src/nmreval/distributions/energy.py
@ -95,7 +95,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 +111,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])
--- a/src/nmreval/models/transitions.py
+++ b/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
--- a/src/resources/_ui/asciidialog.ui
+++ b/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>
--- a/src/resources/_ui/basewindow.ui
+++ b/src/resources/_ui/basewindow.ui
@ -192,7 +192,6 @@
    <addaction name="menuCut_to_visible_range"/>
    <addaction name="separator"/>
    <addaction name="actionChange_datatypes"/>
    <addaction name="actionUse_script"/>
   </widget>
   <widget class="QMenu" name="menuHelp">
    <property name="title">
@ -1050,11 +1049,6 @@
    <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>
--- a/src/resources/_ui/pokeentry.ui
+++ b/src/resources/_ui/pokeentry.ui
@ -25,50 +25,10 @@
    </widget>
   </item>
   <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
     <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">
@ -97,13 +57,51 @@
       </item>
      </layout>
     </item>
-     <item row="3" column="0">
+     <item row="5" column="0">
-      <widget class="QLabel" name="label_5">
+      <widget class="QLabel" name="label_3">
       <property name="text">
-        <string>Abilities</string>
+        <string>Weight</string>
       </property>
-       <property name="alignment">
+      </widget>
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </item>
     <item row="7" column="0">
      <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>
     <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="1">
      <widget class="QLabel" name="weight_label">
       <property name="text">
        <string>0.0 kg</string>
       </property>
      </widget>
     </item>
     <item row="1" column="0">
      <widget class="QLabel" name="label_1">
       <property name="text">
        <string>Species</string>
       </property>
      </widget>
     </item>
@ -132,41 +130,44 @@
       </item>
      </layout>
     </item>
-     <item row="4" column="0">
+     <item row="1" column="1">
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="species_label">
       <property name="text">
-        <string>Height</string>
+        <string>TextLabel</string>
       </property>
      </widget>
     </item>
-     <item row="4" column="1">
+     <item row="3" column="0">
-      <widget class="QLabel" name="height_label">
+      <widget class="QLabel" name="label_5">
       <property name="text">
-        <string>0.0 m</string>
+        <string>Abilities</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
       </property>
      </widget>
     </item>
-     <item row="5" column="0">
+     <item row="6" column="0" colspan="2">
      <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>
     <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>
    </layout>
   </item>
   <item>
@ -413,46 +414,24 @@ QProgressBar::chunk {
       <number>3</number>
      </property>
      <item>
-       <widget class="QTableWidget" name="tableWidget">
+       <widget class="QLabel" name="evolution_bar">
-        <property name="styleSheet">
+        <property name="frameShape">
-         <string notr="true">background-color: transparent;</string>
+         <enum>QFrame::NoFrame</enum>
        </property>
-        <property name="editTriggers">
+        <property name="frameShadow">
-         <set>QAbstractItemView::NoEditTriggers</set>
+         <enum>QFrame::Raised</enum>
        </property>
-        <property name="showGrid">
+        <property name="lineWidth">
-         <bool>false</bool>
+         <number>0</number>
        </property>
-        <property name="gridStyle">
+        <property name="text">
-         <enum>Qt::NoPen</enum>
+         <string>TextLabel</string>
        </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/>
--- a/src/resources/_ui/pokewindow.ui
+++ b/src/resources/_ui/pokewindow.ui
@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>1687</width>
+    <width>1526</width>
    <height>991</height>
   </rect>
  </property>
@ -14,46 +14,13 @@
   <string>Gotta catch 'em all!</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="2">
+   <item row="0" column="1">
-    <widget class="QPushButton" name="pushButton">
+    <widget class="QComboBox" name="comboBox"/>
     <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">
+   <item row="2" column="0" colspan="2">
    <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>
@ -183,18 +150,19 @@
      </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>
   <item row="3" column="0" colspan="2">
    <widget class="QDialogButtonBox" name="buttonBox">
     <property name="standardButtons">
      <set>QDialogButtonBox::Close</set>
     </property>
    </widget>
   </item>
  </layout>
 </widget>
 <resources/>
--- a/src/resources/_ui/ptstab.ui
+++ b/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">
+   </property>
-      <string>Selected points and regions</string>
+   <property name="topMargin">
-     </property>
+    <number>3</number>
-     <property name="buddy">
+   </property>
-      <cstring>peaktable</cstring>
+   <property name="rightMargin">
-     </property>
+    <number>3</number>
-    </widget>
+   </property>
-   </item>
+   <property name="bottomMargin">
-   <item row="1" column="0" colspan="2">
+    <number>3</number>
   </property>
   <item>
    <widget class="QListWidget" name="peaktable">
     <property name="toolTip">
      <string>Edit by entering new value: 
@ -37,268 +39,230 @@ 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>
-    </widget>
+     <layout class="QHBoxLayout" name="horizontalLayout">
-   </item>
+      <property name="spacing">
-   <item row="3" column="1">
+       <number>3</number>
    <widget class="QComboBox" name="special_comboBox">
     <property name="enabled">
      <bool>false</bool>
     </property>
     <property name="toolTip">
      <string>Automatic selection of respective points</string>
     </property>
     <item>
      <property name="text">
       <string>max(y)</string>
      </property>
-     </item>
+      <property name="leftMargin">
-     <item>
+       <number>3</number>
      <property name="text">
       <string>max(abs(y))</string>
      </property>
-     </item>
+      <property name="topMargin">
-     <item>
+       <number>3</number>
      <property name="text">
       <string>min(y)</string>
      </property>
-     </item>
+      <property name="rightMargin">
-     <item>
+       <number>3</number>
      <property name="text">
       <string>min(abs(y))</string>
      </property>
-     </item>
+      <property name="bottomMargin">
-    </widget>
+       <number>3</number>
-   </item>
+      </property>
-   <item row="4" column="0">
+      <item>
-    <spacer name="verticalSpacer_2">
+       <widget class="QSpinBox" name="left_pt">
-     <property name="orientation">
+        <property name="suffix">
-      <enum>Qt::Vertical</enum>
+         <string> pts</string>
     </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>
+        <property name="prefix">
-       <item>
+         <string>- </string>
        <property name="text">
         <string>range</string>
        </property>
-       </item>
+        <property name="maximum">
-      </widget>
+         <number>999</number>
-     </item>
+        </property>
-    </layout>
+       </widget>
-   </item>
+      </item>
-   <item row="6" column="0">
+      <item>
-    <widget class="QLabel" name="label_5">
+       <widget class="QSpinBox" name="right_pt">
-     <property name="text">
+        <property name="suffix">
-      <string>Aggregation</string>
+         <string> pts</string>
-     </property>
+        </property>
-     <property name="buddy">
+        <property name="prefix">
-      <cstring>average_combobox</cstring>
+         <string>+ </string>
-     </property>
+        </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 row="6" column="1">
+   <item>
-    <widget class="QComboBox" name="average_combobox">
+    <widget class="QGroupBox" name="groupBox_2">
-     <property name="sizePolicy">
+     <property name="title">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+      <string>Special value</string>
       <horstretch>0</horstretch>
       <verstretch>0</verstretch>
      </sizepolicy>
     </property>
-     <item>
+     <property name="checkable">
      <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>
     <item>
      <property name="text">
       <string>Std. deviation</string>
      </property>
     </item>
    </widget>
   </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">
      <cstring>xbutton</cstring>
     </property>
    </widget>
   </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>
      <widget class="QCheckBox" name="ybutton">
       <property name="text">
        <string>y</string>
       </property>
       <property name="checked">
        <bool>true</bool>
       </property>
      </widget>
     </item>
    </layout>
   </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>
     </property>
     <property name="checked">
      <bool>true</bool>
     </property>
-    </widget>
+     <property name="checked">
   </item>
   <item row="10" column="1">
    <widget class="QComboBox" name="graph_combobox">
     <property name="enabled">
      <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>
        <item>
         <property name="text">
          <string>max(y)</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>max(abs(y))</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>min(y)</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>min(abs(y))</string>
         </property>
        </item>
       </widget>
      </item>
     </layout>
    </widget>
   </item>
-   <item row="12" column="0">
+   <item>
-    <spacer name="verticalSpacer">
+    <widget class="QGroupBox" name="groupBox_3">
-     <property name="orientation">
+     <property name="title">
-      <enum>Qt::Vertical</enum>
+      <string>Result</string>
     </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">
    <widget class="QPushButton" name="okButton">
     <property name="text">
      <string>Apply</string>
     </property>
     <property name="icon">
      <iconset theme="dialog-ok">
       <normaloff>.</normaloff>.</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout">
      <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="0" column="0">
       <widget class="QCheckBox" name="xbutton">
        <property name="text">
         <string>x</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QCheckBox" name="ybutton">
        <property name="text">
         <string>y</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QCheckBox" name="graph_checkbox">
        <property name="text">
         <string>New graph?</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QComboBox" name="graph_combobox">
        <property name="enabled">
         <bool>false</bool>
        </property>
       </widget>
      </item>
     </layout>
    </widget>
   </item>
-   <item row="2" column="0" colspan="2">
+   <item>
-    <widget class="QPushButton" name="deleteButton">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="text">
+     <property name="spacing">
-      <string>Delete selection</string>
+      <number>2</number>
     </property>
-     <property name="icon">
+     <property name="topMargin">
-      <iconset theme="dialog-cancel">
+      <number>0</number>
       <normaloff>.</normaloff>.</iconset>
     </property>
-    </widget>
+     <item>
      <widget class="QPushButton" name="okButton">
       <property name="text">
        <string>Apply</string>
       </property>
       <property name="icon">
        <iconset theme="dialog-ok">
         <normaloff>.</normaloff>.</iconset>
       </property>
      </widget>
     </item>
     <item>
      <widget class="QPushButton" name="deleteButton">
       <property name="text">
        <string>Delete selected</string>
       </property>
       <property name="icon">
        <iconset theme="dialog-cancel">
         <normaloff>.</normaloff>.</iconset>
       </property>
      </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>
Author	SHA1	Message	Date
Dominik Demuth	7fe89eff7f	Merge remote-tracking branch 'origin/gga_relaxation' into gga_relaxation	2024-09-07 19:21:01 +02:00
Dominik Demuth	f94f78893c	add basic Generalized Gamma for alpha relaxation	2024-09-07 19:20:32 +02:00
Dominik Demuth	fda3257424	plot sub-functions; fixes #282	2024-09-07 19:19:02 +02:00
Dominik Demuth	f30ff3b758	Merge remote-tracking branch 'origin/master' into gga_relaxation	2024-09-05 18:16:27 +02:00
Dominik Demuth	749a78b550	add to clib	2024-01-13 16:21:19 +01:00
Dominik Demuth	50a811b7ec	calculate t1 for generalized gamma	2024-01-09 14:20:20 +01:00