Changeset 131 in pacpussensors

Timestamp:

Dec 9, 2016, 9:29:50 AM (8 years ago)

Author:

ldecherf

Message:

Comments

Location:

trunk/Vislab

Files:

• CMakeLists.txt (modified) (4 diffs)
• DiskWriter.cpp (modified) (4 diffs)
• Display.cpp (modified) (3 diffs)
• VislabCamera.cpp (modified) (4 diffs)
• VislabCamera.hpp (modified) (1 diff)
• VislabComponent.cpp (modified) (1 diff)
• VislabImageProcessor.cpp (modified) (1 diff)
• VislabImageProcessor.h (modified) (1 diff)

trunk/Vislab/CMakeLists.txt

@@ -1 +1 @@
 project(VislabComponent)
+
+add_definitions( -DVISLAB_COMPONENT_EXPORTS )
 
 set(${PROJECT_NAME}_VERSION_MAJOR 0)
@@ -24 +26 @@
     ${PACPUS_INCLUDE_DIR}
     ${PACPUS_INCLUDE_DIR}/Pacpus/ 
-        C:/Users/ldecherf/Documents/Visual Studio 2015/Projects/dev/pacpus/pacpussensors/Vislab/lib3dv-1.2.0/lib3dv 
+        "C:/Program Files (x86)/lib3dv/include/lib3dv"
 )
 
@@ -57 +59 @@
     ${PLUGIN_HDR}
     VislabComponent.hpp
-    VislabCamera.hpp
     Display.h
 )
@@ -104 +105 @@
                       ${QT_LIBRARIES}
                       ${OpenCV_LIBS}
-                      3dv
+                      "C:/Program Files (x86)/lib3dv/lib/3dv.lib"
                      )
 ################################################################################

trunk/Vislab/DiskWriter.cpp

@@ -7 +7 @@
 const int MAX_LENGTH_NAME = 512;
 
+    /*! A more elaborate description of the constructor*/
     DiskWriter::DiskWriter(const QString name, lib3dv::image::type::types imageType) : VislabImageProcessor(name, imageType)
     {
         QDir directory;
+        /*! For the classic picture */
         if (imageType == lib3dv::image::type::RIGHT_RECTIFIED)
         {
@@ -21 +23 @@
 
         }
+        /*! For the disparity picture */
         if (imageType == lib3dv::image::type::DSI)
         {
@@ -33 +36 @@
     }
 
-
+    /*! process function from the DiskWriter class with a cv:Mat parameter */
     void DiskWriter::process(cv::Mat const& frame)
     {
@@ -45 +48 @@
           throw std::runtime_error("cannot save the following frame: " + filename.toStdString());
 
+        /*! Write of the file on the disk */
         mDBTFile.writeRecord(road_time(), 0, filename.toStdString().c_str(), MAX_LENGTH_NAME);
       }

trunk/Vislab/Display.cpp

@@ -5 +5 @@
 #include "VislabImageProcessor.h"
 
+    /*! A more elaborate description of the constructor*/
 Display::Display(const QString& windowName, lib3dv::image::type::types imageType) : VislabImageProcessor(windowName, imageType)
 {
@@ -12 +13 @@
 }
 
+/*! DisplayFrame function from the Display class with a cv:Mat parameter */
 void Display::DisplayFrame(cv::Mat const& frame)
 {
@@ -17 +19 @@
 }
 
+/*! process function from the Display class with a cv:Mat parameter
+    Emit the signal to diplay the frame
+*/
 void Display::process(cv::Mat const& frame)
 {

trunk/Vislab/VislabCamera.cpp

@@ -24 +24 @@
 
 //ComponentFactory<VislabCamera> sFactory("VislabComponent");
-
+/*! Constructor */
     VislabCamera::VislabCamera(const QString& name)
      :diskwriterVideo(name,lib3dv::image::type::RIGHT_RECTIFIED),
@@ -41 +41 @@
 void VislabCamera::open()
 {
-    curr_devices = lib3dv::device::enumerate(boost::asio::ip::address_v4::from_string("192.168.0.2"), 1, error);
+        
+    curr_devices = lib3dv::device::enumerate(boost::asio::ip::address_v4::from_string("192.168.0.1"), 1, error);
     if(error != lib3dv::error::NONE)
         std::cout << "[EE] 3dv-client: error detected: " << error << std::endl;
@@ -51 +52 @@
     }
       //disk_writer = boost::shared_ptr< ::disk_writer>(new ::disk_writer(paths, data_format, autonumber, params, guid_type, log_level));
+        std::cout << "[II] 3dv-client: banane" << std::endl;
+        curr_devices[0].log_level(2);
+        curr_devices[0].timeout(boost::posix_time::milliseconds(5000));
     curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>, unsigned int)>(boost::bind(&::VislabImageProcessor::image_callback, &displayVideo, _1, _2)));
     curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>, unsigned int)>(boost::bind(&::VislabImageProcessor::image_callback, &displayDisparite, _1, _2)));
@@ -58 +62 @@
     if(error != lib3dv::error::NONE)
       std::cout << "[EE] 3dv-client: error detected: " << error << std::endl;
+        else 
+                std::cout << "[II] 3dv-client: device successfully opened" << std::endl;
 }
 

trunk/Vislab/VislabCamera.hpp

@@ -11 +11 @@
 // Includes, lib3dv.
 #include <lib3dv-1.2.0/lib3dv/device.h>
+#include <lib3dv-1.2.0/lib3dv/error.h>
 #include "DiskWriter.h"
 #include "Display.h"

trunk/Vislab/VislabComponent.cpp

@@ -8 +8 @@
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/DbiteFileTypes.h>
-#include </home/louis/dev/pacpus/pacpusframework/include/Pacpus/kernel/DbiteException.h>
-//#include <lib3dv-1.2.0/lib3dv/device.h>
+#include <Pacpus/kernel/DbiteException.h>
+#include <lib3dv-1.2.0/lib3dv/device.h>
 #include <20150310_lib3dv-1.2.0/src/display.h>
 

trunk/Vislab/VislabImageProcessor.cpp

@@ -9 +9 @@
     void VislabImageProcessor::image_callback(boost::shared_ptr< const lib3dv::image> image, unsigned int)
     {
+                //std::cout << "[II] 3dv-client: Gruyere" << std::endl;
         if(image->m_type == mImageType)
         {

trunk/Vislab/VislabImageProcessor.h

@@ -22 +22 @@
 public:
     VislabImageProcessor(const QString& name, lib3dv::image::type::types imageType);
-    void image_callback(boost::shared_ptr< const lib3dv::image>, unsigned int);
+    void image_callback(boost::shared_ptr<const lib3dv::image>, unsigned int);
     virtual void process(cv::Mat const& frame) = 0;
     QString getName();