add refresh link

diff --git a/sfadata.py b/sfadata.py
index 43de038..e5cf224 100644 (file)
--- 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)
         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'
     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 (file)
--- 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
 
 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 = 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"))
 
         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)
 
 
         self.nodeView.setModel(self.nodeModel)
 

+        label = QLabel("<a href='refresh'>Refresh</a>", self)
+        label.setScaledContents(False)
+

         layout = QVBoxLayout()
         layout = QVBoxLayout()

+        layout.addWidget(label)

         layout.addWidget(self.nodeView)
         self.setLayout(layout)
         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()
         data = SfaData()

-        rspec = data.getRSpecFromSM()
+        xml = data.getRSpecFromSM()
+        rspec = RSpec(xml)

         nodes = rspec.get_node_list()
         
         for n in nodes:
         nodes = rspec.get_node_list()
         
         for n in nodes:

-            print n
+            self.addNode("TestBedName", n)

 
     def addNode(self, testbed, hostname):
         self.nodeModel.insertRow(0)
 
     def addNode(self, testbed, hostname):
         self.nodeModel.insertRow(0)