Disable cores deal when mining is active to prevent misunderstanding …

…how it works, other changes in miner
seredat · Jan 4, 2022 · f565e7b · f565e7b
1 parent 06d7370
commit f565e7b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/src/Miner.cpp b/src/Miner.cpp
@@ -230,7 +230,7 @@ namespace WalletGui
   double Miner::get_speed()
   {
     if(is_mining())
-      return m_hash_rate;
+      return m_hash_rate.load();
     else
       return 0;
   }
@@ -239,8 +239,6 @@ namespace WalletGui
   void Miner::send_stop_signal() 
   {
     m_stop_mining = true;
-    m_current_hash_rate = 0;
-    m_last_hash_rates.clear();
   }
 
   //-----------------------------------------------------------------------------------------------------
@@ -258,6 +256,10 @@ namespace WalletGui
 
     m_threads.clear();
 
+    m_current_hash_rate = 0;
+    m_hash_rate = 0;
+    m_last_hash_rates.clear();
+
     m_logger(Logging::INFO) << "Mining stopped, " << m_threads.size() << " threads finished" ;
     Q_EMIT minerMessageSignal(QString("Mining stopped, %1 threads finished").arg(threadsCount));
 

diff --git a/src/gui/MiningFrame.cpp b/src/gui/MiningFrame.cpp
@@ -7,6 +7,9 @@
 #include <QDebug>
 #include <QThread>
 #include <QUrl>
+#include <QtConcurrent/QtConcurrent>
+#include <QtConcurrent/QtConcurrentRun>
+#include <QDebug>
 
 #include "MiningFrame.h"
 #include "MainWindow.h"
@@ -178,6 +181,8 @@ void MiningFrame::startSolo() {
   m_ui->m_startSolo->setChecked(true);
   m_ui->m_startSolo->setEnabled(false);
   m_ui->m_stopSolo->setEnabled(true);
+  m_ui->m_cpuCoresSpin->setEnabled(false);
+  m_ui->m_cpuDial->setEnabled(false);
   m_solo_mining = true;
 }
 
@@ -193,6 +198,8 @@ void MiningFrame::stopSolo() {
     m_ui->m_hashratelcdNumber->display(0.0);
     m_ui->m_startSolo->setEnabled(true);
     m_ui->m_stopSolo->setEnabled(false);
+    m_ui->m_cpuCoresSpin->setEnabled(true);
+    m_ui->m_cpuDial->setEnabled(true);
     m_solo_mining = false;
   }
 }
@@ -259,4 +266,11 @@ void MiningFrame::updateMinerLog(const QString& _message) {
   sb->setValue(sb->maximum());
 }
 
+void MiningFrame::coreDealTurned(int _cores) {
+  qDebug() << "Cores " << _cores;
+  QTimer::singleShot(600, [this, _cores]() {
+    Settings::instance().setMiningThreads(_cores);
+  } );
+}
+
 }
diff --git a/src/gui/MiningFrame.h b/src/gui/MiningFrame.h
@@ -64,6 +64,7 @@ class MiningFrame : public QFrame {
   Q_SLOT void updateBalance(quint64 _balance);
   Q_SLOT void updatePendingBalance(quint64 _balance);
   Q_SLOT void updateMinerLog(const QString& _message);
+  Q_SLOT void coreDealTurned(int _cores);
 };
 
 }
diff --git a/src/gui/ui/miningframe.ui b/src/gui/ui/miningframe.ui
@@ -310,13 +310,30 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>m_cpuCoresSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>MiningFrame</receiver>
+   <slot>coreDealTurned(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>501</x>
+     <y>86</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>379</x>
+     <y>266</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>startStopClicked(QAbstractButton*)</slot>
   <slot>startStopSoloClicked(QAbstractButton*)</slot>
   <slot>stakeAmountChanged(int)</slot>
   <slot>stakeTermChanged(int)</slot>
   <slot>stakeMixinChanged(int)</slot>
+  <slot>coreDealTurned(int)</slot>
  </slots>
  <buttongroups>
   <buttongroup name="m_soloButtonGroup"/>