IPKM/nmreval
14
2
Fork 1
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

remember header settings in ascii dialog; fixes #140

Browse Source
This commit is contained in:
Dominik Demuth 2023-11-13 18:03:57 +01:00
parent ae45ff2e55
commit f04cadf780
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui_qt/io/asciireader.py
View File

@ -62,6 +62,7 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
self.log_checkBox.setChecked(False) self.log_checkBox.setChecked(False)
self.set_gui() self.set_gui()
self.set_column_names(1)
self.skippy_checkbox.blockSignals(True) self.skippy_checkbox.blockSignals(True)
self.skippy_checkbox.setCheckState(QtCore.Qt.Unchecked) self.skippy_checkbox.setCheckState(QtCore.Qt.Unchecked)
@ -73,12 +74,14 @@ class QAsciiReader(QtWidgets.QDialog, Ui_ascii_reader):
for text in self.reader.header: for text in self.reader.header:
self.comment_textfield.appendPlainText(text) self.comment_textfield.appendPlainText(text)
tmp = self.line_spinBox.value()
if self.reader.header: if self.reader.header:
self.line_spinBox.setMaximum(len(self.reader.header)) self.line_spinBox.setMaximum(len(self.reader.header))
else: else:
self.line_spinBox.setValue(0) self.line_spinBox.setValue(0)
self.line_spinBox.setEnabled(False) self.line_spinBox.setEnabled(False)
self.show_preview(10) self.show_preview(10)
self.line_spinBox.setValue(tmp)
if self.reader.delays is not None: if self.reader.delays is not None:
set_string = ''.join(str(d) + '\n' for d in self.reader.delays) set_string = ''.join(str(d) + '\n' for d in self.reader.delays)

3
src/nmreval/fit/result.py
View File

@ -171,9 +171,6 @@ class FitResult(Points):
self._model_name = name self._model_name = name
self._func = func self._func = func
# manually overwrite name to avoid '/' splits
self.name = name
@staticmethod @staticmethod
def _prepare_names(parameter: dict, modelname: str): def _prepare_names(parameter: dict, modelname: str):
pattern = re.compile(r'(\\?\w[\\\w .-]*(?:_{[\w\\ .-]})?)(\(\d+\))') pattern = re.compile(r'(\\?\w[\\\w .-]*(?:_{[\w\\ .-]})?)(\(\d+\))')