X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=4b636bc0249dd09dfe2e93eec3634200d8afe929;hp=575d5f9183fa3d2c94ee355d8592c46081e12062;hb=e5eb62ef022ab41be7f2eb0b3ac8723874d1601a;hpb=3e48f23eafc944bf3ed409623f3fa6243a60bf4c

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 575d5f9..4b636bc 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):
@@ -69,7 +70,7 @@ class NodeModel(QAbstractItemModel):
         self.__initRoot()
 
     def __initRoot(self):
-        self.rootItem = TreeItem([QString("Testbed"), QString("Hostname")])
+        self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
 
     def columnCount(self, parent):
         if parent.isValid():
@@ -95,7 +96,7 @@ class NodeModel(QAbstractItemModel):
     def flags(self, index):
         if not index.isValid():
             return 0
-        return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+        return Qt.ItemIsEnabled | Qt.ItemIsSelectable # | Qt.ItemIsEditable
 
     def index(self, row, column, parent):
         if not self.hasIndex(row, column, parent):
@@ -145,11 +146,7 @@ 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 = QLabel("<a href='refresh'>Update Slice Data</a>", self)
         refresh.setScaledContents(False)
         slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
         slicename.setScaledContents(False)
@@ -159,37 +156,49 @@ 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):
@@ -198,16 +207,24 @@ class SliceWidget(QWidget):
         networks = rspec_get_networks(rspec_string)
 
         for network in networks:
-            networkItem = TreeItem([QString(network), QString("")], self.nodeModel.rootItem)
+            networkItem = TreeItem([QString(network), QString(""), QString("")], self.nodeModel.rootItem)
 
             all_nodes = rspec_get_nodes_from_network(rspec_string, network)
-            for node in all_nodes:
-                nodeItem = TreeItem([QString(""), QString(node)], networkItem)
+            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(node), QString("True")], networkItem)
+                networkItem.appendChild(nodeItem)
+
+            for node in available_nodes:
+                nodeItem = TreeItem([QString(""), QString(node), QString("False")], networkItem)
                 networkItem.appendChild(nodeItem)
 
             self.nodeModel.rootItem.appendChild(networkItem)
 
         self.nodeView.expandAll()
+        self.nodeView.resizeColumnToContents(1)
 
 
 class MainScreen(SfaScreen):
@@ -215,4 +232,4 @@ class MainScreen(SfaScreen):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
-        self.init(slice, "Main Window", "PlanetLab Federation GUI")
+        self.init(slice, "Main Window", "OneLab Federation GUI")