Updating Visualizer to lastest BioGears 7.4.0

Author: StevenAWhite

cmake/cmake-common_logic.cmake

@@ -15,8 +15,8 @@ if( NOT CMAKE_BUILD_TYPE )
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${BUILD_OPTIONS_STRINGS})
 endif()
 
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set (CMAKE_INSTALL_PREFIX "${_ROOT}/usr" CACHE PATH "default install path" FORCE )
+if (WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set (CMAKE_INSTALL_PREFIX "install/" CACHE PATH "default install path" FORCE )
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

extern/biogears

@@ -1,5 +1,6 @@
 #include "EventTree.h"
 
+#include <iostream>
 #include <fstream>
 #include <istream>
 #include <QFileInfo>

projects/ui/cpp/biogears/EventTree.cpp

@@ -202,7 +202,7 @@ class EventTree : public QObject {
   Q_INVOKABLE void add_event(Event ev);
   Q_INVOKABLE void add_event(QString name, int type, int subType, QString params, double startTime_s, double duration_s);
   Q_INVOKABLE Event get_event(int index) { return _events[index]; };
-  Q_INVOKABLE int get_event_count() { return _events.size(); };
+  Q_INVOKABLE int get_event_count() { return static_cast<int>(_events.size()); };
   Q_INVOKABLE void clear_events() { _events.clear(); };
   Q_INVOKABLE QString get_timeline_name() { return _timeline_name; };
   Q_INVOKABLE QString get_patient_name() { return _patient_name; }; 

projects/ui/cpp/biogears/EventTree.h

@@ -1,33 +1,34 @@
 #include "Logger.h"
+#include <biogears/io/io-manager.h>
 
 #include <QDebug>
 #include <QLoggingCategory>
 #include <QString>
 
-void QtLogForward::ForwardDebug(const std::string& msg, const std::string& origin)
+void QtLogForward::Debug(char const* msg) const
 {
-  messageReceived(QString("<font color=#ff0000ff>%1</font>\n").arg(msg.c_str()));
+  messageReceived(QString("<font color=#ff0000ff>%1</font>\n").arg(msg));
 }
 //-------------------------------------------------------------------------------
-void QtLogForward::ForwardInfo(const std::string& msg, const std::string& origin)
+void QtLogForward::Info(char const* msg) const
 {
-  messageReceived(QString("<color=#ffaaaaaa>%1</color>\n").arg(msg.c_str()));
+  messageReceived(QString("<color=#ffaaaaaa>%1</color>\n").arg(msg));
 }
 //-------------------------------------------------------------------------------
-void QtLogForward::ForwardWarning(const std::string& msg, const std::string& origin)
+void QtLogForward::Warning(char const* msg) const
 {
-  messageReceived(QString("<color=#ffffff00>%1</color>\n").arg(msg.c_str()));
+  messageReceived(QString("<color=#ffffff00>%1</color>\n").arg(msg));
 }
 //-------------------------------------------------------------------------------
-void QtLogForward::ForwardError(const std::string& msg, const std::string& origin)
+void QtLogForward::Error(char const* msg) const
 {
 
-  messageReceived(QString("<color=#ffff0000>%1</color>\n").arg(msg.c_str()));
+  messageReceived(QString("<color=#ffff0000>%1</color>\n").arg(msg));
 }
 //-------------------------------------------------------------------------------
-void QtLogForward::ForwardFatal(const std::string& msg, const std::string& origin)
+void QtLogForward::Fatal(char const* msg) const
 {
-  messageReceived(QString("<color=#ffff66cc>%1</color>\n").arg(msg.c_str()));
+  messageReceived(QString("<color=#ffff66cc>%1</color>\n").arg(msg));
 }
 //-------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------
@@ -44,8 +45,8 @@ struct QtLogger::Implementation {
 };
 //-------------------------------------------------------------------------------
 
-QtLogger::QtLogger(const QString& logFilename, const QString& working_dir)
-  : biogears::Logger(logFilename.toStdString(), working_dir.toStdString())
+QtLogger::QtLogger(const QString& logFilename, biogears::IOManager  iomanager)
+  : biogears::Logger(logFilename.toStdString(), iomanager)
   , _pimpl(std::make_unique<Implementation>())
 {
   biogears::Logger::SetForward(&_pimpl->Qt5LogStream);

projects/ui/cpp/biogears/Logger.cpp

@@ -1,27 +1,33 @@
 #pragma once
-#include <biogears/cdm/utils/Logger.h>
+
+#define WINDOWS_LEAN_AND_MEAN
+
 #include <string>
 #include <memory>
 
 #include <QObject>
 #include <QString>
 #include <qtextstream.h>
+#ifdef ERROR
+#undef  ERROR 
+#endif
 
+#include <biogears/cdm/utils/Logger.h>
 class QtLogForward : public QObject, public biogears::LoggerForward {
   Q_OBJECT
 
 public:
 
   QtLogForward(QObject* parent = nullptr);
   ~QtLogForward() = default;
-  void ForwardDebug(const std::string& msg, const std::string& origin) final;
-  void ForwardInfo(const std::string& msg, const std::string& origin) final;
-  void ForwardWarning(const std::string& msg, const std::string& origin) final;
-  void ForwardError(const std::string& msg, const std::string& origin) final;
-  void ForwardFatal(const std::string& msg, const std::string& origin) final;
+  void Debug(const char* msg) const final;
+  void Info(const char* msg) const final;
+  void Warning(const char* msg) const final;
+  void Error(const char* msg) const final;
+  void Fatal(const char* msg) const final;
 
 signals:
-  void messageReceived(QString message);
+  void messageReceived(QString message) const;
 
 
 private:
@@ -33,7 +39,7 @@ class QtLogger : public biogears::Logger {
   friend biogears::Loggable;
 
 public:
-  QtLogger(const QString& logFilename, const QString& working_dir);
+  QtLogger(const QString& logFilename, biogears::IOManager iomanager);
   virtual ~QtLogger();
 
 protected:

projects/ui/cpp/biogears/Logger.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <iostream>
+
 #include <QObject>
 
 struct PatientMetrics : QObject {
@@ -8,7 +10,6 @@ struct PatientMetrics : QObject {
   {
   }
   ~PatientMetrics() override {
-    std::cout << "simulationTime : " << simulationTime << "\n;";
   };
   QString respiratory_rate_bpm;
   QString heart_rate_bpm;