X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=32d984901fccb4c4b05ad227426d0e5ea13d1c5e;hp=2b8b88f59fe7ec059d826817d5de8b6f1802744f;hb=a8f5d8a8a1fc3baf55c85d8af3243944a2dca26c;hpb=cc3f0c16959d99ed2d150242ba089ba8d83a5dcd
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 2b8b88f..32d9849 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -14,9 +14,33 @@ class NodeView(QTreeView):
QTreeView.__init__(self, parent)
self.setItemsExpandable(True)
- self.setRootIsDecorated(False)
+ 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:]
+
+ rect = option.rect
+ fm = QFontMetrics(option.font)
+ w = fm.width(QString(data))
+ rect.setWidth(w)
+
+ painter.save()
+ painter.fillRect(rect, 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):
@@ -24,6 +48,13 @@ class TreeItem:
self.itemData = data
self.childItems = []
+ def clear(self):
+ for child in self.childItems:
+ child.clear()
+ del child
+ del self.childItems
+ self.childItems = []
+
def appendChild(self, child):
self.childItems.append(child)
@@ -34,7 +65,6 @@ class TreeItem:
return len(self.childItems)
def columnCount(self):
- print len(self.itemData)
return len(self.itemData)
def data(self, column):
@@ -42,9 +72,11 @@ class TreeItem:
def row(self):
if (self.parentItem):
- for i in self.parentItem.childItems:
- if i is self:
- return i
+ try:
+ return self.parentItem.childItems.index(self)
+ except ValueError:
+ return 0
+ return 0
def parent(self):
return self.parentItem
@@ -54,17 +86,19 @@ class TreeItem:
class NodeModel(QAbstractItemModel):
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
- self.rootItem = TreeItem([QString("Testbed"), QString("Hostname")])
+ self.__initRoot()
+
+ def clear(self):
+ self.rootItem.clear()
+ self.__initRoot()
- def addToRoot(self, item):
- self.rootItem.appendChild(item)
+ def __initRoot(self):
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
def columnCount(self, parent):
if parent.isValid():
- print "toto"
- parent.internalPointer().columnCount()
+ return parent.internalPointer().columnCount()
else:
- print "lala"
return self.rootItem.columnCount()
def data(self, index, role):
@@ -82,6 +116,11 @@ class NodeModel(QAbstractItemModel):
return self.rootItem.data(section)
return QVariant()
+ def flags(self, index):
+ if not index.isValid():
+ return 0
+ return Qt.ItemIsEnabled | Qt.ItemIsSelectable # | Qt.ItemIsEditable
+
def index(self, row, column, parent):
if not self.hasIndex(row, column, parent):
return QModelIndex()
@@ -108,10 +147,10 @@ class NodeModel(QAbstractItemModel):
if not parentItem:
return QModelIndex()
- if parentItem == self.rootItem:
+ if parentItem is self.rootItem:
return QModelIndex()
- return self.createIndex(parentItem.row(), 0, parentItem);
+ return self.createIndex(parentItem.row(), 0, parentItem)
def rowCount(self, parent):
if parent.column() > 0:
@@ -130,11 +169,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("Refresh", self)
+ refresh = QLabel("Update Slice Data", self)
refresh.setScaledContents(False)
slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
slicename.setScaledContents(False)
@@ -144,52 +179,78 @@ 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("Slice not set yet!")
+ self.parent().setStatus("Slice not set yet!", 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("Slice data updated.")
+ self.parent().setStatus("Slice data updated.", 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("")])
+ 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)])
+ 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)
- self.nodeModel.addToRoot(networkItem)
+ 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):
@@ -197,4 +258,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")