[Model] * AddressTableModel supporting delegator and delegable addresses.

furszy · furszy · commit 7d1185c06ec1 · 2019-11-08T18:24:38.000-03:00
* AddressFilterProxy, method to change the type and invalidate the filter created.
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
@@ -5,6 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "addresstablemodel.h"
+#include "addressbook.h"
 
 #include "guiutil.h"
 #include "walletmodel.h"
@@ -19,12 +20,14 @@
 const QString AddressTableModel::Send = "S";
 const QString AddressTableModel::Receive = "R";
 const QString AddressTableModel::Zerocoin = "X";
+const QString AddressTableModel::Delegators = "D";
 
 struct AddressTableEntry {
     enum Type {
         Sending,
         Receiving,
         Zerocoin,
+        Delegators,
         Hidden /* QSortFilterProxyModel will filter these out */
     };
 
@@ -63,6 +66,9 @@ static AddressTableEntry::Type translateTransactionType(const QString& strPurpos
         addressType = AddressTableEntry::Sending;
     else if (strPurpose == "receive")
         addressType = AddressTableEntry::Receiving;
+    else if (strPurpose == QString::fromStdString(CAddressBookData::AddressBookPurpose::DELEGATOR)
+            || strPurpose == QString::fromStdString(CAddressBookData::AddressBookPurpose::DELEGABLE))
+        addressType = AddressTableEntry::Delegators;
     else if (strPurpose == "unknown" || strPurpose == "") // if purpose not set, guess
         addressType = (isMine ? AddressTableEntry::Receiving : AddressTableEntry::Sending);
     return addressType;
@@ -76,6 +82,7 @@ class AddressTablePriv
     QList<AddressTableEntry> cachedAddressTable;
     int sendNum = 0;
     int recvNum = 0;
+    int dellNum = 0;
     AddressTableModel* parent;
 
     AddressTablePriv(CWallet* wallet, AddressTableModel* parent) : wallet(wallet), parent(parent) {}
@@ -96,8 +103,11 @@ class AddressTablePriv
                 if(item.second.purpose == "receive"){
                     creationTime = static_cast<uint>(wallet->GetKeyCreationTime(address));
                     recvNum++;
-                }else if(item.second.purpose == "send"){
+                } else if(item.second.purpose == "send"){
                     sendNum++;
+                } else if (item.second.purpose == CAddressBookData::AddressBookPurpose::DELEGABLE
+                            || item.second.purpose == CAddressBookData::AddressBookPurpose::DELEGATOR) {
+                    dellNum++;
                 }
 
                 cachedAddressTable.append(
@@ -223,6 +233,10 @@ class AddressTablePriv
         return recvNum;
     }
 
+    int sizeDell(){
+        return dellNum;
+    }
+
     AddressTableEntry* index(int idx)
     {
         if (idx >= 0 && idx < cachedAddressTable.size()) {
@@ -264,6 +278,10 @@ int AddressTableModel::sizeRecv() const{
     return priv->sizeRecv();
 }
 
+int AddressTableModel::sizeDell() const {
+    return priv->sizeDell();
+}
+
 QVariant AddressTableModel::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid())
@@ -292,12 +310,14 @@ QVariant AddressTableModel::data(const QModelIndex& index, int role) const
         return font;
     } else if (role == TypeRole) {
         switch (rec->type) {
-        case AddressTableEntry::Sending:
-            return Send;
-        case AddressTableEntry::Receiving:
-            return Receive;
-        default:
-            break;
+            case AddressTableEntry::Sending:
+                return Send;
+            case AddressTableEntry::Receiving:
+                return Receive;
+            case AddressTableEntry::Delegators:
+                return Delegators;
+            default:
+                break;
         }
     }
     return QVariant();
diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h
@@ -48,13 +48,15 @@ class AddressTableModel : public QAbstractTableModel
     static const QString Send;    /**< Specifies send address */
     static const QString Receive; /**< Specifies receive address */
     static const QString Zerocoin; /**< Specifies stealth address */
+    static const QString Delegators;
 
     /** @name Methods overridden from QAbstractTableModel
         @{*/
     int rowCount(const QModelIndex& parent) const;
     int columnCount(const QModelIndex& parent) const;
     int sizeSend() const;
     int sizeRecv() const;
+    int sizeDell() const;
     QVariant data(const QModelIndex& index, int role) const;
     bool setData(const QModelIndex& index, const QVariant& value, int role);
     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
diff --git a/src/qt/pivx/addressfilterproxymodel.cpp b/src/qt/pivx/addressfilterproxymodel.cpp
@@ -3,13 +3,16 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "qt/pivx/addressfilterproxymodel.h"
+#include <iostream>
 
 bool AddressFilterProxyModel::filterAcceptsRow(int row, const QModelIndex& parent) const
 {
     auto model = sourceModel();
     auto label = model->index(row, AddressTableModel::Label, parent);
 
-    if (model->data(label, AddressTableModel::TypeRole).toString() != m_type) {
+    auto type = model->data(label, AddressTableModel::TypeRole).toString();
+    if (type != m_type) {
+        std::cout << "Type:" << type.toStdString() << "=" << m_type.toStdString() << std::endl;
         return false;
     }
 
@@ -23,6 +26,12 @@ bool AddressFilterProxyModel::filterAcceptsRow(int row, const QModelIndex& paren
     return true;
 }
 
+void AddressFilterProxyModel::setType(const QString& type)
+{
+    this->m_type = type;
+    invalidateFilter();
+}
+
 int AddressFilterProxyModel::rowCount(const QModelIndex& parent) const
 {
     return QSortFilterProxyModel::rowCount(parent);
diff --git a/src/qt/pivx/addressfilterproxymodel.h b/src/qt/pivx/addressfilterproxymodel.h
@@ -11,7 +11,6 @@
 
 class AddressFilterProxyModel final : public QSortFilterProxyModel
 {
-    const QString m_type;
 
 public:
     AddressFilterProxyModel(const QString& type, QObject* parent)
@@ -24,8 +23,13 @@ class AddressFilterProxyModel final : public QSortFilterProxyModel
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
+    void setType(const QString& type);
+
 protected:
     bool filterAcceptsRow(int row, const QModelIndex& parent) const override;
+
+private:
+    QString m_type;
 };
 
 
