linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

secop-gui: ask for reconnect

Browse Source 
ask whether to reconnect when a connection is lost

Change-Id: I5928fabb7393bbf97a557b1ce1d85113891c96c9
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21865
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2019-11-22 13:09:43 +01:00
parent c0c926d9d7
commit b2f730e53e
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
secop/gui/mainwindow.py
View File

@ -64,7 +64,7 @@ class QSECNode(SECNode, QObject):
class MainWindow(QMainWindow): class MainWindow(QMainWindow):
showMessageSignal = pyqtSignal(str, str) askReopenSignal = pyqtSignal(str, str)
def __init__(self, parent=None): def __init__(self, parent=None):
super(MainWindow, self).__init__(parent) super(MainWindow, self).__init__(parent)
@ -83,7 +83,7 @@ class MainWindow(QMainWindow):
self._paramCtrls = {} self._paramCtrls = {}
self._topItems = {} self._topItems = {}
self._currentWidget = self.splitter.widget(1).layout().takeAt(0) self._currentWidget = self.splitter.widget(1).layout().takeAt(0)
self.showMessageSignal.connect(self.showMessage) self.askReopenSignal.connect(self.askReopen)
# add localhost (if available) and SEC nodes given as arguments # add localhost (if available) and SEC nodes given as arguments
args = sys.argv[1:] args = sys.argv[1:]
@ -132,15 +132,18 @@ class MainWindow(QMainWindow):
def _removeSubTree(self, toplevel_item): def _removeSubTree(self, toplevel_item):
self.treeWidget.invisibleRootItem().removeChild(toplevel_item) self.treeWidget.invisibleRootItem().removeChild(toplevel_item)
def _nodeDisconnected_callback(self, host): def _nodeDisconnected_callback(self, nodename, host):
node = self._nodes[host] node = self._nodes[nodename]
self._removeSubTree(self._topItems[node]) self._removeSubTree(self._topItems[node])
del self._topItems[node] del self._topItems[node]
node.quit() node.quit()
self.showMessageSignal.emit('connection closed', 'connection to %s closed' % host) self.askReopenSignal.emit(nodename, host)
def showMessage(self, title, text): def askReopen(self, nodename, host):
QMessageBox.warning(self.parent(), title, text) result = QMessageBox.question(self.parent(), 'connection closed',
'connection to %s closed, reopen?' % nodename)
if result == QMessageBox.Yes:
self._addNode(host)
def _addNode(self, host): def _addNode(self, host):
@ -152,12 +155,12 @@ class MainWindow(QMainWindow):
node = QSECNode({'host': host, 'port': port}, parent=self) node = QSECNode({'host': host, 'port': port}, parent=self)
host = '%s:%d' % (host, port) host = '%s:%d' % (host, port)
host = '%s (%s)' % (node.equipmentId, host) nodename = '%s (%s)' % (node.equipmentId, host)
self._nodes[host] = node self._nodes[nodename] = node
node.register_shutdown_callback(self._nodeDisconnected_callback, host) node.register_shutdown_callback(self._nodeDisconnected_callback, nodename, host)
# fill tree # fill tree
nodeItem = QTreeWidgetItem(None, [host], ITEM_TYPE_NODE) nodeItem = QTreeWidgetItem(None, [nodename], ITEM_TYPE_NODE)
for module in sorted(node.modules): for module in sorted(node.modules):
moduleItem = QTreeWidgetItem(nodeItem, [module], ITEM_TYPE_MODULE) moduleItem = QTreeWidgetItem(nodeItem, [module], ITEM_TYPE_MODULE)