X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fscreens%2Fmainscreen.py;h=96ec7eda567c58d81d089761bf39febdf31279a0;hb=8cfbfbd5c19fcab179e037efacd608e3b4c64b6e;hp=4eb4a202b93bce03252dc74f5e7687b3deba8991;hpb=20a9a25befdeade85df0378d8bc2bec36ffcd8b0;p=sface.git

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 4eb4a20..96ec7ed 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -17,6 +17,7 @@ class NodeView(QTreeView):
         self.setRootIsDecorated(True)
         self.setAlternatingRowColors(True)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.setAttribute(Qt.WA_MacShowFocusRect, 0)
 
 class TreeItem:
     def __init__(self, data, parent=None):
@@ -25,7 +26,6 @@ class TreeItem:
         self.childItems = []
 
     def clear(self):
-        print "TODO: TreeItem.clear()"
         for child in self.childItems:
             child.clear()
             del child
@@ -146,10 +146,6 @@ class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 
-        self.nodeView = NodeView(self)
-        self.nodeModel = NodeModel(self)
-        self.nodeView.setModel(self.nodeModel)
-
         refresh = QLabel("<a href='refresh'>Refresh</a>", self)
         refresh.setScaledContents(False)
         slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
@@ -160,40 +156,53 @@ class SliceWidget(QWidget):
         hlayout.addStretch()
         hlayout.addWidget(refresh)
 
+        self.nodeView = NodeView(self)
+        self.nodeModel = NodeModel(self)
+        self.nodeView.setModel(self.nodeModel)
+
+        submit = QPushButton("Submit", self)
+        submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
+
         layout = QVBoxLayout()
         layout.addLayout(hlayout)
         layout.addWidget(self.nodeView)
+        layout.addWidget(submit, 0, Qt.AlignRight)
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
         self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
+        self.connect(submit, SIGNAL('clicked()'), self.submit)
 
         rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
         if os.path.exists(rspec_file):
             self.updateView()
+
+    def submit(self):
+        self.parent().setStatus("TODO: Submit not implemented yet!", 3000)
         
     def readSliceRSpec(self):
-        rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
+        rspec_file = config.getSliceRSpecFile()
         xml = open(rspec_file).read()
         return xml
 
     def refresh(self, link=None):
         if not config.getSlice():
-            self.parent().setStatus("<font color='red'>Slice not set yet!</font>")
+            self.parent().setStatus("<font color='red'>Slice not set yet!</font>", timeout=None)
             return
 
         self.process = SfiProcess()
         outfile = self.process.getRSpecFromSM()
-        self.parent().setStatus("Updating slice data. This may take some time...")
+        self.parent().setStatus("Updating slice data. This may take some time...", timeout=None)
         
         self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
 
     def refreshFinished(self):
         del self.process
-        self.parent().setStatus("<font color='green'>Slice data updated.</font>")
+        self.parent().setStatus("<font color='green'>Slice data updated.</font>", timeout=5000)
         self.updateView()
 
     def updateView(self):
+        self.nodeModel.clear()
         rspec_string = self.readSliceRSpec()
         networks = rspec_get_networks(rspec_string)
 
@@ -201,7 +210,14 @@ class SliceWidget(QWidget):
             networkItem = TreeItem([QString(network), QString("")], self.nodeModel.rootItem)
 
             all_nodes = rspec_get_nodes_from_network(rspec_string, network)
-            for node in all_nodes:
+            sliver_nodes = rspec_get_sliver_nodes_from_network(rspec_string, network)
+            available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
+
+            for node in sliver_nodes:
+                nodeItem = TreeItem([QString(""), QString("%s (selected)" % node)], networkItem)
+                networkItem.appendChild(nodeItem)
+
+            for node in available_nodes:
                 nodeItem = TreeItem([QString(""), QString(node)], networkItem)
                 networkItem.appendChild(nodeItem)