Updates for issue navcoin#247

mxaddict · May 6, 2019 · a721da4 · a721da4
1 parent f0e6411
commit a721da4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
@@ -5,6 +5,9 @@
 #ifndef NAVCOIN_QT_GUICONSTANTS_H
 #define NAVCOIN_QT_GUICONSTANTS_H
 
+/* Milliseconds between price updates */
+static const int PRICE_UPDATE_DELAY = 300000;
+
 /* Milliseconds between model updates */
 static const int MODEL_UPDATE_DELAY = 250;
 

diff --git a/src/qt/navcoingui.cpp b/src/qt/navcoingui.cpp
@@ -277,13 +277,20 @@ NavCoinGUI::NavCoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     frameBlocksLayout->addWidget(labelBlocksIcon);
     frameBlocksLayout->addStretch();
 
-    if (GetArg("-updatefiatperiod",0) > 120000)
+    updatePrice(); // First price update
+
+    int updateFiatPeriod = GetArg("-updatefiatperiod", PRICE_UPDATE_DELAY);
+    if (updateFiatPeriod >= PRICE_UPDATE_DELAY)
     {
         QTimer *timerPrice = new QTimer(labelPrice);
         connect(timerPrice, SIGNAL(timeout()), this, SLOT(updatePrice()));
-        timerPrice->start(GetArg("-updatefiatperiod",0));
+        timerPrice->start(updateFiatPeriod);
+        info("Automatic price update set to" + std::to_string(updateFiatPeriod) + "ms");
+    }
+    else
+    {
+        info("Automatic price update turned OFF");
     }
-    updatePrice();
 
     QTimer *timerStakingIcon = new QTimer(labelStakingIcon);
     connect(timerStakingIcon, SIGNAL(timeout()), this, SLOT(updateStakingStatus()));
@@ -1704,6 +1711,8 @@ void NavCoinGUI::updateWeight()
 
 void NavCoinGUI::updatePrice()
 {
+    info("Updating prices");
+
     QNetworkAccessManager *manager = new QNetworkAccessManager();
     QNetworkRequest request;
     QNetworkReply *reply = NULL;
@@ -1804,6 +1813,8 @@ void NavCoinGUI::replyFinished(QNetworkReply *reply)
         clientModel->getOptionsModel()->setDisplayUnit(clientModel->getOptionsModel()->getDisplayUnit());
 
     reply->deleteLater();
+
+    info("Updated prices");
 }
 
 void NavCoinGUI::replyVotingFinished(QNetworkReply *reply)

diff --git a/src/util.h b/src/util.h
@@ -117,6 +117,15 @@ static inline bool error(std::string s)
 {
     return error(s.c_str());
 }
+static inline bool info(const char* s)
+{
+    LogPrintStr(std::string("INFO: ") + s + "\n");
+    return false;
+}
+static inline bool info(std::string s)
+{
+    return error(s.c_str());
+}
 void PrintExceptionContinue(const std::exception *pex, const char* pszThread);
 void ParseParameters(int argc, const char*const argv[]);
 void FileCommit(FILE *fileout);