From: Barış Metin Date: Wed, 8 Sep 2010 17:00:58 +0000 (+0200) Subject: add refresh link X-Git-Tag: sface-0.1-1~94 X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=70514dcdd9d918c574b1589aef5c9ab9b0619f2a;ds=sidebyside add refresh link --- diff --git a/sfadata.py b/sfadata.py index 43de038..e5cf224 100644 --- a/sfadata.py +++ b/sfadata.py @@ -103,6 +103,7 @@ class SfaData: self._trace=time.time() if self.SFAUI_VERBOSE: print time.strftime('%M:%S'),'Invoking',' '.join(command) + def trace_end (self): if self.SFAUI_VERBOSE: print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),'Done' diff --git a/sfamainscreen.py b/sfamainscreen.py index 5e7bbb8..d58335b 100644 --- a/sfamainscreen.py +++ b/sfamainscreen.py @@ -1,6 +1,8 @@ -from PyQt4.QtCore import Qt, QString -from PyQt4.QtGui import QWidget, QLabel, QTreeView, QStandardItemModel, QVBoxLayout +from PyQt4.QtCore import Qt, QString, SIGNAL +from PyQt4.QtGui import QWidget, QLabel, QTreeView, QStandardItemModel, QVBoxLayout, QSizePolicy + +from sfa.util.rspecHelper import RSpec from sfadata import SfaData from sfascreen import SfaScreen @@ -13,6 +15,7 @@ class SliceWidget(QWidget): self.nodeView = QTreeView(self) self.nodeView.setRootIsDecorated(False) self.nodeView.setAlternatingRowColors(True) + self.nodeView.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) self.nodeModel = QStandardItemModel(0, 2, self) self.nodeModel.setHeaderData(0, Qt.Horizontal, QString("Testbed")) @@ -20,19 +23,26 @@ class SliceWidget(QWidget): self.nodeView.setModel(self.nodeModel) + label = QLabel("Refresh", self) + label.setScaledContents(False) + layout = QVBoxLayout() + layout.addWidget(label) layout.addWidget(self.nodeView) self.setLayout(layout) + self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) - self.refresh() - - def refresh(self): + self.connect(label, SIGNAL('linkActivated(QString)'), + self.refresh) + + def refresh(self, link=None): data = SfaData() - rspec = data.getRSpecFromSM() + xml = data.getRSpecFromSM() + rspec = RSpec(xml) nodes = rspec.get_node_list() for n in nodes: - print n + self.addNode("TestBedName", n) def addNode(self, testbed, hostname): self.nodeModel.insertRow(0)