Merge branch 'more_bugs'

This commit is contained in:
Dominik Demuth
2023-04-16 14:17:36 +02:00
11 changed files with 239 additions and 225 deletions

View File

@@ -254,6 +254,7 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
@QtCore.pyqtSlot(name='on_actionOpen_FC_triggered')
def read_fc(self):
reader = QFCReader(path=self.path, parent=self)
reader.add_graphs(self.management.graphs.list())
reader.data_read.connect(self.management.add_new_data)
reader.exec()
@@ -347,7 +348,7 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
@QtCore.pyqtSlot(str)
def remove_graph(self, gid: str):
self.datawidget.remove_item(gid)
self.datawidget.remove_item([gid])
val_figure = self.valuewidget.connected_figure
self.valuewidget.remove_graph()
@@ -732,10 +733,11 @@ class NMRMainWindow(QtWidgets.QMainWindow, Ui_BaseWindow):
self.datawidget.set_name(sid, self.management[sid].name)
@QtCore.pyqtSlot(str)
def delete_data(self, sid):
if self.valuewidget.shown_set == sid:
self.tabWidget.setCurrentIndex(0)
@QtCore.pyqtSlot(list)
def delete_data(self, sid: list[str]):
for key in sid:
if self.valuewidget.shown_set == key:
self.tabWidget.setCurrentIndex(0)
self.datawidget.remove_item(sid)