Listing des noeuds d'une communauté

src/cutecoin/gui/addAccountDialog.py

@@ -6,6 +6,7 @@ Created on 2 févr. 2014
 from cutecoin.gen_resources.addAccountDialog_uic import Ui_AddAccountDialog
 from PyQt5.QtWidgets import QDialog
 from cutecoin.gui.addCommunityDialog import AddCommunityDialog
+from cutecoin.models.account import Account
 from cutecoin.models.account.communities import Communities
 from cutecoin.models.account.communities.treeModel import CommunitiesTreeModel
 
@@ -25,21 +26,23 @@ class AddAccountDialog(QDialog, Ui_AddAccountDialog):
         # Set up the user interface from Designer.
         super(AddAccountDialog, self).__init__()
         self.setupUi(self)
-        self.communities = Communities()
         self.dialog = AddCommunityDialog(self)
+        self.setData()
 
     def setData(self):
-        self.communities = Communities()
         gpg = gnupg.GPG()
         availableKeys = gpg.list_keys(True)
         for key in availableKeys:
             self.pgpkeyList.addItem(key['uids'][0])
 
+
+        self.account = Account(self.pgpkeyList.currentText(), "", Communities())
+
     def openAddCommunityDialog(self):
-        self.dialog.setCommunities(self.communities)
+        self.dialog.setCommunities(self.account.communities)
         self.dialog.exec_()
 
     def validAddCommunityDialog(self):
-        self.communitiesTable.setModel(CommunitiesTreeModel(self.communities))
+        self.communitiesTable.setModel(CommunitiesTreeModel(self.account))
 
 

src/cutecoin/models/account/communities/treeModel.py

@@ -5,10 +5,9 @@ Created on 5 févr. 2014
 '''
 
 from PyQt5.QtCore import QAbstractItemModel, Qt, QModelIndex
-from cutecoin.models.node.itemModel import NodeTreeItem
 from cutecoin.models.account.communities.itemModel import CommunitiesItemModel
 from cutecoin.models.community.itemModel import CommunityItemModel
-from cutecoin.models.node.itemModel import MainNodeTreeItem
+from cutecoin.models.node.itemModel import MainNodeItem, NodeItem
 
 class CommunitiesTreeModel(QAbstractItemModel):
     '''
@@ -93,10 +92,10 @@ class CommunitiesTreeModel(QAbstractItemModel):
             communityItem = CommunityItemModel(community, self)
             self.rootItem.appendChild(communityItem)
             for mainNode in community.knownNodes:
-                mainNodeItem = MainNodeTreeItem(mainNode, communityItem)
+                mainNodeItem = MainNodeItem(mainNode, communityItem)
                 communityItem.appendChild(mainNodeItem)
                 for node in mainNode.downstreamPeers():
-                    nodeItem = NodeTreeItem(node, mainNodeItem)
+                    nodeItem = NodeItem(node, mainNodeItem)
                     mainNodeItem.appendChild(nodeItem)
 
 

src/cutecoin/models/community/itemModel.py

@@ -20,7 +20,7 @@ class CommunityItemModel(object):
         return len(self.mainNodeItems)
 
     def columnCount(self):
-        return len(self.itemData)
+        return 1
 
     def data(self, column):
         try:

src/cutecoin/models/community/treeModel.py

@@ -5,7 +5,7 @@ Created on 5 févr. 2014
 '''
 
 from PyQt5.QtCore import QAbstractItemModel, QModelIndex, Qt
-from cutecoin.models.node.itemModel import NodeTreeItem
+from cutecoin.models.node.itemModel import MainNodeItem, NodeItem
 from cutecoin.models.community.itemModel import CommunityItemModel
 
 class CommunityTreeModel(QAbstractItemModel):
@@ -33,7 +33,7 @@ class CommunityTreeModel(QAbstractItemModel):
 
         item = index.internalPointer()
 
-        return item.data
+        return item.data(0)
 
     def flags(self, index):
         if not index.isValid():
@@ -43,7 +43,7 @@ class CommunityTreeModel(QAbstractItemModel):
 
     def headerData(self, section, orientation, role):
         if orientation == Qt.Horizontal and role == Qt.DisplayRole:
-            return self.rootItem.data
+            return self.rootItem.data(0)
 
         return None
 
@@ -87,12 +87,14 @@ class CommunityTreeModel(QAbstractItemModel):
 
 
     def refreshTreeNodes(self):
+
+        print("root : " + self.rootItem.data(0))
         for mainNode in self.community.knownNodes:
-            mainNodeItem = NodeTreeItem(mainNode, self.rootItem)
-            print("mainNode : " + mainNode.getText())
+            mainNodeItem = MainNodeItem(mainNode, self.rootItem)
+            print("mainNode : " + mainNode.getText() + " / " + mainNodeItem.data(0))
             self.rootItem.appendChild(mainNodeItem)
             for node in mainNode.downstreamPeers():
-                print("\t node : " + node.getText())
-                nodeItem = NodeTreeItem(node, mainNodeItem)
+                nodeItem = NodeItem(node, mainNodeItem)
+                print("\t node : " + node.getText()+ " / " + nodeItem.data(0))
                 mainNodeItem.appendChild(nodeItem)
 

src/cutecoin/models/node/itemModel.py

@@ -5,7 +5,7 @@ Created on 5 févr. 2014
 '''
 
 
-class NodeTreeItem(object):
+class NodeItem(object):
     def __init__(self, node, mainNodeItem=None):
         self.mainNodeItem = mainNodeItem
         self.nodeText = node.getText()
@@ -37,7 +37,7 @@ class NodeTreeItem(object):
 
         return 0
 
-class MainNodeTreeItem(object):
+class MainNodeItem(object):
     def __init__(self, mainNode, communityItem=None):
         self.communityItem = communityItem
         self.mainNodeText = mainNode.getText()