start implementing treeview and nodemodel

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 117d0ab..2b8b88f 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -13,16 +13,117 @@ class NodeView(QTreeView):
     def __init__(self, parent):
         QTreeView.__init__(self, parent)
 
+        self.setItemsExpandable(True)
         self.setRootIsDecorated(False)
         self.setAlternatingRowColors(True)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-class NodeModel(QStandardItemModel):
+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):
-        QStandardItemModel.__init__(self, 0, 3, parent)
-        self.setHeaderData(0, Qt.Horizontal, QString("Testbed"))
-        self.setHeaderData(1, Qt.Horizontal, QString("Hostname"))
-        self.setHeaderData(2, Qt.Horizontal, QString("IsIn"))
+        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())
+
+    def headerData(self, section, orientation, role):
+        if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+            return self.rootItem.data(section)
+        return QVariant()
+
+    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):
@@ -79,32 +180,16 @@ class SliceWidget(QWidget):
     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):

diff --git a/sface/sfahelper.py b/sface/sfahelper.py
index dd26f74..9e2a1b9 100644 (file)
--- a/sface/sfahelper.py
+++ b/sface/sfahelper.py
@@ -12,9 +12,9 @@ def rspec_get_networks(rspec_string):
 
 
 # TODO: already merged in sfa-trunk. Use the one there
-def rspec_get_xml_nodes_from_network(rspec_string, network):
+def rspec_get_nodes_from_network(rspec_string, network):
     rspec = RSpec (rspec_string)
-    return rspec.rspec.xpath("./network[@name='%s']/site/node" % network)
+    return rspec.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network)
 
 
 def rspec_get_sliver_nodes_from_network(rspec_string, network):