Something's amiss with this change

Author: dcwhite

Superbuild/BoostExternal.cmake

@@ -45,6 +45,7 @@ SET( boost_DEPENDENCIES )
 # explicitly set library list
 SET(boost_Libraries
   "atomic"
+  "chrono"
   "date_time"
   "exception"
   "filesystem"
@@ -53,6 +54,7 @@ SET(boost_Libraries
   "serialization"
   "system"
   "thread"
+  "timer"
   CACHE INTERNAL "Boost library name.")
 
 IF(BUILD_WITH_PYTHON)

src/Interface/Application/ModuleWidget.cc

@@ -1096,7 +1096,7 @@ bool ModuleWidget::executeWithSignals()
     Q_EMIT signalExecuteButtonIconChangeToStop();
     errored_ = false;
     //colorLocked_ = true; //TODO
-    timer_.restart();
+    timer_.start();
     theModule_->executeWithSignals();
     if (!disabled_)
       Q_EMIT updateProgressBarSignal(1);
@@ -1349,7 +1349,7 @@ void ModuleWidget::updateProgressBar(double percent)
 
 void ModuleWidget::updateModuleTime()
 {
-  fullWidgetDisplay_->getProgressBar()->setFormat(QString("%1 s : %p%").arg(timer_.elapsed()));
+  fullWidgetDisplay_->getProgressBar()->setFormat(QString("%1 s : %p%").arg(timer_.elapsed().wall));
 }
 
 void ModuleWidget::launchDocumentation()

src/Interface/Application/ModuleWidget.h

@@ -34,6 +34,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/bimap.hpp>
+#include <boost/timer/timer.hpp>
 #include <deque>
 #include <atomic>
 #include <Interface/Application/Note.h>
@@ -259,7 +260,7 @@ private Q_SLOTS:
   ModuleWidgetDisplayPtr fullWidgetDisplay_;
 private:
   boost::shared_ptr<PortWidgetManager> ports_;
-  //boost::timer timer_;
+  boost::timer::cpu_timer timer_;
   bool deletedFromGui_, colorLocked_;
   bool executedOnce_, skipExecuteDueToFatalError_, disabled_, programmablePortEnabled_{false};
   std::atomic<bool> errored_;

src/Interface/Application/NetworkEditor.cc

@@ -1286,7 +1286,7 @@ void NetworkEditor::centerView()
   }
 
   ModulePositions positions;
-  fillModulePositionMap(positions, []() { return true; });
+  fillModulePositionMap(positions, [](ModuleHandle) { return true; });
   centerOn(findCenterOfNetwork(positions));
 }
 

src/Interface/Application/NetworkExecutionProgressBar.cc

@@ -83,6 +83,7 @@ void NetworkExecutionProgressBar::updateTotalModules(size_t count)
     progressBar_->setValue(0);
   }
 }
+
 void NetworkExecutionProgressBar::incrementModulesDone(double execTime, const std::string& moduleId)
 {
   Guard g(mutex_.get());
@@ -92,7 +93,7 @@ void NetworkExecutionProgressBar::incrementModulesDone(double execTime, const st
     counterLabel_->setText(counterLabelString());
     progressBar_->setValue(numModulesDone_);
     totalExecutionTime_ += execTime;
-    auto wallTime = executionTimer_.elapsed();
+    auto wallTime = executionTimer_.elapsed().wall;
     //Green - completed modules\n??? - Unexecuted modules\nRed - errored modules\n
     progressBar_->setToolTip(QString("Total execution time: %1\nTotal wall time: %2")
       .arg(totalExecutionTime_).arg(wallTime));
@@ -109,7 +110,7 @@ void NetworkExecutionProgressBar::resetModulesDone()
   Guard g(mutex_.get());
   numModulesDone_ = 0;
   totalExecutionTime_ = 0;
-  executionTimer_.restart();
+  executionTimer_.stop();
   counterLabel_->setText(counterLabelString());
   progressBar_->setValue(numModulesDone_);
   progressBar_->setToolTip("");

src/Interface/Application/NetworkExecutionProgressBar.h

@@ -34,6 +34,7 @@
 #include <QProgressBar>
 #ifndef Q_MOC_RUN
 #include <Core/Utils/SmartPointers.h>
+#include <boost/timer/timer.hpp>
 #include <Core/Thread/Mutex.h>
 #endif
 
@@ -97,7 +98,7 @@ class NetworkExecutionProgressBar : public QObject
   size_t totalModules_;
   double totalExecutionTime_;
   Core::Thread::Mutex mutex_;
-  //boost::timer executionTimer_;
+  boost::timer::cpu_timer executionTimer_;
   QString timingLog_;
   QTextStream timingStream_;