Changeset 147 in pacpussensors


Ignore:
Timestamp:
Apr 14, 2017, 5:55:02 PM (8 years ago)
Author:
ldecherf
Message:

Ajout CameraPlayer

Location:
trunk
Files:
10 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r143 r147  
    8787add_subdirectory(Vislab)
    8888add_subdirectory(CameraViewer)
     89add_subdirectory(CameraPlayer)
    8990
    9091# ========================================

  • trunk/CameraViewer/CMakeLists.txt

    r141 r147  
    7676)
    7777
     78target_compile_definitions(${PROJECT_NAME} PUBLIC OPENCV_MAJOR=${OpenCV_VERSION_MAJOR})
     79
    7880
    7981# ========================================

  • trunk/CameraViewer/CameraViewerComponent.cpp

    r141 r147  
     1
    12
    23// Includes, project.
    … …  
    1819using namespace pacpus;
    1920
    20 // Declare the logger and register the new component.
    21 //DECLARE_STATIC_LOGGER("pacpus.component.vislabCamera")
    22 //REGISTER_COMPONENT(CameraViewerComponent, "Camera");
    2321
    2422ComponentFactory<CameraViewerComponent> sFactory("CameraViewerComponent");
    … …  
    6260void CameraViewerComponent::DisplayFrame(cv::Mat const& frame)
    6361{
    64         //getchar();
    65         //std::cout << getName().toStdString() << std::endl;
    6662        cv::imshow(getName().toStdString(), frame);
    67         //cv::imshow("Image", frame);
    6863}
    6964

  • trunk/CameraViewer/CameraViewerComponent.hpp

    r141 r147  
    1313
    1414// Includes, opencv.
    15 #include <opencv2/opencv.hpp>
    16 #include <opencv2/highgui.hpp>
     15#if (OPENCV_MAJOR == 3)
     16#   include <opencv2/opencv.hpp>
     17#   include <opencv2/highgui.hpp>
     18#else
     19#   include <opencv/cv.h>
     20#   include <opencv/highgui.h>
     21#endif
    1722
    1823

  • trunk/Vislab/CMakeLists.txt

    r142 r147  
    1515endif()
    1616
     17
    1718################################################################################
    1819create_export(EXPORT_HDR ${PROJECT_NAME})
    … …  
    2627    ${PROJECT_BINARY_DIR}
    2728    ${QT_INCLUDE_DIR}
    28         ${OpenCV_INCLUDE_DIRS}
     29    ${OpenCV_INCLUDE_DIRS}
    2930    ${PACPUS_INCLUDE_DIR}
    3031    ${PACPUS_INCLUDE_DIR}/Pacpus/
    31         "C:/Program Files (x86)/lib3dv/include"
     32    "C:/Program Files (x86)/lib3dv/include"
    3233
    3334)
    … …  
    3940link_directories(
    4041        ${PACPUS_LIB_DIR}
    41                 "C:/Program Files (x86)/lib3dv/lib"
     42        "C:/Program Files (x86)/lib3dv/lib"
    4243)
    4344
    … …  
    4950    VislabCamera.hpp
    5051    DiskWriter.h
    51     Display.h
    5252    VislabImageProcessor.h
    5353    Outputter.h
    54         VislabViewerComponent.hpp
    5554)
    5655set(PROJECT_SRCS
    … …  
    5958    VislabCamera.cpp
    6059    DiskWriter.cpp
    61     Display.cpp
    6260    VislabImageProcessor.cpp
    6361    Outputter.cpp
    64         VislabViewerComponent.cpp
    6562)
    6663
    … …  
    6966    ${PLUGIN_HDR}
    7067    VislabComponent.hpp
    71         VislabViewerComponent.hpp
    72     Display.h
    7368)
    7469
    … …  
    9590)
    9691
     92target_compile_definitions(${PROJECT_NAME} PUBLIC OPENCV_MAJOR=${OpenCV_VERSION_MAJOR})
     93
    9794
    9895# ========================================
    … …  
    116113                      ${QT_LIBRARIES}
    117114                      ${OpenCV_LIBS}
    118                                           3dv
     115                      3dv
    119116
    120117                     )

  • trunk/Vislab/DiskWriter.h

    r144 r147  
    2424#include <boost/thread.hpp>
    2525
     26#if (OPENCV_MAJOR == 3)
    2627#include <opencv2/opencv.hpp>
     28#include <opencv2/highgui.hpp>
     29#else
     30#include <opencv/cv.h>
     31#include <opencv/highgui.h>
     32#endif
    2733
    2834

  • trunk/Vislab/Outputter.h

    r142 r147  
    1212// Includes, lib3dv.
    1313#include <lib3dv/device.h>
    14 //#include "20150310_lib3dv-1.2.0/src/disk_writer.h"
    1514
    1615#include <boost/asio/io_service.hpp>

  • trunk/Vislab/VislabCamera.cpp

    r144 r147  
    2828     :diskwriterVideo(name,lib3dv::image::type::RIGHT_RECTIFIED),
    2929     diskwriterDisparite(name,lib3dv::image::type::DSI),
    30      displayVideo("Video",lib3dv::image::type::RIGHT_RECTIFIED),
    31      displayDisparite("Disparite",lib3dv::image::type::DSI),
     30     //displayVideo("Video",lib3dv::image::type::RIGHT_RECTIFIED),
     31     //displayDisparite("Disparite",lib3dv::image::type::DSI),
    3232         outputVideo(lib3dv::image::type::RIGHT_RECTIFIED),
    3333         outputDisparite(lib3dv::image::type::DSI)

  • trunk/Vislab/VislabCamera.hpp

    r142 r147  
    5252      DiskWriter diskwriterVideo;
    5353      DiskWriter diskwriterDisparite;
    54       Display displayVideo;
    55       Display displayDisparite;
     54      //Display displayVideo;
     55      //Display displayDisparite;
    5656      lib3dv::error error;
    5757      unsigned int log_level;

  • trunk/Vislab/VislabComponent.cpp

    r142 r147  
     1
    12
    23// Includes, project.

  • trunk/Vislab/VislabComponent.hpp

    r142 r147  
    1515#include <lib3dv/device.h>
    1616
     17#if (OPENCV_MAJOR == 3)
    1718#include <opencv2/opencv.hpp>
    1819#include <opencv2/highgui.hpp>
     20#else
     21#include <opencv/cv.h>
     22#include <opencv/highgui.h>
     23#endif
    1924
    2025#ifdef WIN32

  • trunk/Vislab/VislabImageProcessor.cpp

    r142 r147  
    11#include "VislabImageProcessor.h"
    22
    3 #include <opencv2/opencv.hpp>
    4 #include <opencv2/highgui.hpp>
     3#if (OPENCV_MAJOR == 3)
     4#   include <opencv2/opencv.hpp>
     5#   include <opencv2/highgui.hpp>
     6#else
     7#   include <opencv/cv.h>
     8#   include <opencv/highgui.h>
     9#endif
    510
    611

  • trunk/Vislab/VislabImageProcessor.h

    r142 r147  
    1414#include <lib3dv/device.h>
    1515
     16#if (OPENCV_MAJOR == 3)
    1617#include <opencv2/opencv.hpp>
     18#include <opencv2/highgui.hpp>
     19#else
     20#include <opencv/cv.h>
     21#include <opencv/highgui.h>
     22#endif
    1723
    1824class VislabImageProcessor
Note: See TracChangeset for help on using the changeset viewer.