[GUI] Dashboard, include owner cold stakes in the chart.

furszy · furszy · commit 86731dd67d25 · 2020-02-27T17:56:50.000-03:00
diff --git a/src/qt/pivx/dashboardwidget.cpp b/src/qt/pivx/dashboardwidget.cpp
@@ -230,7 +230,7 @@ void DashboardWidget::loadWalletModel(){
         stakesFilter->setSortCaseSensitivity(Qt::CaseInsensitive);
         stakesFilter->setFilterCaseSensitivity(Qt::CaseInsensitive);
         stakesFilter->setSortRole(Qt::EditRole);
-        stakesFilter->setOnlyStakes(true);
+        stakesFilter->setOnlyStakes(true, true);
         stakesFilter->setSourceModel(txModel);
         stakesFilter->sort(TransactionTableModel::Date, Qt::AscendingOrder);
         hasStakes = stakesFilter->rowCount() > 0;
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
@@ -63,7 +63,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex&
     if (fOnlyZc && !isZcTx(type)){
         return false;
     }
-    if (fOnlyStakes && !isStakeTx(type))
+    if ((fOnlyStakes && !isStakeTx(type)) && (fShowOwnColdStakes && !isColdStakeMine(type)))
         return false;
 
     if (fOnlyColdStaking && !isColdStake(type))
@@ -128,9 +128,10 @@ void TransactionFilterProxy::setShowZcTxes(bool fOnlyZc)
     invalidateFilter();
 }
 
-void TransactionFilterProxy::setOnlyStakes(bool fOnlyStakes)
+void TransactionFilterProxy::setOnlyStakes(bool fOnlyStakes, bool fShowColdStakes)
 {
     this->fOnlyStakes = fOnlyStakes;
+    this->fShowOwnColdStakes = fShowColdStakes;
     invalidateFilter();
 }
 
@@ -162,11 +163,15 @@ bool TransactionFilterProxy::isZcTx(int type) const {
 }
 
 bool TransactionFilterProxy::isStakeTx(int type) const {
-    return (type == TransactionRecord::StakeMint || type == TransactionRecord::Generated || type == TransactionRecord::StakeZPIV);
+    return type == TransactionRecord::StakeMint || type == TransactionRecord::Generated || type == TransactionRecord::StakeZPIV;
+}
+
+bool TransactionFilterProxy::isColdStakeMine(int type) const {
+    return type == TransactionRecord::StakeDelegated;
 }
 
 bool TransactionFilterProxy::isColdStake(int type) const {
-    return (type == TransactionRecord::P2CSDelegation || type == TransactionRecord::P2CSDelegationSent || type == TransactionRecord::P2CSDelegationSentOwner || type == TransactionRecord::StakeDelegated || type == TransactionRecord::StakeHot);
+    return type == TransactionRecord::P2CSDelegation || type == TransactionRecord::P2CSDelegationSent || type == TransactionRecord::P2CSDelegationSentOwner || isColdStakeMine(type) || type == TransactionRecord::StakeHot;
 }
 
 /*QVariant TransactionFilterProxy::dataFromSourcePos(int sourceRow, int role) const {
diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
@@ -63,7 +63,7 @@ class TransactionFilterProxy : public QSortFilterProxyModel
     void setShowZcTxes(bool fOnlyZc);
 
     /** Only stakes txes **/
-    void setOnlyStakes(bool fOnlyStakes);
+    void setOnlyStakes(bool fOnlyStakes, bool fShowColdStakes = false);
 
     /** Shows only p2cs-p2cs && xxx-p2cs **/
     void setOnlyColdStakes(bool fOnlyColdStakes);
@@ -88,11 +88,13 @@ class TransactionFilterProxy : public QSortFilterProxyModel
     bool fHideOrphans = true;
     bool fOnlyZc = false;
     bool fOnlyStakes = false;
+    bool fShowOwnColdStakes = false;
     bool fOnlyColdStaking = false;
 
     bool isZcTx(int type) const;
     bool isStakeTx(int type) const;
     bool isColdStake(int type) const;
+    bool isColdStakeMine(int type) const;
 };
 
 #endif // BITCOIN_QT_TRANSACTIONFILTERPROXY_H

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex&`
`63`	`63`	`if (fOnlyZc && !isZcTx(type)){`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`		`- if (fOnlyStakes && !isStakeTx(type))`
	`66`	`+ if ((fOnlyStakes && !isStakeTx(type)) && (fShowOwnColdStakes && !isColdStakeMine(type)))`
`67`	`67`	`return false;`
`68`	`68`
`69`	`69`	`if (fOnlyColdStaking && !isColdStake(type))`
`@@ -128,9 +128,10 @@ void TransactionFilterProxy::setShowZcTxes(bool fOnlyZc)`
`128`	`128`	`invalidateFilter();`
`129`	`129`	`}`
`130`	`130`
`131`		`-void TransactionFilterProxy::setOnlyStakes(bool fOnlyStakes)`
	`131`	`+void TransactionFilterProxy::setOnlyStakes(bool fOnlyStakes, bool fShowColdStakes)`
`132`	`132`	`{`
`133`	`133`	`this->fOnlyStakes = fOnlyStakes;`
	`134`	`+ this->fShowOwnColdStakes = fShowColdStakes;`
`134`	`135`	`invalidateFilter();`
`135`	`136`	`}`
`136`	`137`
`@@ -162,11 +163,15 @@ bool TransactionFilterProxy::isZcTx(int type) const {`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`bool TransactionFilterProxy::isStakeTx(int type) const {`
`165`		`- return (type == TransactionRecord::StakeMint \|\| type == TransactionRecord::Generated \|\| type == TransactionRecord::StakeZPIV);`
	`166`	`+ return type == TransactionRecord::StakeMint \|\| type == TransactionRecord::Generated \|\| type == TransactionRecord::StakeZPIV;`
	`167`	`+}`
	`168`	`+`
	`169`	`+bool TransactionFilterProxy::isColdStakeMine(int type) const {`
	`170`	`+ return type == TransactionRecord::StakeDelegated;`
`166`	`171`	`}`
`167`	`172`
`168`	`173`	`bool TransactionFilterProxy::isColdStake(int type) const {`
`169`		`- return (type == TransactionRecord::P2CSDelegation \|\| type == TransactionRecord::P2CSDelegationSent \|\| type == TransactionRecord::P2CSDelegationSentOwner \|\| type == TransactionRecord::StakeDelegated \|\| type == TransactionRecord::StakeHot);`
	`174`	`+ return type == TransactionRecord::P2CSDelegation \|\| type == TransactionRecord::P2CSDelegationSent \|\| type == TransactionRecord::P2CSDelegationSentOwner \|\| isColdStakeMine(type) \|\| type == TransactionRecord::StakeHot;`
`170`	`175`	`}`
`171`	`176`
`172`	`177`	`/*QVariant TransactionFilterProxy::dataFromSourcePos(int sourceRow, int role) const {`