Changeset 50 in pacpussensors for trunk/StdDbtPlayerComponents

Timestamp:

Jun 12, 2014, 11:17:03 AM (10 years ago)

Author:

phudelai

Message:

Flea3Component: Shared memory changed for stereovision
StereoVisionDisparity: Added for the PFE of Pierre

Location:

trunk/StdDbtPlayerComponents

Files:

• CMakeLists.txt (modified) (2 diffs)
• DbtPlyImageManager.cpp (modified) (3 diffs)
• DbtPlyImageManager.h (modified) (1 diff)
• DbtPlySickLDMRSManager.cpp (modified) (1 diff)
• DbtPlySickLDMRSManager.h (modified) (1 diff)
• DbtPlySickLMSManager.h (modified) (1 diff)
• DbtPlyStereoManager.cpp (modified) (2 diffs)
• DbtPlyStereoManager.h (modified) (1 diff)
• ImageViewer.h (modified) (1 diff)

trunk/StdDbtPlayerComponents/CMakeLists.txt

@@ -25 +25 @@
         ImageViewer.h
         StdDbtPlayerComponentsConfig.h
-    DbtPlySickLMSManager.h
-    DbtPlySickLDMRSManager.h
+    # DbtPlySickLMSManager.h
+    # DbtPlySickLDMRSManager.h
 )
 
@@ -37 +37 @@
         DbtPlyImageManager.cpp
         DbtPlyStereoManager.cpp
-    DbtPlySickLMSManager.cpp
-    DbtPlySickLDMRSManager.cpp
+    # DbtPlySickLMSManager.cpp
+    # DbtPlySickLDMRSManager.cpp
         ImageViewer.cpp
         ${HDRS}

trunk/StdDbtPlayerComponents/DbtPlyImageManager.cpp

@@ -13 +13 @@
 #include "ImageViewer.h"
 
-#include "kernel/ComponentFactory.h"
-#include "kernel/ComponentManager.h"
-#include "kernel/DbiteFileTypes.h"
-#include "kernel/Log.h"
-#include "PacpusTools/ShMem.h"
+#include "Pacpus/kernel/ComponentFactory.h"
+#include "Pacpus/kernel/ComponentManager.h"
+#include "Pacpus/kernel/DbiteFileTypes.h"
+#include "Pacpus/kernel/Log.h"
+#include "Pacpus/PacpusTools/ShMem.h"
 
 #include <iostream>
@@ -134 +134 @@
 {    
     mShMemName = kDefaultMemoryName.c_str();
-    if (param.getProperty("shmem") != QString::null) {
-        mShMemName = param.getProperty("shmem");
+    if (config.getProperty("shmem") != QString::null) {
+        mShMemName = config.getProperty("shmem");
     } 
     return DbtPlyFileManager::configureComponent(config);
@@ -158 +158 @@
     imviewer_->setMutex(imageMutex_);
     imviewer_->show();
-    imviewer_->setWindowTitle(componentName);
+    imviewer_->setWindowTitle(name());
     connect(this, SIGNAL(displayIm(QImage*)), imviewer_, SLOT(display(QImage*)));
 }

trunk/StdDbtPlayerComponents/DbtPlyImageManager.h

@@ -16 +16 @@
 
 #include "StdDbtPlayerComponentsConfig.h"
-#include "DbitePlayer/DbtPlyFileManager.h"
+#include "Pacpus/DbitePlayer/DbtPlyFileManager.h"
 
 class ImageViewer;

trunk/StdDbtPlayerComponents/DbtPlySickLDMRSManager.cpp

@@ -17 +17 @@
 #include <string>
 
-#include "kernel/Log.h"
-#include "PacpusTools/ShMem.h"
+#include "Pacpus/kernel/Log.h"
+#include "Pacpus/PacpusTools/ShMem.h"
 
 

trunk/StdDbtPlayerComponents/DbtPlySickLDMRSManager.h

@@ -16 +16 @@
 #include <fstream>
 
-#include "DbitePlayer/DbtPlyFileManager.h"
+#include "Pacpus/DbitePlayer/DbtPlyFileManager.h"
 #include "../Sick/SickLDMRSData.h"
 

trunk/StdDbtPlayerComponents/DbtPlySickLMSManager.h

@@ -16 +16 @@
 #include <fstream>
 
-#include "DbitePlayer/DbtPlyFileManager.h"
+#include "Pacpus/DbitePlayer/DbtPlyFileManager.h"
 #include "../Sick/SickLMSData.h"
 

trunk/StdDbtPlayerComponents/DbtPlyStereoManager.cpp

@@ -9 +9 @@
 #include <iostream>
 
-#include "kernel/ComponentManager.h"
-#include "kernel/DbiteFileTypes.h"
-#include "kernel/Log.h"
+#include "Pacpus/kernel/ComponentManager.h"
+#include "Pacpus/kernel/DbiteFileTypes.h"
+#include "Pacpus/kernel/Log.h"
 
 namespace pacpus {
@@ -140 +140 @@
 
     //load stereo image parameters
-    width_ = param.getProperty("width").toInt();
-    height_ = param.getProperty("height").toInt();
-    depth_ = param.getProperty("depth").toInt();
+    width_ = config.getProperty("width").toInt();
+    height_ = config.getProperty("height").toInt();
+    depth_ = config.getProperty("depth").toInt();
 
     return DbtPlyFileManager::configureComponent(config);

trunk/StdDbtPlayerComponents/DbtPlyStereoManager.h

@@ -9 +9 @@
 
 #include "StdDbtPlayerComponentsConfig.h"
-#include "kernel/ComponentBase.h"
-#include "kernel/ComponentFactory.h"
-#include "DbitePlayer/DbtPlyFileManager.h"
-#include "PacpusTools/ShMem.h"
+#include "Pacpus/kernel/ComponentBase.h"
+#include "Pacpus/kernel/ComponentFactory.h"
+#include "Pacpus/DbitePlayer/DbtPlyFileManager.h"
+#include "Pacpus/PacpusTools/ShMem.h"
 
 namespace pacpus {

trunk/StdDbtPlayerComponents/ImageViewer.h

@@ -14 +14 @@
 
 #include "StdDbtPlayerComponentsConfig.h"
-#include "kernel/road_time.h"
+#include "Pacpus/kernel/road_time.h"
 
 //# include "../../include/VisualMemoryManager/struct.h"