X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=2b8b88f59fe7ec059d826817d5de8b6f1802744f;hp=9b834fab6832aa8fbeaa7c128a95416de735c7c4;hb=cc3f0c16959d99ed2d150242ba089ba8d83a5dcd;hpb=7e1529e1c299394465308aebaed5ffb755d1007a
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 9b834fa..2b8b88f 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -9,21 +9,129 @@ from sface.sficonfig import config
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
+class NodeView(QTreeView):
+ def __init__(self, parent):
+ QTreeView.__init__(self, parent)
-class SliceWidget(QWidget):
- def __init__(self, parent=None):
- QWidget.__init__(self, parent)
+ self.setItemsExpandable(True)
+ self.setRootIsDecorated(False)
+ self.setAlternatingRowColors(True)
+ self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+class TreeItem:
+ def __init__(self, data, parent=None):
+ self.parentItem = parent
+ self.itemData = data
+ self.childItems = []
+
+ def appendChild(self, child):
+ self.childItems.append(child)
+
+ def child(self, row):
+ return self.childItems[row]
+
+ def childCount(self):
+ return len(self.childItems)
+
+ def columnCount(self):
+ print len(self.itemData)
+ return len(self.itemData)
+
+ def data(self, column):
+ return self.itemData[column]
+
+ def row(self):
+ if (self.parentItem):
+ for i in self.parentItem.childItems:
+ if i is self:
+ return i
+
+ def parent(self):
+ return self.parentItem
+
+
+
+class NodeModel(QAbstractItemModel):
+ def __init__(self, parent):
+ QAbstractItemModel.__init__(self, parent)
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname")])
+
+ def addToRoot(self, item):
+ self.rootItem.appendChild(item)
+
+ def columnCount(self, parent):
+ if parent.isValid():
+ print "toto"
+ parent.internalPointer().columnCount()
+ else:
+ print "lala"
+ return self.rootItem.columnCount()
+
+ def data(self, index, role):
+ if not index.isValid():
+ return QVariant()
+
+ if role != Qt.DisplayRole:
+ return QVariant()
+
+ item = index.internalPointer()
+ return item.data(index.column())
- self.nodeView = QTreeView(self)
- self.nodeView.setRootIsDecorated(False)
- self.nodeView.setAlternatingRowColors(True)
- self.nodeView.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+ def headerData(self, section, orientation, role):
+ if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ return self.rootItem.data(section)
+ return QVariant()
- self.nodeModel = QStandardItemModel(0, 3, self)
- self.nodeModel.setHeaderData(0, Qt.Horizontal, QString("Testbed"))
- self.nodeModel.setHeaderData(1, Qt.Horizontal, QString("Hostname"))
- self.nodeModel.setHeaderData(2, Qt.Horizontal, QString("IsIn"))
+ def index(self, row, column, parent):
+ if not self.hasIndex(row, column, parent):
+ return QModelIndex()
+ parentItem = None
+ if not parent.isValid():
+ parentItem = self.rootItem
+ else:
+ parentItem = parent.internalPointer()
+
+ childItem = parentItem.child(row)
+ if childItem:
+ return self.createIndex(row, column, childItem)
+ else:
+ return QModelIndex()
+
+ def parent(self, index):
+ if not index.isValid():
+ return QModelIndex()
+
+ childItem = index.internalPointer()
+ parentItem = childItem.parent()
+
+ if not parentItem:
+ return QModelIndex()
+
+ if parentItem == self.rootItem:
+ return QModelIndex()
+
+ return self.createIndex(parentItem.row(), 0, parentItem);
+
+ def rowCount(self, parent):
+ if parent.column() > 0:
+ return 0
+
+ parentItem = None
+ if not parent.isValid():
+ parentItem = self.rootItem
+ else:
+ parentItem = parent.internalPointer()
+
+ return parentItem.childCount()
+
+
+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)
@@ -31,8 +139,6 @@ class SliceWidget(QWidget):
slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
slicename.setScaledContents(False)
- self.status = QLabel("")
-
hlayout = QHBoxLayout()
hlayout.addWidget(slicename)
hlayout.addStretch()
@@ -41,7 +147,6 @@ class SliceWidget(QWidget):
layout = QVBoxLayout()
layout.addLayout(hlayout)
layout.addWidget(self.nodeView)
- layout.addWidget(self.status)
self.setLayout(layout)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
@@ -58,55 +163,38 @@ class SliceWidget(QWidget):
def refresh(self, link=None):
if not config.getSlice():
- self.status.setText("Slice not set yet!")
+ self.parent().setStatus("Slice not set yet!")
return
self.process = SfiProcess()
outfile = self.process.getRSpecFromSM()
- self.status.setText("Updating slice data. This may take some time...")
+ self.parent().setStatus("Updating slice data. This may take some time...")
self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
def refreshFinished(self):
del self.process
- self.status.setText("Slice data updated.")
+ self.parent().setStatus("Slice data updated.")
self.updateView()
def updateView(self):
rspec_string = self.readSliceRSpec()
networks = rspec_get_networks(rspec_string)
- networks.reverse()
for network in networks:
-# nodes = self.rspec_get_sliver_nodes_from_network(rspec_string, network)
-# for node in nodes: self.addNode(network, node, True)
-# nodes = self.rspec_get_other_nodes_from_network(rspec_string, network)
-# for node in nodes: self.addNode(network, node, False)
- # hacky - i'm just gettin used to this xml navigation stuff
- xml_nodes = rspec_get_xml_nodes_from_network(rspec_string, network)
- from lxml import etree
- # addNode inserts before, so let's start with the ones that are not in
- for xml_node in xml_nodes:
- if not xml_node.xpath('sliver'):
- self.addNode(network, xml_node.xpath('hostname/text()')[0],False)
- for xml_node in xml_nodes:
- if xml_node.xpath('sliver'):
- self.addNode(network, xml_node.xpath('hostname/text()')[0],True)
-
-
- def addNode(self, testbed, hostname, mark):
- self.nodeModel.insertRow(0)
- self.nodeModel.setData(self.nodeModel.index(0,0), QString(testbed))
- self.nodeModel.setData(self.nodeModel.index(0,1), QString(hostname))
- if mark:msg="x"
- else: msg="-"
- self.nodeModel.setData(self.nodeModel.index(0,2), QString(msg))
+ networkItem = TreeItem([QString(network), QString("")])
+
+ all_nodes = rspec_get_nodes_from_network(rspec_string, network)
+ for node in all_nodes:
+ nodeItem = TreeItem([QString(""), QString(node)])
+ networkItem.appendChild(nodeItem)
+
+ self.nodeModel.addToRoot(networkItem)
class MainScreen(SfaScreen):
- def __init__(self, parent=None):
+ def __init__(self, parent):
SfaScreen.__init__(self, parent)
slice = SliceWidget(self)
self.init(slice, "Main Window", "PlanetLab Federation GUI")
-# slice.refresh()