Changeset 152 in pacpusframework for branches/2.0-beta1/src/DBITEPlayerLib

Timestamp:

08/01/13 10:45:50 (11 years ago)

Author:

Marek Kurdej

Message:

Major update.
Renamed: addInput -> addInputs, addOutput -> addOutputs and made pure virtual (=0).
Transformed macro definitions into template methods: ADD_INPUT -> ComponentBase::addInput, ADD_OUTPUT -> ComponentBase::addOutput, GET_INPUT -> ComponentBase::getTypedInput, GET_OUTPUT -> ComponentBase::getTypedOutput.
Fixed: added public/protected set/get methods in ComponentBase, made member fields private.

Location:

branches/2.0-beta1/src/DBITEPlayerLib

Files:

• DbtPlyEngine.cpp (modified) (9 diffs)
• DbtPlyFileManager.cpp (modified) (6 diffs)
• DbtPlyTrigger.cpp (modified) (4 diffs)
• DbtPlyUserInterface.cpp (modified) (1 diff)

branches/2.0-beta1/src/DBITEPlayerLib/DbtPlyEngine.cpp

@@ -23 +23 @@
 DECLARE_STATIC_LOGGER("pacpus.core.DbtPlyEngine");
 
-static const string kPropertyDataDirectory = "datadir";
-
-static const string kPropertyLoggerConfiguration = "log-config-file";
-
-static const string kPropertyReplayMode = "replay_mode";
-static const string kPropertyReplayModeLastData = "1";
-static const string kPropertyReplayModeAllData = "2";
+static const char * kPropertyDataDirectory = "datadir";
+
+static const char *  kPropertyLoggerConfiguration = "log-config-file";
+
+static const char *  kPropertyReplayMode = "replay_mode";
+static const char *  kPropertyReplayModeLastData = "1";
+static const char *  kPropertyReplayModeAllData = "2";
 
 typedef float SpeedType;
@@ -63 +63 @@
 }
 
+void DbtPlyEngine::addInputs()
+{
+    // empty: no inputs
+}
+
+void DbtPlyEngine::addOutputs()
+{
+    // empty: no outputs
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Returns the directory where the data are stored.
@@ -103 +113 @@
     int i = 0;
 
-    while (THREAD_ALIVE) {
+    while (isActive()) {
         tNow_ = road_time();
         float elapsedTime = tNow_ - lastTNow_;
@@ -145 +155 @@
 /// Configuration method of the engine
 /// called automatically by the component manager
-ComponentBase::COMPONENT_CONFIGURATION DbtPlyEngine::configureComponent(XmlComponentConfig /*config*/)
+ComponentBase::COMPONENT_CONFIGURATION DbtPlyEngine::configureComponent(XmlComponentConfig config)
 {
     // datadir
-    dataDir_ = param.getProperty(kPropertyDataDirectory.c_str());
-    LOG_INFO("property " << kPropertyDataDirectory.c_str() << "=\""
+    dataDir_ = config.getProperty(kPropertyDataDirectory);
+    LOG_INFO("property " << kPropertyDataDirectory << "=\""
              << dataDir_ << "\"");
     if (dataDir_.isNull()) {
-        LOG_FATAL("The data directory '" << componentName << "' is invalid or unavailable!");
+        LOG_FATAL("The data directory '" << name() << "' is invalid or unavailable!");
     }
 
@@ -162 +172 @@
     ////////////////////////////////////////////////////////////////////////////////
     // logger configuration
-    QString loggerConfig = param.getProperty(kPropertyLoggerConfiguration.c_str());
-    LOG_INFO("property " << kPropertyLoggerConfiguration.c_str() << "=\""
+    QString loggerConfig = config.getProperty(kPropertyLoggerConfiguration);
+    LOG_INFO("property " << kPropertyLoggerConfiguration << "=\""
              << loggerConfig << "\"");
     if (!loggerConfig.isNull()) {
@@ -172 +182 @@
     ////////////////////////////////////////////////////////////////////////////////
     // Replay Mode
-    QString replayModeValue = param.getProperty(kPropertyReplayMode.c_str());
-    LOG_INFO("property " << kPropertyReplayMode.c_str() << "=\""
+    QString replayModeValue = config.getProperty(kPropertyReplayMode);
+    LOG_INFO("property " << kPropertyReplayMode << "=\""
              << replayModeValue << "\"");
     if (replayModeValue.isNull()) {
-        LOG_INFO("property " << kPropertyReplayMode.c_str() << " unset."
+        LOG_INFO("property " << kPropertyReplayMode << " unset."
                  << " Set to default = 1.");
         replayMode_ = PlayModeLastData;
@@ -185 +195 @@
             replayMode_ = PlayModeAllData;
         } else {
-            LOG_WARN("unknown " << kPropertyReplayMode.c_str() << " '" << replayModeValue << "'."
+            LOG_WARN("unknown " << kPropertyReplayMode << " '" << replayModeValue << "'."
                      << " Set to default = 1.");
             replayMode_ = PlayModeLastData;
@@ -200 +210 @@
     LOG_INFO("Starting...");
 
-    THREAD_ALIVE = true;
+    setActive(true);
     start();
 }
@@ -210 +220 @@
     LOG_TRACE("stopping activity...");
 
-    THREAD_ALIVE = false;
+    setActive(false);
 }
 

branches/2.0-beta1/src/DBITEPlayerLib/DbtPlyFileManager.cpp

@@ -21 +21 @@
 DECLARE_STATIC_LOGGER("pacpus.core.DbtPlyFileManager");
 
-const string kPropertyVerbose = "verbose";
+const char * kPropertyVerbose = "verbose";
 const int kPropertyVerboseDefaultValue = 1;
 
-const string kPropertyDbiteFileName = "dbt";
+const char * kPropertyDbiteFileName = "dbt";
 
 // It is the maximum time elapsed between the computation of the tDbt and the data replay in microseconds
@@ -31 +31 @@
 ////////////////////////////////////////////////////////////////////////////////
 /// Constructor.
-DbtPlyFileManager::DbtPlyFileManager(QString name):ComponentBase(name)
+DbtPlyFileManager::DbtPlyFileManager(QString name)
+    : ComponentBase(name)
 {
     LOG_TRACE("constructor");
@@ -85 +86 @@
     /////////////////////////////////////////
     {
-        QString verbose = param.getProperty(kPropertyVerbose.c_str());
+        QString verbose = config.getProperty(kPropertyVerbose);
         if (verbose.isNull()) {
             LOG_INFO("property " << kPropertyVerbose << " not set."
@@ -103 +104 @@
 
     /////////////////////////////////////////
-    dbtProperty_ = param.getProperty(kPropertyDbiteFileName.c_str());
-    mShowGui = param.getProperty("ui").toInt();
+    dbtProperty_ = config.getProperty(kPropertyDbiteFileName);
+    mShowGui = config.getProperty("ui").toInt();
     mDbtDataPath = mEngine->getDataDir();
 
@@ -180 +181 @@
 void DbtPlyFileManager::displayUI()
 {
-    LOG_WARN("component '" << componentName << "' has no user interface. Please set ui property to 0 in your XML configuration");
+    LOG_WARN("component '" << name() << "' has no user interface. Please set ui property to 0 in your XML configuration");
 }
 
@@ -300 +301 @@
     deltaTDbtTab_[(deltaTDbtTabLoop_++)%1000] = deltaT;
     if (deltaT > kMaxPendingTimeFromEngineMicrosecs) {
-        LOG_WARN(componentName << ": data not replayed: elapsed time since engine notification too big:" << deltaT << "us");
+        LOG_WARN(name() << ": data not replayed: elapsed time since engine notification too big:" << deltaT << "us");
         return;
     }

branches/2.0-beta1/src/DBITEPlayerLib/DbtPlyTrigger.cpp

@@ -21 +21 @@
     , mEngine(NULL)
 {
-    THREAD_ALIVE = false;
 }
 
 DbtPlyTrigger::~DbtPlyTrigger()
 { 
+}
+
+void DbtPlyTrigger::addInputs()
+{
+    // empty: no inputs
+}
+
+void DbtPlyTrigger::addOutputs()
+{
+    // empty: no outputs
 }
 
@@ -46 +55 @@
 void DbtPlyTrigger::startActivity()
 {   
-    THREAD_ALIVE = true;
     start();
 }
@@ -52 +60 @@
 void DbtPlyTrigger::stopActivity()
 { 
-    THREAD_ALIVE = false;
 }
 
@@ -62 +69 @@
 #endif
 
-    while(THREAD_ALIVE) {
+    while(isActive()) {
         if (mEngine->isPlaying()) {
             Q_EMIT triggerSig();

branches/2.0-beta1/src/DBITEPlayerLib/DbtPlyUserInterface.cpp

@@ -48 +48 @@
 }
 
+void DbtPlyUserInterface::addInputs()
+{
+    // empty: no inputs
+}
+
+void DbtPlyUserInterface::addOutputs()
+{
+    // empty: no outputs
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyUserInterface::configureComponent(XmlComponentConfig /*config*/)