Changeset 133 in pacpussensors for trunk/Vislab

Timestamp:

02/01/17 09:37:04 (7 years ago)

Author:

ldecherf

Message:

dsf

Location:

trunk/Vislab

Files:

• Display.cpp (modified) (1 diff)
• VislabCamera.cpp (modified) (2 diffs)
• VislabCamera.hpp (modified) (3 diffs)
• VislabComponent.cpp (modified) (1 diff)

trunk/Vislab/Display.cpp

@@ -24 +24 @@
 void Display::process(cv::Mat const& frame)
 {
-    emit doDisplay(frame);;
+    emit doDisplay(frame);
 }
 

trunk/Vislab/VislabCamera.cpp

@@ -52 +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));
@@ -66 +65 @@
 }
 
-void
-VislabCamera::close()
+void VislabCamera::close()
 {
   curr_devices[0].stop_transmission(error);
   //curr_devices[0].poweroff(error);
 }
+
+void VislabCamera::setVideoOutput(OutputInterface<cv::Mat, VislabComponent>* output)
+{
+        outputVideo.setOutput(output);
+}
+
+void VislabCamera::setDispariteOutput(OutputInterface<cv::Mat, VislabComponent>* output)
+{
+        outputDisparite.setOutput(output);
+}

trunk/Vislab/VislabCamera.hpp

@@ -15 +15 @@
 #include "Display.h"
 #include "VislabImageProcessor.h"
-
+#include "Outputter.h"
+#include "VislabComponent.hpp"
 
 #include <boost/asio/io_service.hpp>
@@ -42 +43 @@
       void close();
 
+          void setVideoOutput(OutputInterface<cv::Mat, VislabComponent>* output);
+          void setDispariteOutput(OutputInterface<cv::Mat, VislabComponent>* output);
+
       std::vector<lib3dv::device> curr_devices;
       DiskWriter diskwriterVideo;
@@ -50 +54 @@
       unsigned int log_level;
       lib3dv::image::type imageType;
+          Outputter outputVideo;
+          Outputter outputDisparite;
+
   };
 }

trunk/Vislab/VislabComponent.cpp

@@ -93 +93 @@
 {
     // Transformer en QImage
-    //addOutput<lib3dv::image, VislabComponent("image");
+    addOutput<cv::Mat, VislabComponent>("image");
+        addOutput<cv::Mat, VislabComponent>("disparity");
 }