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

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 4eb4a20..c3908e1 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -5,7 +5,7 @@ from PyQt4.QtGui import *
 
 from sfa.util.rspecHelper import RSpec
 from sface.sfahelper import *
-from sface.sficonfig import config
+from sface.config import config
 from sface.sfiprocess import SfiProcess
 from sface.screens.sfascreen import SfaScreen
 
@@ -17,6 +17,37 @@ class NodeView(QTreeView):
         self.setRootIsDecorated(True)
         self.setAlternatingRowColors(True)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.setAttribute(Qt.WA_MacShowFocusRect, 0)
+
+class ItemDelegate(QStyledItemDelegate):
+    def __init__(self, parent):
+        QStyledItemDelegate.__init__(self)
+
+    def paint(self, painter, option, index):
+        data = "%s" % index.data().toString()
+
+        if data.startswith("*"): # already in the sliver
+            data = " %s " % data[1:]
+
+            fm = QFontMetrics(option.font)
+            rect = option.rect
+            rect.setWidth(fm.width(QString(data)))
+            rect.setHeight(rect.height() - 2)
+            rect.setX(rect.x() + 1)
+            x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
+
+            path = QPainterPath()
+            path.addRoundedRect(x, y, w, h, 4, 4)
+
+            painter.save()
+            painter.setRenderHint(QPainter.Antialiasing)
+            painter.drawRoundedRect(rect, 4, 4)
+            painter.fillPath(path, QColor.fromRgb(0, 250, 0))
+            painter.setPen(QColor.fromRgb(0, 0, 0))
+            painter.drawText(option.rect, 0, QString(data))
+            painter.restore()
+        else: # others, fall back to default view
+            QStyledItemDelegate.paint(self, painter, option, index)
 
 class TreeItem:
     def __init__(self, data, parent=None):
@@ -25,7 +56,6 @@ class TreeItem:
         self.childItems = []
 
     def clear(self):
-        print "TODO: TreeItem.clear()"
         for child in self.childItems:
             child.clear()
             del child
@@ -70,7 +100,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():
@@ -96,7 +126,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):
@@ -146,68 +176,89 @@ class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 
+        slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
+        slicename.setScaledContents(False)
+
         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)
-        slicename.setScaledContents(False)
+        refresh = QPushButton("Update Slice Data", self)
+        refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
+        submit = QPushButton("Submit", self)
+        submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
 
         hlayout = QHBoxLayout()
-        hlayout.addWidget(slicename)
+        hlayout.addWidget(refresh, 0, Qt.AlignLeft)
         hlayout.addStretch()
-        hlayout.addWidget(refresh)
+        hlayout.addWidget(submit, 0, Qt.AlignRight)
 
         layout = QVBoxLayout()
-        layout.addLayout(hlayout)
+        layout.addWidget(slicename)
         layout.addWidget(self.nodeView)
+        layout.addLayout(hlayout)
+
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-        self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
+        self.connect(refresh, SIGNAL('clicked()'), 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):
+    def refresh(self):
         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)
 
         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("*%s" % node), QString("Implement Checkbox")], networkItem)
+                networkItem.appendChild(nodeItem)
+
+            for node in available_nodes:
+                nodeItem = TreeItem([QString(""), QString(node), QString("Implement Checkbox")], networkItem)
                 networkItem.appendChild(nodeItem)
 
             self.nodeModel.rootItem.appendChild(networkItem)
 
         self.nodeView.expandAll()
+        self.nodeView.resizeColumnToContents(1)
+
+        self.delegate = ItemDelegate(self)
+        self.nodeView.setItemDelegateForColumn(1, self.delegate)
 
 
 class MainScreen(SfaScreen):
@@ -215,4 +266,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")