Changeset 738

Timestamp:

07/24/08 10:37:36 (4 months ago)

Author:

sylvain

Message:

Started making the node model capable of handling both node and items at once

Files:

• oss/jlib/examples/basic/client.py (modified) (2 diffs)
• oss/jlib/jlib/core/pubsub.py (modified) (6 diffs)

oss/jlib/examples/basic/client.py

@@ -118 +118 @@
-
-    def clientReady(self, jid):
+        model = jlibNodeItemModel(parent=self.connection.qobj.discovery)
+        self.nodesUi.setPubSub(self.connection.qobj.pubsubnode)
+        self.nodesUi.setModel(model)
+        
-        QtCore.QObject.connect(self.connection.qobj.chat, QtCore.SIGNAL("receivedMessage(PyQt_PyObject)"), 
-                               self.messageReceived)
@@ -163 +167 @@
-
-    def setItemsModel(self, items):
-jlibNodeItemModel(parent=self.connection.qobj.discovery
+self.nodesUi.model(
-        model.setNodeItems(items)
-        self.nodesUi.setPubSub(self.connection.qobj.pubsubnode)
-        self.nodesUi.setModel(model)
-        self.nodesUi.setNode(items.node_name)
-
-    def displayPubSubItems(self, message):

oss/jlib/jlib/core/pubsub.py

@@ -26 +26 @@
-           'jlibAffiliationItem', 'jlibAffiliationDiscoveryModel',
-           'jlibPubSubNode', 'jlibPubSubNodeComponent',
-
+Item', 'jlibNodeItem
-
-class jlibPubSubDiscovery(QAxonObject):
@@ -536 +536 @@
-                self.send(p, "delete-node")
-
+            if self.dataReady('request-purge-collection-node'):
+                nodeid = self.recv('request-purge-collection-node')
+                p = Node(unicode(self.from_jid), self.pubsub_service, node_name=nodeid)
+                self.send(p, "purge-collection-node")
+
-            if self.dataReady('request-subscribe-node'):
-                nodeid = self.recv('request-subscribe-node')
@@ -578 +583 @@
-
-class jlibNodeItem(QtGui.QStandardItem):
-_item
+
-        QtGui.QStandardItem.__init__(self)
-_item = node_item
+ = node
-
-    def type(self):
-        return QtGui.QStandardItem.UserType + 106
+    
+class jlibNodeItem(QtGui.QStandardItem):
+    TYPE = QtGui.QStandardItem.UserType + 107
+    def __init__(self, node):
+        QtGui.QStandardItem.__init__(self)
+        self.node = node
+
+    def type(self):
+        return self.TYPE
+    
+class jlibNodeItemItem(QtGui.QStandardItem):
+    TYPE = QtGui.QStandardItem.UserType + 108
+    def __init__(self, item):
+        QtGui.QStandardItem.__init__(self)
+        self.item = item
+
+    def type(self):
+        return self.TYPE
-    
-class jlibNodeItemModel(QtGui.QStandardItemModel):
@@ -594 +617 @@
-        return QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled
-
-
-
+
+
+
-            self.setNodeItem(item)
+
+    def setNode(self, node):
+        rootItem = self.invisibleRootItem()
+        index = self.getNodeIndex(node)
+        if index.isValid():
+            item = self.items[node]
+        else:
+            item = jlibNodeItem(node)
+            rootItem.appendRow(item)
+
+        item.setData(QtCore.QVariant(QtCore.QString(node)),
+                     QtCore.Qt.DisplayRole)
+
+        self.items[node] = item
+
+        return item
+
+    def getNodeIndex(self, node):
+        if node in self.items:
+            return self.items[node].index()
+
+        return QtCore.QModelIndex()
-
-    def hasNodeItem(self, item_id):
@@ -608 +654 @@
-        return QtCore.QModelIndex()
-
-    def getNodeItem(self, index):
-        return self.itemFromIndex(index)
-
-    def setNodeItem(self, node_item):
-
+
+
+
+
-
-        item_id = str(node_item.name)
@@ -619 +665 @@
-            item = self.items[item_id]
-        else:
-
+Item
-            rootItem.appendRow(item)
-
-self.setData(self.index(item.row(), 0), 
-
+item.setData(
+ 
-
-        self.items[item_id] = item