Changeset 138 in pacpussensors for trunk

Timestamp:

Feb 3, 2017, 4:14:32 PM (8 years ago)

Author:

ldecherf

Message:

Gestion des output

Location:

trunk/Vislab

Files:

• CMakeLists.txt (modified) (4 diffs)
• DiskWriter.cpp (modified) (1 diff)
• Outputter.h (modified) (3 diffs)
• VislabCamera.hpp (modified) (2 diffs)
• VislabComponent.cpp (modified) (1 diff)
• VislabComponent.hpp (modified) (1 diff)
• VislabComponentPlugin.cpp (deleted)
• VislabComponentPlugin.h (deleted)
• VislabComponentPlugin.json (deleted)

trunk/Vislab/CMakeLists.txt

@@ -26 +26 @@
     ${PACPUS_INCLUDE_DIR}
     ${PACPUS_INCLUDE_DIR}/Pacpus/ 
-        "C:/Program Files (x86)/lib3dv/include/lib3dv"
+
 )
+#"C:/Program Files (x86)/lib3dv/include/lib3dv"
 
 # ========================================
@@ -45 +46 @@
     Display.h
     VislabImageProcessor.h
-        Outputter.h
+    Outputter.h
 )
 set(PROJECT_SRCS
@@ -54 +55 @@
     Display.cpp
     VislabImageProcessor.cpp
-        Outputter.cpp
+    Outputter.cpp
 )
 
@@ -107 +108 @@
                       ${QT_LIBRARIES}
                       ${OpenCV_LIBS}
-                      "C:/Program Files (x86)/lib3dv/lib/3dv.lib"
+
                      )
+#"C:/Program Files (x86)/lib3dv/lib/3dv.lib"
 ################################################################################
 # FOLDERS

trunk/Vislab/DiskWriter.cpp

@@ +1 @@
+
 #include "DiskWriter.h"
 #include <iostream>

trunk/Vislab/Outputter.h

@@ -6 +6 @@
 #include <Pacpus/kernel/ComponentBase.h>
 #include <string.h>
-#include "VislabComponent.hpp"
+//#include "VislabComponent.hpp"
 #include <Pacpus/kernel/InputOutputInterface.h>
 #include "VislabImageProcessor.h"
@@ -24 +24 @@
 #include <opencv/highgui.h>
 
+namespace pacpus {
+class VislabComponent;
+}
 
 class Outputter : public VislabImageProcessor
@@ -31 +34 @@
         /// Ctor of CVWebcamComponent.
         Outputter(lib3dv::image::type::types imageType);
-        void setOutput(pacpus::OutputInterface<cv::Mat, pacpus::VislabComponent>* output);
+    void setOutput(pacpus::OutputInterface<cv::Mat, pacpus::VislabComponent>* output);
         
         void process(cv::Mat const& frame);

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 <lib3dv/device.h>
+#include <lib3dv/error.h>
 #include "DiskWriter.h"
 #include "Display.h"
 #include "VislabImageProcessor.h"
 #include "Outputter.h"
-#include "VislabComponent.hpp"
 
 #include <boost/asio/io_service.hpp>
@@ -27 +26 @@
 namespace pacpus
 {
+class VislabComponent;
+
   class VislabCamera
     //: public pacpus::AsyncWorkerBase

trunk/Vislab/VislabComponent.cpp

@@ -92 +92 @@
 void VislabComponent::addOutputs()
 {
-    // Transformer en QImage
-    addOutput<cv::Mat, VislabComponent>("Image");
+    addOutput<cv::Mat, VislabComponent>("image");
         addOutput<cv::Mat, VislabComponent>("disparity");
 }

trunk/Vislab/VislabComponent.hpp

@@ -12 +12 @@
 #include <Pacpus/kernel/DbiteFile.h>
 #include <Pacpus/kernel/pacpus.h>
-#include <20150310_lib3dv-1.2.0/src/display.h>
 
-#include <lib3dv-1.2.0/lib3dv/device.h>
+#include <lib3dv/device.h>
 
 #ifdef WIN32