diff --git a/src/gui_qt/_py/fitresult.py b/src/gui_qt/_py/fitresult.py
index 5a9a4e4..568dafb 100644
--- a/src/gui_qt/_py/fitresult.py
+++ b/src/gui_qt/_py/fitresult.py
@@ -17,25 +17,102 @@ class Ui_Dialog(object):
Dialog.resize(969, 974)
self.gridLayout = QtWidgets.QGridLayout(Dialog)
self.gridLayout.setObjectName("gridLayout")
- self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
- self.horizontalLayout_2.setSpacing(3)
- self.horizontalLayout_2.setObjectName("horizontalLayout_2")
- self.reject_fit_checkBox = QtWidgets.QCheckBox(Dialog)
- self.reject_fit_checkBox.setObjectName("reject_fit_checkBox")
- self.horizontalLayout_2.addWidget(self.reject_fit_checkBox)
+ self.stack = QtWidgets.QTabWidget(Dialog)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.stack.sizePolicy().hasHeightForWidth())
+ self.stack.setSizePolicy(sizePolicy)
+ self.stack.setObjectName("stack")
+ self.stackPage1 = QtWidgets.QWidget()
+ self.stackPage1.setObjectName("stackPage1")
+ self.gridLayout_3 = QtWidgets.QGridLayout(self.stackPage1)
+ self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
+ self.gridLayout_3.setSpacing(3)
+ self.gridLayout_3.setObjectName("gridLayout_3")
+ self.logy_box = QtWidgets.QCheckBox(self.stackPage1)
+ self.logy_box.setLayoutDirection(QtCore.Qt.RightToLeft)
+ self.logy_box.setObjectName("logy_box")
+ self.gridLayout_3.addWidget(self.logy_box, 2, 1, 1, 1)
+ self.logx_box = QtWidgets.QCheckBox(self.stackPage1)
+ self.logx_box.setLayoutDirection(QtCore.Qt.RightToLeft)
+ self.logx_box.setObjectName("logx_box")
+ self.gridLayout_3.addWidget(self.logx_box, 2, 0, 1, 1)
+ self.graphicsView = GraphicsLayoutWidget(self.stackPage1)
+ self.graphicsView.setObjectName("graphicsView")
+ self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 2)
+ self.stack.addTab(self.stackPage1, "")
+ self.stackPage2 = QtWidgets.QWidget()
+ self.stackPage2.setObjectName("stackPage2")
+ self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.stackPage2)
+ self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
+ self.verticalLayout_2.setSpacing(3)
+ self.verticalLayout_2.setObjectName("verticalLayout_2")
+ self.stats_tableWidget = QtWidgets.QTableWidget(self.stackPage2)
+ self.stats_tableWidget.setFrameShape(QtWidgets.QFrame.Box)
+ self.stats_tableWidget.setGridStyle(QtCore.Qt.NoPen)
+ self.stats_tableWidget.setColumnCount(1)
+ self.stats_tableWidget.setObjectName("stats_tableWidget")
+ self.stats_tableWidget.setRowCount(0)
+ self.stats_tableWidget.horizontalHeader().setVisible(False)
+ self.stats_tableWidget.horizontalHeader().setSortIndicatorShown(True)
+ self.verticalLayout_2.addWidget(self.stats_tableWidget)
+ self.stack.addTab(self.stackPage2, "")
+ self.stackPage3 = QtWidgets.QWidget()
+ self.stackPage3.setObjectName("stackPage3")
+ self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.stackPage3)
+ self.verticalLayout_3.setContentsMargins(3, 3, 3, 3)
+ self.verticalLayout_3.setSpacing(3)
+ self.verticalLayout_3.setObjectName("verticalLayout_3")
+ self.corr_tableWidget = QtWidgets.QTableWidget(self.stackPage3)
+ self.corr_tableWidget.setFrameShape(QtWidgets.QFrame.Box)
+ self.corr_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+ self.corr_tableWidget.setGridStyle(QtCore.Qt.NoPen)
+ self.corr_tableWidget.setObjectName("corr_tableWidget")
+ self.corr_tableWidget.setColumnCount(4)
+ self.corr_tableWidget.setRowCount(0)
+ item = QtWidgets.QTableWidgetItem()
+ self.corr_tableWidget.setHorizontalHeaderItem(0, item)
+ item = QtWidgets.QTableWidgetItem()
+ self.corr_tableWidget.setHorizontalHeaderItem(1, item)
+ item = QtWidgets.QTableWidgetItem()
+ self.corr_tableWidget.setHorizontalHeaderItem(2, item)
+ item = QtWidgets.QTableWidgetItem()
+ self.corr_tableWidget.setHorizontalHeaderItem(3, item)
+ self.corr_tableWidget.horizontalHeader().setStretchLastSection(True)
+ self.corr_tableWidget.verticalHeader().setVisible(False)
+ self.verticalLayout_3.addWidget(self.corr_tableWidget)
+ self.stack.addTab(self.stackPage3, "")
+ self.gridLayout.addWidget(self.stack, 0, 1, 5, 1)
+ self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+ self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok|QtWidgets.QDialogButtonBox.Retry)
+ self.buttonBox.setObjectName("buttonBox")
+ self.gridLayout.addWidget(self.buttonBox, 8, 0, 1, 2)
+ self.param_tableWidget = QtWidgets.QTableWidget(Dialog)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.param_tableWidget.sizePolicy().hasHeightForWidth())
+ self.param_tableWidget.setSizePolicy(sizePolicy)
+ self.param_tableWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+ self.param_tableWidget.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustIgnored)
+ self.param_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+ self.param_tableWidget.setAlternatingRowColors(True)
+ self.param_tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
+ self.param_tableWidget.setColumnCount(1)
+ self.param_tableWidget.setObjectName("param_tableWidget")
+ self.param_tableWidget.setRowCount(0)
+ self.param_tableWidget.horizontalHeader().setVisible(False)
+ self.param_tableWidget.horizontalHeader().setStretchLastSection(True)
+ self.gridLayout.addWidget(self.param_tableWidget, 1, 0, 1, 1)
self.del_prev_checkBox = QtWidgets.QCheckBox(Dialog)
self.del_prev_checkBox.setObjectName("del_prev_checkBox")
- self.horizontalLayout_2.addWidget(self.del_prev_checkBox)
- self.gridLayout.addLayout(self.horizontalLayout_2, 2, 0, 1, 2)
+ self.gridLayout.addWidget(self.del_prev_checkBox, 3, 0, 1, 1)
self.line = QtWidgets.QFrame(Dialog)
self.line.setFrameShape(QtWidgets.QFrame.HLine)
self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
self.line.setObjectName("line")
- self.gridLayout.addWidget(self.line, 3, 0, 1, 2)
- self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
- self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok|QtWidgets.QDialogButtonBox.Retry)
- self.buttonBox.setObjectName("buttonBox")
- self.gridLayout.addWidget(self.buttonBox, 6, 0, 1, 2)
+ self.gridLayout.addWidget(self.line, 5, 0, 1, 2)
self.groupBox = QtWidgets.QGroupBox(Dialog)
self.groupBox.setObjectName("groupBox")
self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox)
@@ -103,24 +180,7 @@ class Ui_Dialog(object):
self.partial_checkBox.setObjectName("partial_checkBox")
self.horizontalLayout.addWidget(self.partial_checkBox)
self.gridLayout_2.addLayout(self.horizontalLayout, 0, 0, 1, 4)
- self.gridLayout.addWidget(self.groupBox, 5, 0, 1, 2)
- self.param_tableWidget = QtWidgets.QTableWidget(Dialog)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.param_tableWidget.sizePolicy().hasHeightForWidth())
- self.param_tableWidget.setSizePolicy(sizePolicy)
- self.param_tableWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
- self.param_tableWidget.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustIgnored)
- self.param_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
- self.param_tableWidget.setAlternatingRowColors(True)
- self.param_tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
- self.param_tableWidget.setColumnCount(1)
- self.param_tableWidget.setObjectName("param_tableWidget")
- self.param_tableWidget.setRowCount(0)
- self.param_tableWidget.horizontalHeader().setVisible(False)
- self.param_tableWidget.horizontalHeader().setStretchLastSection(True)
- self.gridLayout.addWidget(self.param_tableWidget, 1, 0, 1, 1)
+ self.gridLayout.addWidget(self.groupBox, 7, 0, 1, 2)
self.sets_comboBox = ElideComboBox(Dialog)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
@@ -132,73 +192,9 @@ class Ui_Dialog(object):
self.sets_comboBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
self.sets_comboBox.setObjectName("sets_comboBox")
self.gridLayout.addWidget(self.sets_comboBox, 0, 0, 1, 1)
- self.stack = QtWidgets.QTabWidget(Dialog)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.stack.sizePolicy().hasHeightForWidth())
- self.stack.setSizePolicy(sizePolicy)
- self.stack.setObjectName("stack")
- self.stackPage1 = QtWidgets.QWidget()
- self.stackPage1.setObjectName("stackPage1")
- self.gridLayout_3 = QtWidgets.QGridLayout(self.stackPage1)
- self.gridLayout_3.setContentsMargins(3, 3, 3, 3)
- self.gridLayout_3.setSpacing(3)
- self.gridLayout_3.setObjectName("gridLayout_3")
- self.logy_box = QtWidgets.QCheckBox(self.stackPage1)
- self.logy_box.setLayoutDirection(QtCore.Qt.RightToLeft)
- self.logy_box.setObjectName("logy_box")
- self.gridLayout_3.addWidget(self.logy_box, 2, 1, 1, 1)
- self.logx_box = QtWidgets.QCheckBox(self.stackPage1)
- self.logx_box.setLayoutDirection(QtCore.Qt.RightToLeft)
- self.logx_box.setObjectName("logx_box")
- self.gridLayout_3.addWidget(self.logx_box, 2, 0, 1, 1)
- self.graphicsView = GraphicsLayoutWidget(self.stackPage1)
- self.graphicsView.setObjectName("graphicsView")
- self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 2)
- self.stack.addTab(self.stackPage1, "")
- self.stackPage2 = QtWidgets.QWidget()
- self.stackPage2.setObjectName("stackPage2")
- self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.stackPage2)
- self.verticalLayout_2.setContentsMargins(3, 3, 3, 3)
- self.verticalLayout_2.setSpacing(3)
- self.verticalLayout_2.setObjectName("verticalLayout_2")
- self.stats_tableWidget = QtWidgets.QTableWidget(self.stackPage2)
- self.stats_tableWidget.setFrameShape(QtWidgets.QFrame.Box)
- self.stats_tableWidget.setGridStyle(QtCore.Qt.NoPen)
- self.stats_tableWidget.setColumnCount(1)
- self.stats_tableWidget.setObjectName("stats_tableWidget")
- self.stats_tableWidget.setRowCount(0)
- self.stats_tableWidget.horizontalHeader().setVisible(False)
- self.stats_tableWidget.horizontalHeader().setSortIndicatorShown(True)
- self.verticalLayout_2.addWidget(self.stats_tableWidget)
- self.stack.addTab(self.stackPage2, "")
- self.stackPage3 = QtWidgets.QWidget()
- self.stackPage3.setObjectName("stackPage3")
- self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.stackPage3)
- self.verticalLayout_3.setContentsMargins(3, 3, 3, 3)
- self.verticalLayout_3.setSpacing(3)
- self.verticalLayout_3.setObjectName("verticalLayout_3")
- self.corr_tableWidget = QtWidgets.QTableWidget(self.stackPage3)
- self.corr_tableWidget.setFrameShape(QtWidgets.QFrame.Box)
- self.corr_tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
- self.corr_tableWidget.setGridStyle(QtCore.Qt.NoPen)
- self.corr_tableWidget.setObjectName("corr_tableWidget")
- self.corr_tableWidget.setColumnCount(4)
- self.corr_tableWidget.setRowCount(0)
- item = QtWidgets.QTableWidgetItem()
- self.corr_tableWidget.setHorizontalHeaderItem(0, item)
- item = QtWidgets.QTableWidgetItem()
- self.corr_tableWidget.setHorizontalHeaderItem(1, item)
- item = QtWidgets.QTableWidgetItem()
- self.corr_tableWidget.setHorizontalHeaderItem(2, item)
- item = QtWidgets.QTableWidgetItem()
- self.corr_tableWidget.setHorizontalHeaderItem(3, item)
- self.corr_tableWidget.horizontalHeader().setStretchLastSection(True)
- self.corr_tableWidget.verticalHeader().setVisible(False)
- self.verticalLayout_3.addWidget(self.corr_tableWidget)
- self.stack.addTab(self.stackPage3, "")
- self.gridLayout.addWidget(self.stack, 0, 1, 2, 1)
+ self.reject_fit_checkBox = QtWidgets.QCheckBox(Dialog)
+ self.reject_fit_checkBox.setObjectName("reject_fit_checkBox")
+ self.gridLayout.addWidget(self.reject_fit_checkBox, 2, 0, 1, 1)
self.retranslateUi(Dialog)
self.stack.setCurrentIndex(0)
@@ -207,20 +203,6 @@ class Ui_Dialog(object):
def retranslateUi(self, Dialog):
_translate = QtCore.QCoreApplication.translate
Dialog.setWindowTitle(_translate("Dialog", "Fit results"))
- self.reject_fit_checkBox.setText(_translate("Dialog", "Reject this fit"))
- self.del_prev_checkBox.setText(_translate("Dialog", "Delete previous fits"))
- self.groupBox.setTitle(_translate("Dialog", "Output"))
- self.extrapolate_box.setToolTip(_translate("Dialog", "Extrapolates only main function"))
- self.extrapolate_box.setText(_translate("Dialog", "Extrapolate curves"))
- self.parameter_checkbox.setText(_translate("Dialog", "Plot parameter"))
- self.graph_checkBox.setText(_translate("Dialog", "New graph for parameter"))
- self.minx_line.setToolTip(_translate("Dialog", "Leave empty to start at lowest point"))
- self.minx_line.setPlaceholderText(_translate("Dialog", "min x"))
- self.maxx_line.setToolTip(_translate("Dialog", "Leave empty to start at highest point"))
- self.maxx_line.setPlaceholderText(_translate("Dialog", "max x"))
- self.numx_line.setPlaceholderText(_translate("Dialog", "# pts"))
- self.curve_checkbox.setText(_translate("Dialog", "Plot fit curve"))
- self.partial_checkBox.setText(_translate("Dialog", "Plot partial functions"))
self.logy_box.setText(_translate("Dialog", "logarithmic y axis"))
self.logx_box.setText(_translate("Dialog", "logarithmic x axis"))
self.stack.setTabText(self.stack.indexOf(self.stackPage1), _translate("Dialog", "Plot"))
@@ -234,5 +216,19 @@ class Ui_Dialog(object):
item = self.corr_tableWidget.horizontalHeaderItem(3)
item.setText(_translate("Dialog", "Partial Corr."))
self.stack.setTabText(self.stack.indexOf(self.stackPage3), _translate("Dialog", "Correlations"))
+ self.del_prev_checkBox.setText(_translate("Dialog", "Delete previous fits of this set"))
+ self.groupBox.setTitle(_translate("Dialog", "Output"))
+ self.extrapolate_box.setToolTip(_translate("Dialog", "Extrapolates only main function"))
+ self.extrapolate_box.setText(_translate("Dialog", "Extrapolate curves"))
+ self.parameter_checkbox.setText(_translate("Dialog", "Plot parameter"))
+ self.graph_checkBox.setText(_translate("Dialog", "New graph for parameter"))
+ self.minx_line.setToolTip(_translate("Dialog", "Leave empty to start at lowest point"))
+ self.minx_line.setPlaceholderText(_translate("Dialog", "min x"))
+ self.maxx_line.setToolTip(_translate("Dialog", "Leave empty to start at highest point"))
+ self.maxx_line.setPlaceholderText(_translate("Dialog", "max x"))
+ self.numx_line.setPlaceholderText(_translate("Dialog", "# pts"))
+ self.curve_checkbox.setText(_translate("Dialog", "Plot fit curve"))
+ self.partial_checkBox.setText(_translate("Dialog", "Plot partial functions"))
+ self.reject_fit_checkBox.setText(_translate("Dialog", "Reject this fit"))
from ..lib.forms import ElideComboBox
from pyqtgraph import GraphicsLayoutWidget
diff --git a/src/resources/_ui/fitresult.ui b/src/resources/_ui/fitresult.ui
index bd81cb1..acc394d 100644
--- a/src/resources/_ui/fitresult.ui
+++ b/src/resources/_ui/fitresult.ui
@@ -14,248 +14,7 @@
Fit results
- -
-
-
- 3
-
-
-
-
-
- Reject this fit
-
-
-
- -
-
-
- Delete previous fits
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Retry
-
-
-
- -
-
-
- Output
-
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 3
-
-
-
-
-
- Extrapolates only main function
-
-
- Extrapolate curves
-
-
-
- -
-
-
- Plot parameter
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- New graph for parameter
-
-
- true
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
- Leave empty to start at lowest point
-
-
- min x
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
- Leave empty to start at highest point
-
-
- max x
-
-
-
- -
-
-
- false
-
-
- # pts
-
-
-
- -
-
-
-
-
-
- Plot fit curve
-
-
- true
-
-
-
- -
-
-
- Plot partial functions
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::ScrollBarAsNeeded
-
-
- QAbstractScrollArea::AdjustIgnored
-
-
- QAbstractItemView::NoEditTriggers
-
-
- true
-
-
- QAbstractItemView::NoSelection
-
-
- 1
-
-
- false
-
-
- true
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 400
- 16777215
-
-
-
-
- 200
- 0
-
-
-
- QComboBox::AdjustToMinimumContentsLength
-
-
-
- -
+
-
@@ -416,6 +175,240 @@
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Retry
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::ScrollBarAsNeeded
+
+
+ QAbstractScrollArea::AdjustIgnored
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ true
+
+
+ QAbstractItemView::NoSelection
+
+
+ 1
+
+
+ false
+
+
+ true
+
+
+
+
+ -
+
+
+ Delete previous fits of this set
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Output
+
+
+
+ 3
+
+
+ 3
+
+
+ 3
+
+
+ 3
+
+
+ 3
+
+
-
+
+
+ Extrapolates only main function
+
+
+ Extrapolate curves
+
+
+
+ -
+
+
+ Plot parameter
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ New graph for parameter
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+ Leave empty to start at lowest point
+
+
+ min x
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+ Leave empty to start at highest point
+
+
+ max x
+
+
+
+ -
+
+
+ false
+
+
+ # pts
+
+
+
+ -
+
+
-
+
+
+ Plot fit curve
+
+
+ true
+
+
+
+ -
+
+
+ Plot partial functions
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 400
+ 16777215
+
+
+
+
+ 200
+ 0
+
+
+
+ QComboBox::AdjustToMinimumContentsLength
+
+
+
+ -
+
+
+ Reject this fit
+
+
+