Merge branch 'main' into fit_constraints

# Conflicts:
#	src/gui_qt/fit/fit_forms.py
#	src/gui_qt/main/management.py
#	src/nmreval/fit/minimizer.py

src/gui_qt/fit/fit_forms.py

@@ -6,12 +6,14 @@ from ..Qt import QtCore, QtWidgets, QtGui
 from .._py.fitmodelwidget import Ui_FitParameter
 from .._py.save_fitmodel_dialog import Ui_SaveDialog
 from ..lib.iconloading import get_icon
+from ..lib.tables import TableWidget
 
 
 class FitModelWidget(QtWidgets.QWidget, Ui_FitParameter):
     value_requested = QtCore.pyqtSignal(object)
     value_changed = QtCore.pyqtSignal(str)
     state_changed = QtCore.pyqtSignal()
+    replace_single_value = QtCore.pyqtSignal(object)
 
     def __init__(self, label: str = 'Fitparameter', parent=None, fixed: bool = False):
         super().__init__(parent)
@@ -30,6 +32,7 @@ class FitModelWidget(QtWidgets.QWidget, Ui_FitParameter):
         self.global_checkbox.stateChanged.connect(lambda: self.state_changed.emit())
         self.parameter_line.editingFinished.connect(self.update_parameter)
         self.parameter_line.values_requested.connect(lambda: self.value_requested.emit(self))
+        self.parameter_line.replace_single_values.connect(lambda: self.replace_single_value.emit(None))
         self.parameter_line.editingFinished.connect(lambda: self.value_changed.emit(self.parameter_line.text()))
         self.fixed_check.toggled.connect(self.set_fixed)
 
@@ -311,7 +314,7 @@ class FitModelTree(QtWidgets.QTreeWidget):
             return funcs
 
 
-class FitTableWidget(QtWidgets.QTableWidget):
+class FitTableWidget(TableWidget):
     def __init__(self, parent=None):
         super().__init__(parent=parent)
 

src/gui_qt/fit/fit_parameter.py

@@ -78,6 +78,7 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
             widgt.state_changed.connect(self.make_global)
             widgt.value_requested.connect(self.look_for_value)
             widgt.value_changed.connect(self.change_global_parameter)
+            widgt.replace_single_value.connect(self.delete_single_parameter)
 
             self.global_parameter.append(widgt)
             self.scrollwidget.layout().addWidget(widgt)
@@ -150,6 +151,13 @@ class QFitParameterWidget(QtWidgets.QWidget, Ui_FormFit):
         if value is None:
             self.change_data(self.comboBox.currentIndex())
 
+    def delete_single_parameter(self):
+        idx = self.global_parameter.index(self.sender())
+        for i in range(self.comboBox.count()):
+            set_id = self.comboBox.itemData(i)
+            self.data_values[set_id][idx] = None
+        self.change_data(self.comboBox.currentIndex())
+
     def change_single_choice(self, _, value, sender=None):
         if sender is None:
             sender = self.sender()
@@ -298,7 +306,8 @@ class ParameterSingleWidget(QtWidgets.QWidget):
 
         self._name = name
         self.label.setText(convert(name))
-        self.label.setToolTip('IIf this is bold then this parameter is only for this data. otherwise the general parameter is used and displayed')
+        self.label.setToolTip('If this is bold then this parameter is only for this data. '
+                              '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)

src/gui_qt/fit/function_creation_dialog.py

@@ -14,7 +14,7 @@ from gui_qt.lib.namespace import QNamespaceWidget
 
 __all__ = ['QUserFitCreator']
 
-validator = QtGui.QRegExpValidator(QtCore.QRegExp('[A-Za-z]\S*'))
+validator = QtGui.QRegExpValidator(QtCore.QRegExp('[_A-Za-z][_A-Za-z0-9]*'))
 pattern = re.compile(r'def func\(.*\):', flags=re.MULTILINE)
 
 
@@ -145,6 +145,7 @@ class QUserFitCreator(QtWidgets.QDialog, Ui_Dialog):
         self.classCreated.emit()
         super().accept()
 
+
 class KwargsWidget(QtWidgets.QWidget):
     Changed = QtCore.pyqtSignal()
 
@@ -209,7 +210,7 @@ class KwargsWidget(QtWidgets.QWidget):
     def get_strings(self) -> str:
         kwargs = []
         if self.use_nuclei.isChecked():
-            kwargs.append("(r'\gamma', 'nucleus', gamma)")
+            kwargs.append(r"(r'\gamma', 'nucleus', gamma)")
 
         for i in range(self.choices.count()):
             kwargs.append(self.choices.widget(i).get_strings())
@@ -300,7 +301,7 @@ class ChoiceWidget(QtWidgets.QWidget):
     def get_strings(self) -> str:
         opts = []
         for i in range(self.table.rowCount()):
-            name = self.table.item(i, 0).text()
+            name = self.table.cellWidget(i, 0).text()
             val = self._make_value(i)
             opts.append(f'{name!r}: {val!r}')
 

src/gui_qt/fit/result.py

@@ -3,6 +3,7 @@ from math import isnan
 from pyqtgraph import mkBrush, mkPen
 
 from nmreval.utils.text import convert
+from ..lib.graph_items import logTickValues
 
 from ..lib.utils import RdBuCMap
 from ..Qt import QtWidgets, QtGui, QtCore
@@ -33,8 +34,12 @@ class QFitResult(QtWidgets.QDialog, Ui_Dialog):
         self.graph_opts = {}
         self.last_idx = None
 
-        self.resid_plot = self.graphicsView.addPlot(row=0, col=0, title='Residual')
         self.fit_plot = self.graphicsView.addPlot(row=1, col=0, title='Fit')
+        self.resid_plot = self.graphicsView.addPlot(row=0, col=0, title='Residual')
+
+        for orient in ['top', 'bottom', 'left', 'right']:
+            self.fit_plot.getAxis(orient).logTickValues = logTickValues
+            self.resid_plot.getAxis(orient).logTickValues = logTickValues
 
         self.graphicsView.ci.layout.setRowStretchFactor(0, 1)
         self.graphicsView.ci.layout.setRowStretchFactor(1, 2)