dominik/nmreval
1
0
Fork 0
forked from IPKM/nmreval
Code Pull Requests Activity

added tnmh; some bugfixes

Browse Source
This commit is contained in:
Dominik Demuth
2023-07-05 19:51:06 +02:00
parent 8de4a0cbd3
commit a310a78fb9
7 changed files with 131 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui_qt/_py/basewindow.py
View File

@ -472,7 +472,6 @@ class Ui_BaseWindow(object):
self.menuStuff.addAction(self.actionTetris)
self.menuStuff.addAction(self.actionMine)
self.menuDSC.addAction(self.actionTNMH_model)
self.menuDSC.addAction(self.actionTNMH)
self.menubar.addAction(self.menuFile.menuAction())
self.menubar.addAction(self.menuWindow.menuAction())
self.menubar.addAction(self.menuData.menuAction())
@ -640,7 +639,7 @@ class Ui_BaseWindow(object):
self.actionShow_error_log.setText(_translate("BaseWindow", "Show error log"))
self.actionCreate_starter.setText(_translate("BaseWindow", "Create starter.."))
self.actionAbout.setText(_translate("BaseWindow", "About..."))
self.actionTNMH_model.setText(_translate("BaseWindow", "Tg determination,,,"))
self.actionTNMH_model.setText(_translate("BaseWindow", "Tg , Hodge, TNMH,,,"))
self.actionBinning.setText(_translate("BaseWindow", "Binning..."))
self.actionTNMH.setText(_translate("BaseWindow", "TNMH..."))
from ..data.datawidget.datawidget import DataWidget

53
src/gui_qt/_py/tnmh_dialog.py
View File

@ -90,9 +90,6 @@ class Ui_Wizard(object):
self.checkBox_6.setChecked(True)
self.checkBox_6.setObjectName("checkBox_6")
self.gridLayout_4.addWidget(self.checkBox_6, 2, 0, 1, 1)
self.pushButton_4 = QtWidgets.QPushButton(self.wizardPage2)
self.pushButton_4.setObjectName("pushButton_4")
self.gridLayout_4.addWidget(self.pushButton_4, 2, 2, 1, 1)
self.new_graph_tau_check = QtWidgets.QCheckBox(self.wizardPage2)
self.new_graph_tau_check.setChecked(True)
self.new_graph_tau_check.setObjectName("new_graph_tau_check")
@ -106,6 +103,7 @@ class Ui_Wizard(object):
self.checkBox_5.setObjectName("checkBox_5")
self.gridLayout_4.addWidget(self.checkBox_5, 3, 0, 1, 1)
self.new_graph_tau_combo = QtWidgets.QComboBox(self.wizardPage2)
self.new_graph_tau_combo.setEnabled(False)
self.new_graph_tau_combo.setObjectName("new_graph_tau_combo")
self.gridLayout_4.addWidget(self.new_graph_tau_combo, 0, 2, 1, 1)
self.checkBox_4 = QtWidgets.QCheckBox(self.wizardPage2)
@ -116,6 +114,9 @@ class Ui_Wizard(object):
self.checkBox.setChecked(True)
self.checkBox.setObjectName("checkBox")
self.gridLayout_4.addWidget(self.checkBox, 0, 0, 1, 1)
self.pushButton_4 = QtWidgets.QPushButton(self.wizardPage2)
self.pushButton_4.setObjectName("pushButton_4")
self.gridLayout_4.addWidget(self.pushButton_4, 4, 1, 1, 2)
self.gridLayout_2.addLayout(self.gridLayout_4, 3, 0, 1, 2)
Wizard.addPage(self.wizardPage2)
self.wizardPage = QtWidgets.QWizardPage()
@ -128,31 +129,13 @@ class Ui_Wizard(object):
self.wizardPage.setObjectName("wizardPage")
self.gridLayout_6 = QtWidgets.QGridLayout(self.wizardPage)
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_3.addItem(spacerItem1, 1, 0, 1, 1)
self.gridLayout_6.addLayout(self.gridLayout_3, 1, 1, 1, 1)
self.fit_tnhm_fitbutton = QtWidgets.QPushButton(self.wizardPage)
self.fit_tnhm_fitbutton.setObjectName("fit_tnhm_fitbutton")
self.gridLayout_6.addWidget(self.fit_tnhm_fitbutton, 0, 0, 1, 2)
self.treeWidget_2 = QtWidgets.QTreeWidget(self.wizardPage)
self.treeWidget_2.setObjectName("treeWidget_2")
self.treeWidget_2.headerItem().setText(0, "1")
self.treeWidget_2.header().setVisible(False)
self.gridLayout_6.addWidget(self.treeWidget_2, 2, 0, 1, 1)
self.gridLayout_5 = QtWidgets.QGridLayout()
self.gridLayout_5.setObjectName("gridLayout_5")
@ -161,20 +144,26 @@ class Ui_Wizard(object):
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.setChecked(True)
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.setChecked(True)
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.setEnabled(False)
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)
spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.gridLayout_5.addItem(spacerItem1, 3, 0, 1, 1)
self.gridLayout_6.addLayout(self.gridLayout_5, 2, 1, 1, 1)
self.graphicsView_3 = PlotWidget(self.wizardPage)
self.graphicsView_3.setObjectName("graphicsView_3")
self.gridLayout_6.addWidget(self.graphicsView_3, 1, 0, 1, 2)
Wizard.addPage(self.wizardPage)
self.retranslateUi(Wizard)
@ -191,20 +180,14 @@ class Ui_Wizard(object):
self.wizardPage2.setTitle(_translate("Wizard", "Hodge"))
self.toolButton.setText(_translate("Wizard", "Calculate Hodge"))
self.checkBox_6.setText(_translate("Wizard", "End"))
self.pushButton_4.setText(_translate("Wizard", "Export"))
self.new_graph_tau_check.setText(_translate("Wizard", "New graph"))
self.checkBox_7.setText(_translate("Wizard", "Fictive"))
self.checkBox_5.setText(_translate("Wizard", "Inflection"))
self.checkBox_4.setText(_translate("Wizard", "Midpoint"))
self.checkBox.setText(_translate("Wizard", "Onset"))
self.pushButton_4.setText(_translate("Wizard", "Export"))
self.wizardPage.setTitle(_translate("Wizard", "TNMH"))
self.fit_tnhm_fitbutton_2.setText(_translate("Wizard", "Fit TNMH model"))
self.tnmh_tg_combo_2.setItemText(0, _translate("Wizard", "Fictive"))
self.tnmh_tg_combo_2.setItemText(1, _translate("Wizard", "Onset"))
self.tnmh_tg_combo_2.setItemText(2, _translate("Wizard", "Midpoint"))
self.tnmh_tg_combo_2.setItemText(3, _translate("Wizard", "End"))
self.tnmh_tg_combo_2.setItemText(4, _translate("Wizard", "Inflection"))
self.label_3.setText(_translate("Wizard", "Tg for TNMH"))
self.fit_tnhm_fitbutton.setText(_translate("Wizard", "Fit TNMH model"))
self.new_graph_tnmh_check_2.setText(_translate("Wizard", "New graph"))
self.checkBox_14.setText(_translate("Wizard", "Export fit"))
self.pushButton_2.setText(_translate("Wizard", "Export"))