Changeset 288 in pacpusframework for trunk/src/DBITEPlayerLib

Timestamp:

03/26/14 21:27:30 (10 years ago)

Author:

Marek Kurdej

Message:

Using boost::shared_ptr for storing components.

Location:

trunk/src/DBITEPlayerLib

Files:

• DbtPlyEngine.cpp (modified) (7 diffs)
• DbtPlyFileManager.cpp (modified) (2 diffs)
• DbtPlyTrigger.cpp (modified) (1 diff)
• DbtPlyUserInterface.cpp (modified) (4 diffs)

trunk/src/DBITEPlayerLib/DbtPlyEngine.cpp

@@ -10 +10 @@
 #include <Pacpus/kernel/Log.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 #include <limits>
 #include <QDir>
@@ -226 +226 @@
 void DbtPlyEngine::playEvent()
 {
+    using boost::dynamic_pointer_cast;
+
     LOG_DEBUG("Clicked: play");
 
     // get user interface
     ComponentManager * mgr = ComponentManager::getInstance();
-    DbtPlyUserInterface * ui = dynamic_cast<DbtPlyUserInterface *>(mgr->getComponent("dbiteUserInterface"));
-    assert(ui);
+    boost::shared_ptr<DbtPlyUserInterface> ui = dynamic_pointer_cast<DbtPlyUserInterface>(mgr->getComponent("dbiteUserInterface"));
+    BOOST_ASSERT(ui);
     // get time value from slider
     lastTDbt_ = ui->getTime() + tDbtMin_;
@@ -268 +270 @@
 void DbtPlyEngine::setState(DbtPlyEngineState * newState)
 {
-    assert(newState);
+    BOOST_ASSERT(newState);
     LOG_DEBUG(mCurrentState->toString() << " => " << newState->toString());
     mCurrentState = newState;
@@ -284 +286 @@
         mSpeed = kMaxSpeed;
     }
-    assert(kMinSpeed <= mSpeed);
-    assert(mSpeed <= kMaxSpeed);
+    BOOST_ASSERT(kMinSpeed <= mSpeed);
+    BOOST_ASSERT(mSpeed <= kMaxSpeed);
     LOG_INFO("event: Speed Up, speed = " << mSpeed);
     Q_EMIT displayStateSig(mCurrentState, mSpeed);
@@ -296 +298 @@
         mSpeed = kMinSpeed;
     }
-    assert(kMinSpeed <= mSpeed);
-    assert(mSpeed <= kMaxSpeed);
+    BOOST_ASSERT(kMinSpeed <= mSpeed);
+    BOOST_ASSERT(mSpeed <= kMaxSpeed);
     LOG_INFO("event: Speed Up, speed = " << mSpeed);
     Q_EMIT displayStateSig(mCurrentState, mSpeed);
@@ -304 +306 @@
 void DbtPlyEngine::reset()
 {
+    using boost::dynamic_pointer_cast;
+
     lastTNow_ = road_time();
     lastTDbt_ = tDbtMin_;
@@ -311 +315 @@
     // get user interface
     ComponentManager * mgr = ComponentManager::getInstance();
-    DbtPlyUserInterface * ui = dynamic_cast<DbtPlyUserInterface *>(mgr->getComponent("dbiteUserInterface"));
-    assert(ui);
+    boost::shared_ptr<DbtPlyUserInterface> ui = dynamic_pointer_cast<DbtPlyUserInterface>(mgr->getComponent("dbiteUserInterface"));
+    BOOST_ASSERT(ui);
     // reset time value of the slider
     ui->resetTime();

trunk/src/DBITEPlayerLib/DbtPlyFileManager.cpp

@@ -67 +67 @@
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyFileManager::configureComponent(XmlComponentConfig config)
 {
+    using boost::dynamic_pointer_cast;
+
     ComponentManager * mgr = ComponentManager::getInstance();
-    mEngine = static_cast<DbtPlyEngine *>(mgr->getComponent("dbiteEngine"));
-    if (NULL == mEngine ) {
+    mEngine = dynamic_pointer_cast<DbtPlyEngine>(mgr->getComponent("dbiteEngine"));
+    if (!mEngine) {
         LOG_FATAL("cannot get a pointer of the 'dbiteEngine' component");
         return CONFIGURED_FAILED;
@@ -81 +83 @@
     // register the road_time_t type for the connection
     qRegisterMetaType<road_time_t>("road_time_t");
-    connect(mEngine, SIGNAL(play(road_time_t,road_time_t, bool)),
+    connect(mEngine.get(), SIGNAL(play(road_time_t,road_time_t, bool)),
             this, SLOT(playData(road_time_t,road_time_t, bool)),
             Qt::DirectConnection);
     connect(this, SIGNAL(tMinMaxIs(road_time_t,road_time_t )),
-            mEngine, SLOT(tMinMax(road_time_t, road_time_t)));
-    connect(mEngine, SIGNAL(stopfile()),
+            mEngine.get(), SLOT(tMinMax(road_time_t, road_time_t)));
+    connect(mEngine.get(), SIGNAL(stopfile()),
             this, SLOT (beginfile()));
 

trunk/src/DBITEPlayerLib/DbtPlyTrigger.cpp

@@ -39 +39 @@
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyTrigger::configureComponent(XmlComponentConfig /*config*/)
 {
+    using boost::dynamic_pointer_cast;
+
     ComponentManager * mgr = ComponentManager::getInstance();
     // we get a pointer to the engine component
-    mEngine = dynamic_cast<DbtPlyEngine *>(mgr->getComponent("dbiteEngine"));
-    if (NULL == mEngine) {
+    mEngine = dynamic_pointer_cast<DbtPlyEngine>(mgr->getComponent("dbiteEngine"));
+    if (!mEngine) {
         LOG_FATAL("cannot get a pointer of the 'dbiteEngine' component");
         return CONFIGURED_FAILED;
     }
     connect(this, SIGNAL(triggerSig()),
-            mEngine,SLOT(engReceiver()),
+            mEngine.get(), SLOT(engReceiver()),
             Qt::DirectConnection);
 

trunk/src/DBITEPlayerLib/DbtPlyUserInterface.cpp

@@ -61 +61 @@
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyUserInterface::configureComponent(XmlComponentConfig /*config*/)
 {
+    using boost::dynamic_pointer_cast;
+
     ComponentManager * mgr = ComponentManager::getInstance();
-    mEngine = dynamic_cast<DbtPlyEngine *>(mgr->getComponent("dbiteEngine"));
-    if (NULL == mEngine) {
+    mEngine = dynamic_pointer_cast<DbtPlyEngine>(mgr->getComponent("dbiteEngine"));
+    if (!mEngine) {
         LOG_FATAL("cannot get a pointer of the 'dbiteEngine' component");
         return CONFIGURED_FAILED;
@@ -275 +277 @@
         componentTableWidget->setItem(idx, 0, new QTableWidgetItem(componentName));
 
-        ComponentBase * component = mgr->getComponent(componentName);
-        if (component) {
-            COMPONENT_STATE state = component->getState();
-
-            QString stateString;
-            switch (state) {
-            case STOPPED:
-                stateString = tr("Stopped");
-                break;
-            case NOT_MONITORED:
-                stateString = tr("Not monitored");
-                break;
-            case MONITOR_OK:
-                stateString = tr("Monitor OK");
-                break;
-            case MONITOR_NOK:
-                stateString = tr("Monitor wrong");
-                break;
-
-            default:
-                stateString = tr("UNKNOWN");
-                break;
-            }
-            componentTableWidget->setItem(idx, 1, new QTableWidgetItem(stateString));
-
-            // TODO: ADD component type and some detailed information (e.g. parameters)
-            //QString componentInfo = component->getDetails();
-            //componentTableWidget->setItem(idx, 2, new QTableWidgetItem(componentInfo));
+        ComponentSharedPointer component = mgr->getComponent(componentName);
+        if (!component) {
+            continue;
         }
+
+        COMPONENT_STATE state = component->getState();
+
+        QString stateString;
+        switch (state) {
+        case STOPPED:
+            stateString = tr("Stopped");
+            break;
+        case NOT_MONITORED:
+            stateString = tr("Not monitored");
+            break;
+        case MONITOR_OK:
+            stateString = tr("Monitor OK");
+            break;
+        case MONITOR_NOK:
+            stateString = tr("Monitor wrong");
+            break;
+
+        default:
+            stateString = tr("UNKNOWN");
+            break;
+        }
+        componentTableWidget->setItem(idx, 1, new QTableWidgetItem(stateString));
+
+        // TODO: ADD component type and some detailed information (e.g. parameters)
+        //QString componentInfo = component->getDetails();
+        //componentTableWidget->setItem(idx, 2, new QTableWidgetItem(componentInfo));
     }
 }
@@ -309 +313 @@
 void DbtPlyUserInterface::connectButtons()
 {
+    // FIXME: use Qt5 connect style
     connect(playBut, SIGNAL(clicked()),
-        mEngine, SLOT(playEvent()));
+        mEngine.get(), SLOT(playEvent()));
     connect(pauseBut, SIGNAL(clicked()),
-        mEngine, SLOT(pauseEvent()));
+        mEngine.get(), SLOT(pauseEvent()));
     connect(stopBut, SIGNAL(clicked()),
-        mEngine, SLOT(stopEvent()));
+        mEngine.get(), SLOT(stopEvent()));
     connect(speedUpBut, SIGNAL(clicked()),
-        mEngine, SLOT(speedUpEvent()));
+        mEngine.get(), SLOT(speedUpEvent()));
     connect(speedDownBut, SIGNAL(clicked()),
-        mEngine, SLOT(speedDownEvent()));
+        mEngine.get(), SLOT(speedDownEvent()));
 }
 
 void DbtPlyUserInterface::connectDisplay()
 {
-    connect(mEngine, SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
+    connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
         this, SLOT(displayStateSlot(DbtPlyEngineState *, float)));
 
-    connect (mEngine, SIGNAL(timeMinMax(road_time_t, road_time_t)),
+    connect (mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)),
         this, SLOT(displayMinMaxTime(road_time_t , road_time_t)));
-    connect (mEngine, SIGNAL(curReplayTime(road_time_t)),
+    connect (mEngine.get(), SIGNAL(curReplayTime(road_time_t)),
         this, SLOT(displayTime(road_time_t)));
     connect (rev, SIGNAL(toggled(bool)),
-        mEngine, SLOT(changeDirection(bool)));
+        mEngine.get(), SLOT(changeDirection(bool)));
 }
 
@@ -337 +342 @@
 {
     connect (timeSlider, SIGNAL(sliderPressed()),
-        mEngine, SLOT(pauseEvent()));
+        mEngine.get(), SLOT(pauseEvent()));
     connect (timeSlider, SIGNAL(sliderReleased()),
-        mEngine, SLOT(playEvent()));
+        mEngine.get(), SLOT(playEvent()));
 }