From 595c32783cdabae7210e5e092b4b543b948db648 Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Fri, 3 Mar 2023 13:33:34 +0100 Subject: [PATCH] Add reconnect Action * add reconnect method to QSECNode * Rename File Menu to Node * Add Button to 'Node' Menu Fixes: #4687 Change-Id: I04ee55ddbc13253255f0099a9f4d2f8d4d0da77c Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30566 Tested-by: Jenkins Automated Tests Reviewed-by: Georg Brandl Reviewed-by: Alexander Zaft --- frappy/gui/mainwindow.py | 8 ++++++++ frappy/gui/ui/mainwin.ui | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/frappy/gui/mainwindow.py b/frappy/gui/mainwindow.py index 640cb6f..bb3a9e5 100644 --- a/frappy/gui/mainwindow.py +++ b/frappy/gui/mainwindow.py @@ -61,6 +61,10 @@ class QSECNode(QObject): conn.register_callback(None, self.updateEvent, self.nodeStateChange, self.unhandledMessage) # provide methods from old baseclient for making other gui code work + def reconnect(self): + if self.conn.online: + self.conn.disconnect(shutdown=False) + self.conn.connect() def getParameters(self, module): return self.modules[module]['parameters'] @@ -202,6 +206,10 @@ class MainWindow(QMainWindow): QMessageBox.critical(self.parent(), 'Connecting to %s failed!' % host, str(e)) + @pyqtSlot() + def on_actionReconnect_triggered(self): + self.tab.currentWidget().getSecNode().reconnect() + def on_actionDetailed_View_toggled(self, toggled): self._rebuildAdvanced(toggled) diff --git a/frappy/gui/ui/mainwin.ui b/frappy/gui/ui/mainwin.ui index 09a340c..05d8084 100644 --- a/frappy/gui/ui/mainwin.ui +++ b/frappy/gui/ui/mainwin.ui @@ -27,7 +27,7 @@ - File + Node @@ -41,6 +41,7 @@ + @@ -143,6 +144,14 @@ djhfs + + + Reconnect + + + Ctrl+R + +