Changeset 179 in pacpusframework for trunk

Timestamp:

Oct 11, 2013, 5:40:46 PM (11 years ago)

Author:

Marek Kurdej

Message:

Update: DbtPlyEngine uses addParameters().

Location:

trunk

Files:

• examples/ProducerConsumerExample/ConsumerExample.cpp (modified) (1 diff)
• include/Pacpus/DbitePlayer/DbtPlyEngine.h (modified) (2 diffs)
• src/DBITEPlayerLib/DbtPlyEngine.cpp (modified) (4 diffs)
• src/PacpusLib/ComponentBase.cpp (modified) (1 diff)

trunk/examples/ProducerConsumerExample/ConsumerExample.cpp

@@ -22 +22 @@
 
     namespace po = boost::program_options;
-    
     addParameters()
         ("output-path", po::value<std::string>(&mOutputFileName)->default_value("consumer.txt"), "set output file path")

trunk/include/Pacpus/DbitePlayer/DbtPlyEngine.h

@@ -25 +25 @@
 #include <QSemaphore>
 #include <QThread>
+#include <string>
 
 namespace pacpus {
@@ -133 +134 @@
 
     /// where the data are stored
-    QString dataDir_;
+    std::string mDataDir;
 
     /// mode
     PlayMode replayMode_;
+
+    std::string mLoggerConfigFile;
 
 Q_SIGNALS:

trunk/src/DBITEPlayerLib/DbtPlyEngine.cpp

@@ -22 +22 @@
 
 DECLARE_STATIC_LOGGER("pacpus.core.DbtPlyEngine");
-
-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;
@@ -53 +45 @@
     tDbtMin_ = numeric_limits<road_time_t>::max();
     tDbtMax_ = 0;
-    dataDir_ = QString::null;
+
+    namespace po = boost::program_options;
+    addParameters()
+        ("datadir", po::value<string>(&mDataDir)->required(), "set root data directory")
+        ("replay_mode", po::value<int>(&reinterpret_cast<int&>(replayMode_))->default_value(PlayModeLastData), "set data replay mode")
+        ("log-config-file", po::value<string>(&mLoggerConfigFile), "set logger configuration file path")
+    ;
 }
 
@@ -78 +76 @@
 QString DbtPlyEngine::getDataDir()
 {
-    return dataDir_;
+    return mDataDir.c_str();
 }
 
@@ -157 +155 @@
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyEngine::configureComponent(XmlComponentConfig config)
 {
-    // datadir
-    dataDir_ = config.getProperty(kPropertyDataDirectory);
-    LOG_INFO("property " << kPropertyDataDirectory << "=\""
-             << dataDir_ << "\"");
-    if (dataDir_.isNull()) {
-        LOG_FATAL("The data directory '" << getName() << "' is invalid or unavailable!");
-    }
-
-    dataDir_ = QDir::toNativeSeparators(dataDir_);
-    if (!dataDir_.endsWith(QDir::separator())) {
-        dataDir_ += QDir::separator();
+    {
+        // data directory: add path separator at end if needed
+        QString dataDir = mDataDir.c_str();
+        dataDir = QDir::toNativeSeparators(dataDir);
+        if (!dataDir.endsWith(QDir::separator())) {
+            dataDir += QDir::separator();
+            mDataDir = dataDir.toStdString();
+        }
     }
 
     ////////////////////////////////////////////////////////////////////////////////
     // logger configuration
-    QString loggerConfig = config.getProperty(kPropertyLoggerConfiguration);
-    LOG_INFO("property " << kPropertyLoggerConfiguration << "=\""
-             << loggerConfig << "\"");
-    if (!loggerConfig.isNull()) {
-        LOG_INFO("configuring logger with file '" << loggerConfig << "'");
-        LogConfigurator::configureLoggerWithFile(loggerConfig.toStdString().c_str());
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // Replay Mode
-    QString replayModeValue = config.getProperty(kPropertyReplayMode);
-    LOG_INFO("property " << kPropertyReplayMode << "=\""
-             << replayModeValue << "\"");
-    if (replayModeValue.isNull()) {
-        LOG_INFO("property " << kPropertyReplayMode << " unset."
-                 << " Set to default = 1.");
-        replayMode_ = PlayModeLastData;
-    } else {
-        if (kPropertyReplayModeLastData == replayModeValue.toStdString()) {
-            replayMode_ = PlayModeLastData;
-        } else if (kPropertyReplayModeAllData == replayModeValue.toStdString()) {
-            replayMode_ = PlayModeAllData;
-        } else {
-            LOG_WARN("unknown " << kPropertyReplayMode << " '" << replayModeValue << "'."
-                     << " Set to default = 1.");
-            replayMode_ = PlayModeLastData;
-        }
+    if (!mLoggerConfigFile.empty()) {
+        LOG_INFO("configuring logger with file '" << mLoggerConfigFile << "'");
+        LogConfigurator::configureLoggerWithFile(mLoggerConfigFile.c_str());
     }
 

trunk/src/PacpusLib/ComponentBase.cpp

@@ -197 +197 @@
             po::command_line_parser(xargs)
                 .options(mOptionsDescription)
-                //.allow_unregistered()
+                //.allow_unregistered()   // FIXME: temporary only, at term all the components specify all parameters
                 .run()
         , vm);