Changeset 142 in pacpussensors for trunk/Vislab/VislabCamera.cpp

Timestamp:

Mar 30, 2017, 4:18:32 PM (8 years ago)

Author:

ldecherf

Message:

Ajout de la classe outputter et modification d'openCV

File:

• trunk/Vislab/VislabCamera.cpp (modified) (3 diffs)

trunk/Vislab/VislabCamera.cpp

@@ -10 +10 @@
 
 // Includes lib3dv
-#include <lib3dv-1.2.0/lib3dv/device.h>
+#include <lib3dv/device.h>
 #include "DiskWriter.h"
 #include "Display.h"
@@ -43 +43 @@
 void VislabCamera::open()
 {
-        
-    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;
+    curr_devices = lib3dv::device::enumerate(boost::asio::ip::address_v4::from_string("192.168.0.2"), 0);
+        if (error != lib3dv::error::NONE)
+        {
+                std::cout << "[EE] 3dv-client: error detected: " << error << std::endl;
+                return;
+        }
 
     if(curr_devices.empty())
     {
         std::cout << "[EE] 3dv-client: no devices found" << std::endl;
+                return;
         //return lib3dv::error::NONE;
     }
       //disk_writer = boost::shared_ptr< ::disk_writer>(new ::disk_writer(paths, data_format, autonumber, params, guid_type, log_level));
-        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)));
-    curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>, unsigned int)>(boost::bind(&::VislabImageProcessor::image_callback, &diskwriterVideo, _1, _2)));
-    curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>, unsigned int)>(boost::bind(&::VislabImageProcessor::image_callback, &diskwriterDisparite, _1, _2)));
-    curr_devices[0].start_transmission(error);
+
+    //curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>)>(boost::bind(&::VislabImageProcessor::image_callback, &displayVideo, _1)));
+    //curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>)>(boost::bind(&::VislabImageProcessor::image_callback, &displayDisparite, _1)));
+    //curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>)>(boost::bind(&::VislabImageProcessor::image_callback, &diskwriterVideo, _1)));
+    //curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>)>(boost::bind(&::VislabImageProcessor::image_callback, &diskwriterDisparite, _1)));
+        curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>)>(boost::bind(&::VislabImageProcessor::image_callback, &outputVideo, _1)));
+        curr_devices[0].connect_image_callback(boost::function<void(boost::shared_ptr< const lib3dv::image>)>(boost::bind(&::VislabImageProcessor::image_callback, &outputDisparite, _1)));
+        curr_devices[0].start_transmission(false);
     if(error != lib3dv::error::NONE)
       std::cout << "[EE] 3dv-client: error detected: " << error << std::endl;
@@ -69 +73 @@
 void VislabCamera::close()
 {
-  curr_devices[0].stop_transmission(error);
-  //curr_devices[0].poweroff(error);
+        if (curr_devices.empty())
+        {
+                std::cout << "[EE] 3dv-client: no devices found" << std::endl;
+                return;
+                //return lib3dv::error::NONE;
+        }
+        else
+        {
+                curr_devices[0].stop_transmission();
+        }
+                
+  //curr_devices[0].poweroff();
 }