interim save

AppImageBuilder.yml

@@ -12,7 +12,7 @@ script:
   # Copy the python application code into the AppDir
   - cp bin/evaluate.py  $TARGET_APPDIR/usr/bin/
   - cp -r src/*  $TARGET_APPDIR/usr/src/
-  - cp src/pkm.vogel.nmreval.desktop $TARGET_APPDIR/usr/share/applications
+  - cp src/resources/pkm.vogel.nmreval.desktop $TARGET_APPDIR/usr/share/applications
   # set current date as version info
   - sed -i "s/CURRENT_DATE/$(date +'%Y-%m-%d')/" $TARGET_APPDIR/usr/src/nmreval/version.py
 

src/gui_qt/_py/tnmh_dialog.py

@@ -11,59 +11,44 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 
-class Ui_Dialog(object):
+class Ui_Wizard(object):
-    def setupUi(self, Dialog):
+    def setupUi(self, Wizard):
-        Dialog.setObjectName("Dialog")
+        Wizard.setObjectName("Wizard")
-        Dialog.resize(1094, 829)
+        Wizard.resize(854, 619)
-        self.gridLayout = QtWidgets.QGridLayout(Dialog)
+        self.wizardPage1 = QtWidgets.QWizardPage()
+        self.wizardPage1.setObjectName("wizardPage1")
+        self.gridLayout = QtWidgets.QGridLayout(self.wizardPage1)
         self.gridLayout.setObjectName("gridLayout")
-        self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+        self.treeWidget = QtWidgets.QTreeWidget(self.wizardPage1)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.treeWidget.setObjectName("treeWidget")
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close)
+        self.treeWidget.headerItem().setText(0, "1")
-        self.buttonBox.setObjectName("buttonBox")
+        self.treeWidget.header().setVisible(False)
-        self.gridLayout.addWidget(self.buttonBox, 5, 1, 1, 1)
+        self.gridLayout.addWidget(self.treeWidget, 2, 0, 1, 1)
-        self.verticalLayout = QtWidgets.QVBoxLayout()
+        self.gridLayout_9 = QtWidgets.QGridLayout()
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.gridLayout_9.setObjectName("gridLayout_9")
-        self.listWidget = QtWidgets.QListWidget(Dialog)
+        self.tg_export_check = QtWidgets.QCheckBox(self.wizardPage1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Expanding)
+        self.tg_export_check.setChecked(True)
-        sizePolicy.setHorizontalStretch(0)
+        self.tg_export_check.setObjectName("tg_export_check")
-        sizePolicy.setVerticalStretch(0)
+        self.gridLayout_9.addWidget(self.tg_export_check, 0, 0, 1, 1)
-        sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.listWidget.setSizePolicy(sizePolicy)
+        self.gridLayout_9.addItem(spacerItem, 3, 0, 1, 1)
-        self.listWidget.setObjectName("listWidget")
+        self.tglines_export_check = QtWidgets.QCheckBox(self.wizardPage1)
-        self.verticalLayout.addWidget(self.listWidget)
+        self.tglines_export_check.setChecked(True)
-        self.label = QtWidgets.QLabel(Dialog)
+        self.tglines_export_check.setObjectName("tglines_export_check")
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        self.gridLayout_9.addWidget(self.tglines_export_check, 0, 1, 1, 1)
-        sizePolicy.setHorizontalStretch(0)
+        self.pushButton = QtWidgets.QPushButton(self.wizardPage1)
-        sizePolicy.setVerticalStretch(0)
+        self.pushButton.setObjectName("pushButton")
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.gridLayout_9.addWidget(self.pushButton, 2, 0, 1, 2)
-        self.label.setSizePolicy(sizePolicy)
+        self.gridLayout.addLayout(self.gridLayout_9, 2, 1, 1, 1)
-        self.label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.dsc_plot = PlotWidget(self.wizardPage1)
-        self.label.setObjectName("label")
-        self.verticalLayout.addWidget(self.label)
-        self.tg_value_label = QtWidgets.QLabel(Dialog)
-        self.tg_value_label.setText("")
-        self.tg_value_label.setObjectName("tg_value_label")
-        self.verticalLayout.addWidget(self.tg_value_label)
-        self.label_4 = QtWidgets.QLabel(Dialog)
-        self.label_4.setObjectName("label_4")
-        self.verticalLayout.addWidget(self.label_4)
-        self.label_5 = QtWidgets.QLabel(Dialog)
-        self.label_5.setText("")
-        self.label_5.setObjectName("label_5")
-        self.verticalLayout.addWidget(self.label_5)
-        self.gridLayout.addLayout(self.verticalLayout, 0, 0, 5, 1)
-        self.dsc_plot = PlotWidget(Dialog)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.dsc_plot.sizePolicy().hasHeightForWidth())
         self.dsc_plot.setSizePolicy(sizePolicy)
         self.dsc_plot.setObjectName("dsc_plot")
-        self.gridLayout.addWidget(self.dsc_plot, 0, 1, 1, 1)
+        self.gridLayout.addWidget(self.dsc_plot, 1, 0, 1, 2)
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
+        self.calctg_button = QtWidgets.QToolButton(self.wizardPage1)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.calctg_button = QtWidgets.QToolButton(Dialog)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -72,171 +57,156 @@ class Ui_Dialog(object):
         self.calctg_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
         self.calctg_button.setArrowType(QtCore.Qt.RightArrow)
         self.calctg_button.setObjectName("calctg_button")
-        self.verticalLayout_2.addWidget(self.calctg_button)
+        self.gridLayout.addWidget(self.calctg_button, 0, 0, 1, 2)
-        self.toolButton_2 = QtWidgets.QToolButton(Dialog)
+        Wizard.addPage(self.wizardPage1)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
+        self.wizardPage2 = QtWidgets.QWizardPage()
+        self.wizardPage2.setObjectName("wizardPage2")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.wizardPage2)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.toolButton = QtWidgets.QToolButton(self.wizardPage2)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.toolButton_2.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.toolButton.sizePolicy().hasHeightForWidth())
-        self.toolButton_2.setSizePolicy(sizePolicy)
+        self.toolButton.setSizePolicy(sizePolicy)
-        self.toolButton_2.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.toolButton.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
-        self.toolButton_2.setAutoRaise(False)
+        self.toolButton.setArrowType(QtCore.Qt.RightArrow)
-        self.toolButton_2.setArrowType(QtCore.Qt.RightArrow)
+        self.toolButton.setObjectName("toolButton")
-        self.toolButton_2.setObjectName("toolButton_2")
+        self.gridLayout_2.addWidget(self.toolButton, 0, 0, 1, 2)
-        self.verticalLayout_2.addWidget(self.toolButton_2)
+        self.tghodge_graph = PlotWidget(self.wizardPage2)
-        self.gridLayout.addLayout(self.verticalLayout_2, 0, 2, 1, 1)
-        self.tabWidget = QtWidgets.QTabWidget(Dialog)
-        self.tabWidget.setTabPosition(QtWidgets.QTabWidget.East)
-        self.tabWidget.setObjectName("tabWidget")
-        self.tabWidgetPage1 = QtWidgets.QWidget()
-        self.tabWidgetPage1.setObjectName("tabWidgetPage1")
-        self.gridLayout_3 = QtWidgets.QGridLayout(self.tabWidgetPage1)
-        self.gridLayout_3.setObjectName("gridLayout_3")
-        self.tglines_export_check = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.tglines_export_check.setChecked(True)
-        self.tglines_export_check.setObjectName("tglines_export_check")
-        self.gridLayout_3.addWidget(self.tglines_export_check, 2, 3, 1, 1)
-        self.checkBox_6 = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.checkBox_6.setChecked(True)
-        self.checkBox_6.setObjectName("checkBox_6")
-        self.gridLayout_3.addWidget(self.checkBox_6, 6, 3, 1, 1)
-        self.new_graph_tau_combo = QtWidgets.QComboBox(self.tabWidgetPage1)
-        self.new_graph_tau_combo.setObjectName("new_graph_tau_combo")
-        self.gridLayout_3.addWidget(self.new_graph_tau_combo, 8, 3, 1, 1)
-        self.line = QtWidgets.QFrame(self.tabWidgetPage1)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.gridLayout_3.addWidget(self.line, 3, 2, 1, 2)
-        self.checkBox = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.checkBox.setChecked(True)
-        self.checkBox.setObjectName("checkBox")
-        self.gridLayout_3.addWidget(self.checkBox, 5, 2, 1, 1)
-        self.tg_export_check = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.tg_export_check.setChecked(True)
-        self.tg_export_check.setObjectName("tg_export_check")
-        self.gridLayout_3.addWidget(self.tg_export_check, 2, 2, 1, 1)
-        self.new_graph_tau_check = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.new_graph_tau_check.setChecked(True)
-        self.new_graph_tau_check.setObjectName("new_graph_tau_check")
-        self.gridLayout_3.addWidget(self.new_graph_tau_check, 8, 2, 1, 1)
-        self.checkBox_5 = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.checkBox_5.setChecked(True)
-        self.checkBox_5.setObjectName("checkBox_5")
-        self.gridLayout_3.addWidget(self.checkBox_5, 6, 2, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_3.addItem(spacerItem, 10, 3, 1, 1)
-        self.label_6 = QtWidgets.QLabel(self.tabWidgetPage1)
-        self.label_6.setObjectName("label_6")
-        self.gridLayout_3.addWidget(self.label_6, 4, 2, 1, 2)
-        self.checkBox_4 = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.checkBox_4.setChecked(True)
-        self.checkBox_4.setObjectName("checkBox_4")
-        self.gridLayout_3.addWidget(self.checkBox_4, 5, 3, 1, 1)
-        self.checkBox_7 = QtWidgets.QCheckBox(self.tabWidgetPage1)
-        self.checkBox_7.setChecked(True)
-        self.checkBox_7.setObjectName("checkBox_7")
-        self.gridLayout_3.addWidget(self.checkBox_7, 7, 2, 1, 1)
-        self.pushButton_4 = QtWidgets.QPushButton(self.tabWidgetPage1)
-        self.pushButton_4.setObjectName("pushButton_4")
-        self.gridLayout_3.addWidget(self.pushButton_4, 9, 2, 1, 2)
-        self.tghodge_graph = PlotWidget(self.tabWidgetPage1)
         self.tghodge_graph.setObjectName("tghodge_graph")
-        self.gridLayout_3.addWidget(self.tghodge_graph, 2, 1, 9, 1)
+        self.gridLayout_2.addWidget(self.tghodge_graph, 2, 0, 1, 1)
-        self.tau_plot = PlotWidget(self.tabWidgetPage1)
+        self.tau_plot = PlotWidget(self.wizardPage2)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.tau_plot.sizePolicy().hasHeightForWidth())
         self.tau_plot.setSizePolicy(sizePolicy)
         self.tau_plot.setObjectName("tau_plot")
-        self.gridLayout_3.addWidget(self.tau_plot, 2, 0, 9, 1)
+        self.gridLayout_2.addWidget(self.tau_plot, 2, 1, 1, 1)
-        self.tabWidget.addTab(self.tabWidgetPage1, "")
+        self.gridLayout_4 = QtWidgets.QGridLayout()
-        self.tabWidgetPage2 = QtWidgets.QWidget()
+        self.gridLayout_4.setObjectName("gridLayout_4")
-        self.tabWidgetPage2.setObjectName("tabWidgetPage2")
+        self.checkBox_6 = QtWidgets.QCheckBox(self.wizardPage2)
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.tabWidgetPage2)
+        self.checkBox_6.setChecked(True)
-        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.checkBox_6.setObjectName("checkBox_6")
-        self.fit_tnhm_fitbutton = QtWidgets.QPushButton(self.tabWidgetPage2)
+        self.gridLayout_4.addWidget(self.checkBox_6, 2, 0, 1, 1)
-        self.fit_tnhm_fitbutton.setObjectName("fit_tnhm_fitbutton")
+        self.pushButton_4 = QtWidgets.QPushButton(self.wizardPage2)
-        self.gridLayout_2.addWidget(self.fit_tnhm_fitbutton, 1, 1, 1, 2)
+        self.pushButton_4.setObjectName("pushButton_4")
-        self.graphicsView_2 = PlotWidget(self.tabWidgetPage2)
+        self.gridLayout_4.addWidget(self.pushButton_4, 2, 2, 1, 1)
-        self.graphicsView_2.setObjectName("graphicsView_2")
+        self.new_graph_tau_check = QtWidgets.QCheckBox(self.wizardPage2)
-        self.gridLayout_2.addWidget(self.graphicsView_2, 0, 0, 9, 1)
+        self.new_graph_tau_check.setChecked(True)
-        self.new_graph_tnmh_check = QtWidgets.QCheckBox(self.tabWidgetPage2)
+        self.new_graph_tau_check.setObjectName("new_graph_tau_check")
-        self.new_graph_tnmh_check.setChecked(True)
+        self.gridLayout_4.addWidget(self.new_graph_tau_check, 0, 1, 1, 1)
-        self.new_graph_tnmh_check.setObjectName("new_graph_tnmh_check")
+        self.checkBox_7 = QtWidgets.QCheckBox(self.wizardPage2)
-        self.gridLayout_2.addWidget(self.new_graph_tnmh_check, 5, 1, 1, 1)
+        self.checkBox_7.setChecked(True)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.checkBox_7.setObjectName("checkBox_7")
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.gridLayout_4.addWidget(self.checkBox_7, 4, 0, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.tabWidgetPage2)
+        self.checkBox_5 = QtWidgets.QCheckBox(self.wizardPage2)
-        self.label_2.setObjectName("label_2")
+        self.checkBox_5.setChecked(True)
-        self.horizontalLayout.addWidget(self.label_2)
+        self.checkBox_5.setObjectName("checkBox_5")
-        self.tnmh_tg_combo = QtWidgets.QComboBox(self.tabWidgetPage2)
+        self.gridLayout_4.addWidget(self.checkBox_5, 3, 0, 1, 1)
-        self.tnmh_tg_combo.setObjectName("tnmh_tg_combo")
+        self.new_graph_tau_combo = QtWidgets.QComboBox(self.wizardPage2)
-        self.tnmh_tg_combo.addItem("")
+        self.new_graph_tau_combo.setObjectName("new_graph_tau_combo")
-        self.tnmh_tg_combo.addItem("")
+        self.gridLayout_4.addWidget(self.new_graph_tau_combo, 0, 2, 1, 1)
-        self.tnmh_tg_combo.addItem("")
+        self.checkBox_4 = QtWidgets.QCheckBox(self.wizardPage2)
-        self.tnmh_tg_combo.addItem("")
+        self.checkBox_4.setChecked(True)
-        self.tnmh_tg_combo.addItem("")
+        self.checkBox_4.setObjectName("checkBox_4")
-        self.horizontalLayout.addWidget(self.tnmh_tg_combo)
+        self.gridLayout_4.addWidget(self.checkBox_4, 1, 0, 1, 1)
-        self.gridLayout_2.addLayout(self.horizontalLayout, 0, 1, 1, 2)
+        self.checkBox = QtWidgets.QCheckBox(self.wizardPage2)
-        self.new_graph_tnmh_combo = QtWidgets.QComboBox(self.tabWidgetPage2)
+        self.checkBox.setChecked(True)
-        self.new_graph_tnmh_combo.setObjectName("new_graph_tnmh_combo")
+        self.checkBox.setObjectName("checkBox")
-        self.gridLayout_2.addWidget(self.new_graph_tnmh_combo, 5, 2, 1, 1)
+        self.gridLayout_4.addWidget(self.checkBox, 0, 0, 1, 1)
-        self.line_2 = QtWidgets.QFrame(self.tabWidgetPage2)
+        self.gridLayout_2.addLayout(self.gridLayout_4, 3, 0, 1, 2)
-        self.line_2.setMinimumSize(QtCore.QSize(0, 0))
+        Wizard.addPage(self.wizardPage2)
-        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.wizardPage = QtWidgets.QWizardPage()
-        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
-        self.line_2.setObjectName("line_2")
+        sizePolicy.setHorizontalStretch(0)
-        self.gridLayout_2.addWidget(self.line_2, 2, 1, 1, 2)
+        sizePolicy.setVerticalStretch(0)
-        self.checkBox_2 = QtWidgets.QCheckBox(self.tabWidgetPage2)
+        sizePolicy.setHeightForWidth(self.wizardPage.sizePolicy().hasHeightForWidth())
-        self.checkBox_2.setObjectName("checkBox_2")
+        self.wizardPage.setSizePolicy(sizePolicy)
-        self.gridLayout_2.addWidget(self.checkBox_2, 3, 1, 1, 2)
+        self.wizardPage.setSubTitle("")
-        self.checkBox_3 = QtWidgets.QCheckBox(self.tabWidgetPage2)
+        self.wizardPage.setObjectName("wizardPage")
-        self.checkBox_3.setObjectName("checkBox_3")
+        self.gridLayout_6 = QtWidgets.QGridLayout(self.wizardPage)
-        self.gridLayout_2.addWidget(self.checkBox_3, 4, 1, 1, 2)
+        self.gridLayout_6.setObjectName("gridLayout_6")
+        self.fit_tnhm_fitbutton_2 = QtWidgets.QPushButton(self.wizardPage)
+        self.fit_tnhm_fitbutton_2.setObjectName("fit_tnhm_fitbutton_2")
+        self.gridLayout_6.addWidget(self.fit_tnhm_fitbutton_2, 0, 0, 1, 2)
+        self.graphicsView_3 = PlotWidget(self.wizardPage)
+        self.graphicsView_3.setObjectName("graphicsView_3")
+        self.gridLayout_6.addWidget(self.graphicsView_3, 1, 0, 1, 1)
+        self.gridLayout_3 = QtWidgets.QGridLayout()
+        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.tnmh_tg_combo_2 = QtWidgets.QComboBox(self.wizardPage)
+        self.tnmh_tg_combo_2.setObjectName("tnmh_tg_combo_2")
+        self.tnmh_tg_combo_2.addItem("")
+        self.tnmh_tg_combo_2.addItem("")
+        self.tnmh_tg_combo_2.addItem("")
+        self.tnmh_tg_combo_2.addItem("")
+        self.tnmh_tg_combo_2.addItem("")
+        self.gridLayout_3.addWidget(self.tnmh_tg_combo_2, 0, 1, 1, 1)
+        self.label_3 = QtWidgets.QLabel(self.wizardPage)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout_3.addWidget(self.label_3, 0, 0, 1, 1)
         spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem1, 8, 1, 1, 1)
+        self.gridLayout_3.addItem(spacerItem1, 1, 0, 1, 1)
-        self.pushButton = QtWidgets.QPushButton(self.tabWidgetPage2)
+        self.gridLayout_6.addLayout(self.gridLayout_3, 1, 1, 1, 1)
-        self.pushButton.setObjectName("pushButton")
+        self.treeWidget_2 = QtWidgets.QTreeWidget(self.wizardPage)
-        self.gridLayout_2.addWidget(self.pushButton, 7, 1, 1, 2)
+        self.treeWidget_2.setObjectName("treeWidget_2")
-        self.tabWidget.addTab(self.tabWidgetPage2, "")
+        self.treeWidget_2.headerItem().setText(0, "1")
-        self.gridLayout.addWidget(self.tabWidget, 4, 1, 1, 2)
+        self.gridLayout_6.addWidget(self.treeWidget_2, 2, 0, 1, 1)
+        self.gridLayout_5 = QtWidgets.QGridLayout()
+        self.gridLayout_5.setObjectName("gridLayout_5")
+        self.new_graph_tnmh_check_2 = QtWidgets.QCheckBox(self.wizardPage)
+        self.new_graph_tnmh_check_2.setChecked(True)
+        self.new_graph_tnmh_check_2.setObjectName("new_graph_tnmh_check_2")
+        self.gridLayout_5.addWidget(self.new_graph_tnmh_check_2, 1, 0, 1, 1)
+        self.checkBox_14 = QtWidgets.QCheckBox(self.wizardPage)
+        self.checkBox_14.setObjectName("checkBox_14")
+        self.gridLayout_5.addWidget(self.checkBox_14, 0, 0, 1, 1)
+        self.pushButton_2 = QtWidgets.QPushButton(self.wizardPage)
+        self.pushButton_2.setObjectName("pushButton_2")
+        self.gridLayout_5.addWidget(self.pushButton_2, 2, 0, 1, 2)
+        self.checkBox_13 = QtWidgets.QCheckBox(self.wizardPage)
+        self.checkBox_13.setObjectName("checkBox_13")
+        self.gridLayout_5.addWidget(self.checkBox_13, 0, 1, 1, 1)
+        self.new_graph_tnmh_combo_2 = QtWidgets.QComboBox(self.wizardPage)
+        self.new_graph_tnmh_combo_2.setObjectName("new_graph_tnmh_combo_2")
+        self.gridLayout_5.addWidget(self.new_graph_tnmh_combo_2, 1, 1, 1, 1)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.gridLayout_5.addItem(spacerItem2, 3, 0, 1, 1)
+        self.gridLayout_6.addLayout(self.gridLayout_5, 2, 1, 1, 1)
+        Wizard.addPage(self.wizardPage)
 
-        self.retranslateUi(Dialog)
+        self.retranslateUi(Wizard)
-        self.tabWidget.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(Wizard)
-        self.buttonBox.accepted.connect(Dialog.accept) # type: ignore
-        self.buttonBox.rejected.connect(Dialog.reject) # type: ignore
-        QtCore.QMetaObject.connectSlotsByName(Dialog)
 
-    def retranslateUi(self, Dialog):
+    def retranslateUi(self, Wizard):
         _translate = QtCore.QCoreApplication.translate
-        Dialog.setWindowTitle(_translate("Dialog", "SImba, everything the light touches is our kingdom"))
+        Wizard.setWindowTitle(_translate("Wizard", "Wizard"))
-        self.label.setText(_translate("Dialog", "<html><head/><body><p><span style=\" font-weight:600;\">Tg values:</span></p></body></html>"))
+        self.wizardPage1.setTitle(_translate("Wizard", "Glass transition"))
-        self.label_4.setText(_translate("Dialog", "<html><head/><body><p><span style=\" font-weight:600;\">TNMH parameter:</span></p></body></html>"))
+        self.tg_export_check.setText(_translate("Wizard", "Export Tg"))
-        self.calctg_button.setText(_translate("Dialog", "Calculate Tg"))
+        self.tglines_export_check.setText(_translate("Wizard", "Export lines"))
-        self.toolButton_2.setText(_translate("Dialog", "Calculate fictive Cp"))
+        self.pushButton.setText(_translate("Wizard", "Export"))
-        self.tglines_export_check.setText(_translate("Dialog", "Export lines"))
+        self.calctg_button.setText(_translate("Wizard", "Calculate Tg"))
-        self.checkBox_6.setText(_translate("Dialog", "End"))
+        self.wizardPage2.setTitle(_translate("Wizard", "Hodge"))
-        self.checkBox.setText(_translate("Dialog", "Onset"))
+        self.toolButton.setText(_translate("Wizard", "Calculate Hodge"))
-        self.tg_export_check.setText(_translate("Dialog", "Export Tg"))
+        self.checkBox_6.setText(_translate("Wizard", "End"))
-        self.new_graph_tau_check.setText(_translate("Dialog", "New graph"))
+        self.pushButton_4.setText(_translate("Wizard", "Export"))
-        self.checkBox_5.setText(_translate("Dialog", "Inflection"))
+        self.new_graph_tau_check.setText(_translate("Wizard", "New graph"))
-        self.label_6.setText(_translate("Dialog", "Export Hodge:"))
+        self.checkBox_7.setText(_translate("Wizard", "Fictive"))
-        self.checkBox_4.setText(_translate("Dialog", "Midpoint"))
+        self.checkBox_5.setText(_translate("Wizard", "Inflection"))
-        self.checkBox_7.setText(_translate("Dialog", "Fictive"))
+        self.checkBox_4.setText(_translate("Wizard", "Midpoint"))
-        self.pushButton_4.setText(_translate("Dialog", "Export"))
+        self.checkBox.setText(_translate("Wizard", "Onset"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabWidgetPage1), _translate("Dialog", "Tg / Hodge"))
+        self.wizardPage.setTitle(_translate("Wizard", "TNMH"))
-        self.fit_tnhm_fitbutton.setText(_translate("Dialog", "Fit TNMH model"))
+        self.fit_tnhm_fitbutton_2.setText(_translate("Wizard", "Fit TNMH model"))
-        self.new_graph_tnmh_check.setText(_translate("Dialog", "New graph"))
+        self.tnmh_tg_combo_2.setItemText(0, _translate("Wizard", "Fictive"))
-        self.label_2.setText(_translate("Dialog", "Tg for TNMH"))
+        self.tnmh_tg_combo_2.setItemText(1, _translate("Wizard", "Onset"))
-        self.tnmh_tg_combo.setItemText(0, _translate("Dialog", "Fictive"))
+        self.tnmh_tg_combo_2.setItemText(2, _translate("Wizard", "Midpoint"))
-        self.tnmh_tg_combo.setItemText(1, _translate("Dialog", "Onset"))
+        self.tnmh_tg_combo_2.setItemText(3, _translate("Wizard", "End"))
-        self.tnmh_tg_combo.setItemText(2, _translate("Dialog", "Midpoint"))
+        self.tnmh_tg_combo_2.setItemText(4, _translate("Wizard", "Inflection"))
-        self.tnmh_tg_combo.setItemText(3, _translate("Dialog", "End"))
+        self.label_3.setText(_translate("Wizard", "Tg for TNMH"))
-        self.tnmh_tg_combo.setItemText(4, _translate("Dialog", "Inflection"))
+        self.new_graph_tnmh_check_2.setText(_translate("Wizard", "New graph"))
-        self.checkBox_2.setText(_translate("Dialog", "Export dTf / dT"))
+        self.checkBox_14.setText(_translate("Wizard", "Export fit"))
-        self.checkBox_3.setText(_translate("Dialog", "Export fit"))
+        self.pushButton_2.setText(_translate("Wizard", "Export"))
-        self.pushButton.setText(_translate("Dialog", "Export"))
+        self.checkBox_13.setText(_translate("Wizard", "Export dTf / dT"))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabWidgetPage2), _translate("Dialog", "TNMH"))
 from pyqtgraph import PlotWidget

src/gui_qt/dsc/glass_dialog.py

@@ -6,20 +6,26 @@ from pyqtgraph import mkPen, mkBrush, LegendItem
 
 from nmreval.dsc.hodge import tau_hodge
 from nmreval.lib.colors import Tab10
-from ..Qt import QtWidgets, QtCore
+from ..Qt import QtWidgets, QtCore, QtGui
-from .._py.tnmh_dialog import Ui_Dialog
+from .._py.tnmh_dialog import Ui_Wizard
+from ..lib.listwidget import QListWidgetSelect
 from ..lib.pg_objects import PlotItem, RegionItem
 
 from nmreval.data import DSC, Points
 
 
-class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
+class TgCalculator(QtWidgets.QWizard, Ui_Wizard):
-    newTg = QtCore.pyqtSignal(dict, list, str)
+    newTg = QtCore.pyqtSignal(dict)
 
     def __init__(self, management, parent=None):
         super().__init__(parent=parent)
 
         self.setupUi(self)
+        self.listWidget = QListWidgetSelect(parent=self)
+        self.listWidget.setObjectName('listWidget')
+        self.setSideWidget(self.listWidget)
+        self.listWidget.setSizePolicy(QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding))
+
         self._management = management
         self._colors = cycle(Tab10)
 
@@ -56,8 +62,13 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
                  PlotItem(x=[], y=[], pen=None, symbol='d', symbolBrush=Tab10.TabRed.rgb())),
                 None,
             ),
-            # 'fictive': PlotItem(x=[], y=[], pen=None, symbol='t1', symbolBrush=Tab10.TabPurple.rgb(), name='Fictive'),
+            'fictive': (
-            # 'TNMH': PlotItem(x=[], y=[], pen=None, symbol='star', symbolBrush=Tab10.TabPurple.rgb(), name='TNMH'),
+                PlotItem(x=[], y=[], pen=None, symbol='t1', symbolBrush=Tab10.TabPurple.rgb(), name='Fictive'),
+                None,
+                (PlotItem(x=[], y=[], pen=mkPen({'color': Tab10.TabPurple.rgb()})),
+                 PlotItem(x=[], y=[], pen=None, symbol='t1', symbolBrush=Tab10.TabPurple.rgb())),
+                None,
+            ),
         }
         self._lines = {}
         self.tau_plot.getPlotItem().addLegend()
@@ -75,8 +86,6 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
 
         self.add_sets()
 
-        self.listWidget.itemClicked.connect(self.show_tg_values)
-
         self.new_graph_tau_combo.setEnabled(False)
         self.new_graph_tau_check.stateChanged.connect(lambda state: self.new_graph_tau_combo.setEnabled(not bool(state)))
 
@@ -92,7 +101,6 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
         for plots in self._plots.values():
             for val in plots:
                 self.dsc_plot.removeItem(val)
-                self.graphicsView_2.removeItem(val)
 
         for key, plt in self._hodge.items():
             plt[0].setData(x=[], y=[])
@@ -148,16 +156,16 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
             self.dsc_plot.addItem(tg_plot)
 
             fictive_cp = PlotItem(pen=mkPen(c.rgb()))
-            self.graphicsView_2.addItem(fictive_cp)
+#            self.graphicsView_2.addItem(fictive_cp)
 
             tnmh_fit = PlotItem()
             tnmh_fit.set_line(style=2, color=c)
-            self.graphicsView_2.addItem(tnmh_fit)
+           # self.graphicsView_2.addItem(tnmh_fit)
 
             self._plots[key] = (data_plot, tg_plot, glass, liquid, tangent, fictive_cp, tnmh_fit)
             self._tg_value[key] = {
                 'onset': (nan, nan),
-                'mid': (nan, nan),
+                'midpoint': (nan, nan),
                 'end': (nan, nan),
                 'inflection': (nan, nan),
                 # 'fictive': (nan, nan),
@@ -194,20 +202,20 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
 
         self._update_tg_plots()
 
-    def show_tg_values(self, item):
+    def _update_tg_plots(self):
+        self.treeWidget.clear()
+        for idx in range(self.listWidget.count()):
+            item = self.listWidget.item(idx)
+
+            tree_item = QtWidgets.QTreeWidgetItem([item.text()])
             values = self._tg_value.get(item.data(QtCore.Qt.UserRole))
 
             if values is not None:
-            label = '\n'.join((f'{name.capitalize()}: {pos[0]:.2f} K' for name, pos in values.items()))
+                for name, pos in values.items():
-            self.tg_value_label.setText(label)
+                    child_item = QtWidgets.QTreeWidgetItem([f'{name.capitalize()}: {pos[0]:.2f} K'])
+                    tree_item.addChild(child_item)
 
-        fit = self._fit.get(item.data(QtCore.Qt.UserRole))
+                self.treeWidget.addTopLevelItem(tree_item)
-        if fit is not None:
-            self.label_5.setText(fit._parameter_string())
-
-    def _update_tg_plots(self):
-        for idx in range(self.listWidget.count()):
-            item = self.listWidget.item(idx)
 
             key = item.data(QtCore.Qt.UserRole)
             plot = self._plots[key]
@@ -215,7 +223,25 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
 
             plot[1].setData(array(list(self._tg_value[key].values())))
 
-        self.hodge()
+    @QtCore.pyqtSlot(name='on_pushButton_clicked')
+    def export_tg(self):
+        ret_dic = {}
+        for key, tg in self._tg_value.items():
+            tgx = [x for x, y in tg.values()]
+            tgy = [y for x, y in tg.values()]
+            if self.tg_export_check.isChecked():
+                tg_pts = Points(x=tgx, y=tgy, name=self._management[key].name + ' (Tg)', value=self._management[key].value)
+            else:
+                tg_pts = None
+
+            if self.tglines_export_check.isChecked():
+                line = self._lines[key]
+            else:
+                line = []
+
+            ret_dic[key] = (tg_pts, line)
+
+        self.newTg.emit(ret_dic)
 
     @QtCore.pyqtSlot(QtWidgets.QListWidgetItem, name='on_listWidget_itemChanged')
     def change_visibility(self, item: QtWidgets.QListWidgetItem):
@@ -270,6 +296,7 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
             self._fit[key] = res
             plot[-1].setData(res.x, res.y)
 
+    @QtCore.pyqtSlot(name='on_toolButton_clicked')
     def hodge(self):
         for tg_type, (plot, data, fitplots, fit) in self._hodge.items():
 
@@ -292,8 +319,8 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
                 data, fit = tau_hodge(*array(m).T)
                 data.name = f'{data.name} ({tg_type.capitalize()})'
                 plot.setData(data.x, data.y)
-                fitplots[0].setData(1000/fit.x, fit.y)
+                fitplots[0].setData(fit.x, fit.y)
-                fitplots[1].setData(1000/fit.x_data, fit.y_data)
+                fitplots[1].setData(fit.x_data, fit.y_data)
 
                 self._hodge[tg_type] = (plot, data, fitplots, fit)
 

src/gui_qt/main/management.py

@@ -773,8 +773,8 @@ class UpperManagement(QtCore.QObject):
 
         self.newData.emit(new_data, self.current_graph)
 
-    @QtCore.pyqtSlot(dict, list, str)
+    @QtCore.pyqtSlot(dict)
-    def addTg(self, dic1: dict, dic2: list, graph_id: str):
+    def addTg(self, dic1: dict):
         for k, (tg, lines) in dic1.items():
             p: ExperimentContainer = self[k]
             col = p.plot_real.linecolor
@@ -792,11 +792,6 @@ class UpperManagement(QtCore.QObject):
 
             self.newData.emit(tg_data_id, self.current_graph)
 
-        set_id_list = []
-        for v in dic2:
-            set_id_list.append(self.add(v))
-        self.newData.emit(set_id_list, graph_id)
-
     @QtCore.pyqtSlot(int, dict)
     def smooth_data(self, npoints, param_kwargs):
         _active = self.graphs[self.current_graph].active

src/nmreval/dsc/hodge.py

@@ -10,18 +10,18 @@ from nmreval.utils import kB
 
 
 def tau_hodge(tg: ArrayLike, rate: ArrayLike) -> (Points, FitResult):
-    rate = np.asanyarray(rate) / 60
+    rate = np.asanyarray(rate)
     tg = np.asanyarray(tg)
     fitter = FitRoutine()
     fitter.set_model(Arrhenius)
-    d = fitter.add_data(tg, rate)
+    d = fitter.add_data(1000/tg, rate, we='y')
 
-    init = linregress(1/tg, np.log(rate))
+    init = linregress(1000/tg, np.log(rate))
 
-    d.set_parameter([np.exp(init.intercept), init.slope*kB], fun_kwargs={'invt': None})
+    d.set_parameter([np.exp(init.intercept), 1000*init.slope*kB], fun_kwargs={'invt': 'invt1000'})
 
     res = fitter.run()[0]
     de = res.parameter['E_{A}']
-    tau = kB*tg**2/np.abs(de.value)/rate
+    tau = kB*tg**2/np.abs(de.value)/rate*60
 
     return Points(x=1000/tg, y=tau, y_err=tau*de.error/np.abs(de.value), name='Hodge'), res

src/resources/_ui/tnmh_dialog.ui

@@ -1,81 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Dialog</class>
+ <class>Wizard</class>
- <widget class="QDialog" name="Dialog">
+ <widget class="QWizard" name="Wizard">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1094</width>
+    <width>854</width>
-    <height>829</height>
+    <height>619</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>SImba, everything the light touches is our kingdom</string>
+   <string>Wizard</string>
+  </property>
+  <widget class="QWizardPage" name="wizardPage1">
+   <property name="title">
+    <string>Glass transition</string>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-   <item row="5" column="1">
+    <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
+     <widget class="QTreeWidget" name="treeWidget">
+      <attribute name="headerVisible">
+       <bool>false</bool>
+      </attribute>
+      <column>
+       <property name="text">
+        <string notr="true">1</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <layout class="QGridLayout" name="gridLayout_9">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="tg_export_check">
+        <property name="text">
+         <string>Export Tg</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <spacer name="verticalSpacer_3">
         <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+         <enum>Qt::Vertical</enum>
         </property>
-     <property name="standardButtons">
+        <property name="sizeHint" stdset="0">
-      <set>QDialogButtonBox::Close</set>
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
         </property>
-    </widget>
+       </spacer>
       </item>
-   <item row="0" column="0" rowspan="5">
+      <item row="0" column="1">
-    <layout class="QVBoxLayout" name="verticalLayout">
+       <widget class="QCheckBox" name="tglines_export_check">
-     <item>
-      <widget class="QListWidget" name="listWidget">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
         <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Tg values:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>Export lines</string>
         </property>
-       <property name="alignment">
+        <property name="checked">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-     <item>
+      <item row="2" column="0" colspan="2">
-      <widget class="QLabel" name="tg_value_label">
+       <widget class="QPushButton" name="pushButton">
         <property name="text">
-        <string/>
+         <string>Export</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;TNMH parameter:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string/>
         </property>
        </widget>
       </item>
      </layout>
     </item>
-   <item row="0" column="1">
+    <item row="1" column="0" colspan="2">
      <widget class="PlotWidget" name="dsc_plot">
       <property name="sizePolicy">
        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -85,9 +84,7 @@
       </property>
      </widget>
     </item>
-   <item row="0" column="2">
+    <item row="0" column="0" colspan="2">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
      <widget class="QToolButton" name="calctg_button">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -106,164 +103,36 @@
       </property>
      </widget>
     </item>
-     <item>
+   </layout>
-      <widget class="QToolButton" name="toolButton_2">
+  </widget>
+  <widget class="QWizardPage" name="wizardPage2">
+   <property name="title">
+    <string>Hodge</string>
+   </property>
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0" colspan="2">
+     <widget class="QToolButton" name="toolButton">
       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="text">
-        <string>Calculate fictive Cp</string>
+       <string>Calculate Hodge</string>
       </property>
       <property name="toolButtonStyle">
        <enum>Qt::ToolButtonTextBesideIcon</enum>
       </property>
-       <property name="autoRaise">
-        <bool>false</bool>
-       </property>
       <property name="arrowType">
        <enum>Qt::RightArrow</enum>
       </property>
      </widget>
     </item>
-    </layout>
+    <item row="2" column="0">
-   </item>
-   <item row="4" column="1" colspan="2">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="tabPosition">
-      <enum>QTabWidget::East</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tabWidgetPage1">
-      <attribute name="title">
-       <string>Tg / Hodge</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="2" column="3">
-        <widget class="QCheckBox" name="tglines_export_check">
-         <property name="text">
-          <string>Export lines</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="3">
-        <widget class="QCheckBox" name="checkBox_6">
-         <property name="text">
-          <string>End</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="3">
-        <widget class="QComboBox" name="new_graph_tau_combo"/>
-       </item>
-       <item row="3" column="2" colspan="2">
-        <widget class="Line" name="line">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="2">
-        <widget class="QCheckBox" name="checkBox">
-         <property name="text">
-          <string>Onset</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QCheckBox" name="tg_export_check">
-         <property name="text">
-          <string>Export Tg</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="2">
-        <widget class="QCheckBox" name="new_graph_tau_check">
-         <property name="text">
-          <string>New graph</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="2">
-        <widget class="QCheckBox" name="checkBox_5">
-         <property name="text">
-          <string>Inflection</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="3">
-        <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="2" colspan="2">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Export Hodge:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="3">
-        <widget class="QCheckBox" name="checkBox_4">
-         <property name="text">
-          <string>Midpoint</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="2">
-        <widget class="QCheckBox" name="checkBox_7">
-         <property name="text">
-          <string>Fictive</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="9" column="2" colspan="2">
-        <widget class="QPushButton" name="pushButton_4">
-         <property name="text">
-          <string>Export</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1" rowspan="9">
      <widget class="PlotWidget" name="tghodge_graph"/>
     </item>
-       <item row="2" column="0" rowspan="9">
+    <item row="2" column="1">
      <widget class="PlotWidget" name="tau_plot">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
@@ -273,25 +142,27 @@
       </property>
      </widget>
     </item>
-      </layout>
+    <item row="3" column="0" colspan="2">
-     </widget>
+     <layout class="QGridLayout" name="gridLayout_4">
-     <widget class="QWidget" name="tabWidgetPage2">
+      <item row="2" column="0">
-      <attribute name="title">
+       <widget class="QCheckBox" name="checkBox_6">
-       <string>TNMH</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="1" column="1" colspan="2">
-        <widget class="QPushButton" name="fit_tnhm_fitbutton">
         <property name="text">
-          <string>Fit TNMH model</string>
+         <string>End</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-       <item row="0" column="0" rowspan="9">
+      <item row="2" column="2">
-        <widget class="PlotWidget" name="graphicsView_2"/>
+       <widget class="QPushButton" name="pushButton_4">
+        <property name="text">
+         <string>Export</string>
+        </property>
+       </widget>
       </item>
-       <item row="5" column="1">
+      <item row="0" column="1">
-        <widget class="QCheckBox" name="new_graph_tnmh_check">
+       <widget class="QCheckBox" name="new_graph_tau_check">
         <property name="text">
          <string>New graph</string>
         </property>
@@ -300,17 +171,81 @@
         </property>
        </widget>
       </item>
-       <item row="0" column="1" colspan="2">
+      <item row="4" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout">
+       <widget class="QCheckBox" name="checkBox_7">
-         <item>
-          <widget class="QLabel" name="label_2">
         <property name="text">
-            <string>Tg for TNMH</string>
+         <string>Fictive</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-         <item>
+      <item row="3" column="0">
-          <widget class="QComboBox" name="tnmh_tg_combo">
+       <widget class="QCheckBox" name="checkBox_5">
+        <property name="text">
+         <string>Inflection</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="new_graph_tau_combo"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="checkBox_4">
+        <property name="text">
+         <string>Midpoint</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="checkBox">
+        <property name="text">
+         <string>Onset</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWizardPage" name="wizardPage">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="title">
+    <string>TNMH</string>
+   </property>
+   <property name="subTitle">
+    <string/>
+   </property>
+   <layout class="QGridLayout" name="gridLayout_6">
+    <item row="0" column="0" colspan="2">
+     <widget class="QPushButton" name="fit_tnhm_fitbutton_2">
+      <property name="text">
+       <string>Fit TNMH model</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="PlotWidget" name="graphicsView_3"/>
+    </item>
+    <item row="1" column="1">
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="1">
+       <widget class="QComboBox" name="tnmh_tg_combo_2">
         <item>
          <property name="text">
           <string>Fictive</string>
@@ -338,39 +273,14 @@
         </item>
        </widget>
       </item>
-        </layout>
+      <item row="0" column="0">
-       </item>
+       <widget class="QLabel" name="label_3">
-       <item row="5" column="2">
-        <widget class="QComboBox" name="new_graph_tnmh_combo"/>
-       </item>
-       <item row="2" column="1" colspan="2">
-        <widget class="Line" name="line_2">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1" colspan="2">
-        <widget class="QCheckBox" name="checkBox_2">
         <property name="text">
-          <string>Export dTf / dT</string>
+         <string>Tg for TNMH</string>
         </property>
        </widget>
       </item>
-       <item row="4" column="1" colspan="2">
+      <item row="1" column="0">
-        <widget class="QCheckBox" name="checkBox_3">
-         <property name="text">
-          <string>Export fit</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="1">
        <spacer name="verticalSpacer_2">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
@@ -383,18 +293,70 @@
         </property>
        </spacer>
       </item>
-       <item row="7" column="1" colspan="2">
+     </layout>
-        <widget class="QPushButton" name="pushButton">
+    </item>
+    <item row="2" column="0">
+     <widget class="QTreeWidget" name="treeWidget_2">
+      <column>
+       <property name="text">
+        <string notr="true">1</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="new_graph_tnmh_check_2">
+        <property name="text">
+         <string>New graph</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="checkBox_14">
+        <property name="text">
+         <string>Export fit</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="QPushButton" name="pushButton_2">
         <property name="text">
          <string>Export</string>
         </property>
        </widget>
       </item>
-      </layout>
+      <item row="0" column="1">
-     </widget>
+       <widget class="QCheckBox" name="checkBox_13">
+        <property name="text">
+         <string>Export dTf / dT</string>
+        </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="new_graph_tnmh_combo_2"/>
+      </item>
+      <item row="3" column="0">
+       <spacer name="verticalSpacer_4">
+        <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>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>
@@ -404,38 +366,5 @@
   </customwidget>
  </customwidgets>
  <resources/>
- <connections>
+ <connections/>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>Dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</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>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>