Changeset 732

Timestamp:

07/21/08 15:46:09 (4 months ago)

Author:

sylvain

Message:

Extended support for PubSub? messages so that they automatically update the Item model

Files:

• oss/jlib/designer/ui/atomentryform.ui (added)
• oss/jlib/examples/basic/client.py (modified) (2 diffs)
• oss/jlib/jlib/core/pubsub.py (modified) (5 diffs)
• oss/jlib/jlib/gui/pubsub/node.py (modified) (1 diff)

oss/jlib/examples/basic/client.py

@@ -110 +110 @@
-        QtCore.QObject.connect(self.connection.qobj.pubsubnode, QtCore.SIGNAL("retrievedItems(PyQt_PyObject)"),
-                               self.retrievedItems)
+        QtCore.QObject.connect(self.connection.qobj.pubsubnode, QtCore.SIGNAL("receivedPubSubMessage(PyQt_PyObject)"),
+                               self.displayPubSubItems)
-
-    def setSubscriptionsModel(self, subscriptions):
@@ -135 +137 @@
-        self.nodesUi.setModel(model)
-        self.nodesUi.setNode(items.node_name)
+
+    def displayPubSubItems(self, message):
+        model = self.nodesUi.model()
+        if model:
+            for item in message.items:
+                model.setNodeItem(item)
-
-    def messageReceived(self, message):

oss/jlib/jlib/core/pubsub.py

@@ -225 +225 @@
-        else:
-            item = jlibSubscriptionItem(subscription)
-
-rootItem.appendRow(item)
+    rootItem.appendRow(item)
+
-        item.setData(QtCore.QVariant(QtCore.QString(node)),
-                     QtCore.Qt.DisplayRole)
@@ -276 +276 @@
-        else:
-            item = jlibSubscriptionItem(feature)
-
-
+    rootItem.appendRow(item)
+
-        item.setData(QtCore.QVariant(QtCore.QString(var)),
-                     QtCore.Qt.DisplayRole)
@@ -329 +329 @@
-        else:
-            item = jlibAffiliationItem(affiliation)
-
-
+    rootItem.appendRow(item)
+
-        self.setData(self.index(item.row(), 0), QtCore.QVariant(QtCore.QString(node)),
-                    QtCore.Qt.DisplayRole)
@@ -562 +562 @@
-                
-            if self.dataReady("message.received"):
-sg
+essage
-                self.qobj.emit(QtCore.SIGNAL("receivedPubSubMessage(PyQt_PyObject)"), message) 
-                
@@ -613 +613 @@
-        else:
-            item = jlibNodeItem(node_item)
-
-
+    rootItem.appendRow(item)
+
-        self.setData(self.index(item.row(), 0), QtCore.QVariant(QtCore.QString(item_id)),
-                    QtCore.Qt.DisplayRole)

oss/jlib/jlib/gui/pubsub/node.py

@@ -29 +29 @@
-    def setModel(self, model):
-        self.nodes.setModel(model)
+
+    def model(self):
+        return self.nodes.model()
-
-    def handleError(self, node):