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

bug-fixer (#40)

Browse Source 
fixes #32, #34, #39

Co-authored-by: Dominik Demuth <dominik.demuth@physik.tu-darmstadt.de>
Reviewed-on: #40
This commit is contained in:
Dominik Demuth
2023-04-07 13:45:28 +00:00
parent 43285b4bd5
commit 6b71de8265
7 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui_qt/main/mainwindow.py
View File

@ -76,8 +76,8 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
self.look_for_update()
self.__timer = QtCore.QTimer()
self.__savepath = config_paths() / f'{datetime.datetime.now().strftime("%Y-%m-%d_%H%M%S")}.nmr'
self.__timer.start(0.2*60*1000) # every three minutese
self.__backup_path = config_paths() / f'{datetime.datetime.now().strftime("%Y-%m-%d_%H%M%S")}.nmr'
self.__timer.start(3*60*1000) # every three minutese
self.__timer.timeout.connect(self._autosave)
def _init_gui(self):
@ -146,7 +146,7 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
self.actionUndo.setIcon(icon)
self.menuData.insertAction(self.actionRedo, self.actionUndo)
# # self.actionSave.triggered.connect(lambda: self.management.save('/autohome/dominik/nmreval/testdata/test.nmr', ''))
# self.actionSave.triggered.connect(lambda: self.management.save('/autohome/dominik/nmreval/testdata/test.nmr', ''))
# self.actionSave.triggered.connect(self.save)
self.action_save_fit_parameter.triggered.connect(self.save_fit_parameter)
self.ac_group2.triggered.connect(self.change_fit_limits)
@ -269,6 +269,7 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
selected_filter = save_dialog.selectedNameFilter()
if savefile is not None:
self.path = savefile.parent
use_underscore = save_dialog.checkBox.isChecked()
self.management.save(savefile, selected_filter, strip_spaces=use_underscore)
@ -1028,7 +1029,7 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
write_state({'History': {'recent path': str(self.path)}})
# remove backup file when closing
self.__savepath.unlink(missing_ok=True)
self.__backup_path.unlink(missing_ok=True)
super().close()
@ -1056,5 +1057,5 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
def _autosave(self):
# TODO better separate thread may it takes some time to save
self.status.setText('Autosave...')
NMRWriter(self.management.graphs, self.management.data).export(self.__savepath)
NMRWriter(self.management.graphs, self.management.data).export(self.__backup_path)
self.status.setText('')