Changeset 181 in pacpusframework for trunk/src

Timestamp:

Oct 21, 2013, 1:30:41 PM (11 years ago)

Author:

Marek Kurdej

Message:

Minor fixes. Clean-up.

Location:

trunk/src

Files:

• DBITEPlayerLib/DbtPlyEngine.cpp (modified) (2 diffs)
• DBITEPlayerLib/DbtPlyFileManager.cpp (modified) (4 diffs)
• PacpusLib/ComponentBase.cpp (modified) (2 diffs)

trunk/src/DBITEPlayerLib/DbtPlyEngine.cpp

@@ -27 +27 @@
 static const SpeedType kMinSpeed = 1.0 / 32;
 static const SpeedType kMaxSpeed = 32;
+
+static const PlayMode kDefaultPlayMode = PlayModeLastData;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -49 +51 @@
     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")
+        ("replay_mode", po::value<unsigned>(&reinterpret_cast<unsigned&>(replayMode_))->default_value(kDefaultPlayMode), "set data replay mode")
         ("log-config-file", po::value<string>(&mLoggerConfigFile), "set logger configuration file path")
     ;

trunk/src/DBITEPlayerLib/DbtPlyFileManager.cpp

@@ -21 +21 @@
 DECLARE_STATIC_LOGGER("pacpus.core.DbtPlyFileManager");
 
-const char * kPropertyVerbose = "verbose";
-const int kPropertyVerboseDefaultValue = 1;
-
-const char * kPropertyDbiteFileName = "dbt";
-
 // It is the maximum time elapsed between the computation of the tDbt and the data replay in microseconds
 static const int kMaxPendingTimeFromEngineMicrosecs = 10000;
+
+static const char kFilenameSeparator = '|';
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -40 +37 @@
     tMin_ = numeric_limits<road_time_t>::max();
     tMax_ = numeric_limits<road_time_t>::min();
+
+    namespace po = boost::program_options;
+    addParameters()
+        ("dbt", po::value<std::string>(&dbtProperty_)->required(), "set path to input DbiteFile(s) (*.dbt), separate files by '|'")
+    ;
+}
+
+QStringList DbtPlyFileManager::getDbiteFilenameList() const
+{
+    return mDbtFilenameList;
 }
 
@@ -82 +89 @@
             this, SLOT (beginfile()));
 
-
     // get the properties in the XML node
-    /////////////////////////////////////////
-    {
-        QString verbose = config.getProperty(kPropertyVerbose);
-        if (verbose.isNull()) {
-            LOG_INFO("property " << kPropertyVerbose << " not set."
-                     << " Set to default = " << kPropertyVerboseDefaultValue
-                     );
-            // default value
-            mVerbose = kPropertyVerboseDefaultValue;
-        } else {
-            verbose = verbose.toLower();
-            LOG_DEBUG("property " << kPropertyVerbose << "=\""
-                      << verbose.toStdString() << "\"");
-            mVerbose = verbose.toInt();
-            LOG_DEBUG("property interpreted as " << kPropertyVerbose << "=\""
-                      << mVerbose << "\"");
-        }
-    }
-
-    /////////////////////////////////////////
-    dbtProperty_ = config.getProperty(kPropertyDbiteFileName);
-    mShowGui = config.getProperty("ui").toInt();
     mDbtDataPath = mEngine->getDataDir();
-
-    mDbtFilenameList = dbtProperty_.split("|");
+    mDbtFilenameList = QString(dbtProperty_.c_str()).split(kFilenameSeparator);
 
     for (int i = 0; i < mDbtFilenameList.size(); ++i) {
@@ -159 +142 @@
 /// Starts activity of the file manager
 void DbtPlyFileManager::startActivity()
-{ 
+{
     // graphical user interface
-    if (mShowGui) {
+    if (hasGui()) {
         displayUI();
     }

trunk/src/PacpusLib/ComponentBase.cpp

@@ -13 +13 @@
 #include <string>
 #include <vector>
+
+const bool kPropertyVerboseDefaultValue = false;
 
 namespace po = boost::program_options;
@@ -178 +180 @@
     LOG_WARN("Component " << getName() << " does not containt output " << outputName);
     return NULL;
+}
+
+bool ComponentBase::hasGui() const
+{
+    return mHasGui;
+}
+
+bool ComponentBase::isOutputVerbose() const
+{
+    return mVerbose || (getVerbosityLevel() > 0);
+}
+
+int ComponentBase::getVerbosityLevel() const
+{
+    return mVerbosityLevel;
 }