Changeset 94 in pacpusframework for branches


Ignore:
Timestamp:
May 22, 2013, 3:25:24 PM (11 years ago)
Author:
DHERBOMEZ Gérald
Message:

fix windows

Location:
branches/2.0-beta1
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.h

    r89 r94  
    44#include <QEvent>
    55#include "Pacpus/kernel/road_time.h"
     6#include <Pacpus/kernel/pacpus.h>
    67
    78namespace pacpus {
    … …  
    3233};
    3334
    34 class PacpusEvent : public QEvent
     35class PACPUSLIB_API PacpusEvent : public QEvent
    3536{
    3637public:
    … …  
    5051};
    5152
    52 class PacpusGenericEvent : public PacpusEvent
     53class PACPUSLIB_API PacpusGenericEvent : public PacpusEvent
    5354{
    5455public:

  • branches/2.0-beta1/include/Pacpus/kernel/inputOutputBase.h

    r89 r94  
    33
    44#include <Pacpus/kernel/ConnectionBase.h>
     5#include <Pacpus/kernel/pacpus.h>
    56
    67#include <typeinfo>
    … …  
    1314class ComponentBase;
    1415
    15 class AbstractInterface : public QObject
     16class PACPUSLIB_API AbstractInterface : public QObject
    1617{
    1718     Q_OBJECT
    … …  
    3031};
    3132
    32 class InputInterfaceBase : public AbstractInterface
     33class PACPUSLIB_API InputInterfaceBase : public AbstractInterface
    3334{
    3435    Q_OBJECT
    … …  
    4142};
    4243
    43 class OutputInterfaceBase: public AbstractInterface
     44class PACPUSLIB_API OutputInterfaceBase: public AbstractInterface
    4445{
    4546    Q_OBJECT

  • branches/2.0-beta1/include/Pacpus/kernel/inputOutputInterface.h

    r89 r94  
    22#define IN_OUT_INTERFACE_H
    33
     4#include <Pacpus/kernel/pacpus.h>
    45#include <Pacpus/kernel/inputOutputBase.h>
    56#include <Pacpus/kernel/Log.h>

  • branches/2.0-beta1/include/Pacpus/structure/genericLidarStructures.h

    r89 r94  
    5151        }*/
    5252        nbLayer = layerCount;
    53         for (typename QVector<LidarLayer>::iterator it = layers.begin(), itend = layers.end(); it != itend; ++it)
     53        for (/*typename*/ QVector<LidarLayer>::iterator it = layers.begin(), itend = layers.end(); it != itend; ++it)
    5454                    it->points.reserve(pointsPerLayer);
    5555

  • branches/2.0-beta1/include/PacpusCityVIP/Video/sensor/Camera1394.h

    r89 r94  
    7070#include "kernel/ComponentBase.h"
    7171#include "kernel/DbiteFile.h"
    72 #include "../DbtPlyPluginVision/ImageViewer.h"
     72//#include "../DbtPlyPluginVision/ImageViewer.h"
    7373
    7474#ifdef WIN32
     75#       define NOMINMAX
    7576#   include <windows.h>
    7677#   include "C1394Camera/1394Camera.h"
    … …  
    154155    pacpus::DbiteFile file_;
    155156
    156   ImageViewer * viewer_;
     157//  ImageViewer * viewer_;
    157158 
    158159};

  • branches/2.0-beta1/src/FileLib/CMakeLists.txt

    r89 r94  
    4444target_link_libraries(
    4545    ${PROJECT_NAME}
     46        PacpusLib
    4647)
    4748

  • branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

    r89 r94  
    9595    ${QT_LIBRARIES}
    9696    ${PACPUS_DEPENDENCIES_LIB}
    97     FileLib
     97    #FileLib
    9898)
    9999

  • branches/2.0-beta1/src/PacpusSensor/src/main.cpp

    r89 r94  
    1313#include <QThread>
    1414#ifdef WIN32
     15#       define NOMINMAX
    1516#   include <windows.h>
    1617#endif

  • branches/2.0-beta1/src/TestComponents/CMakeLists.txt

    r92 r94  
    1111# ========================================
    1212add_subdirectory(Lidar)
    13 add_subdirectory(Video)
     13#add_subdirectory(Video)
    1414add_subdirectory(CPT)
    1515add_subdirectory(CPT/NMEA0183)
    1616add_subdirectory(test)
    17 add_subdirectory(ShMem)
     17#add_subdirectory(ShMem)

  • branches/2.0-beta1/src/TestComponents/CPT/NMEA0183/CMakeLists.txt

    r89 r94  
    66#link_directories (${QT_LIBRARIES})
    77add_definitions(${QT_DEFINITIONS}
    8 -fPIC)
     8-fPIC
     9-DNOMINMAX)
    910
    1011include_directories(include)

  • branches/2.0-beta1/src/TestComponents/Lidar/CMakeLists.txt

    r90 r94  
    1515  ${QT_DEFINITIONS}
    1616  -DLIDAR_EXPORTS
     17  -DALASCAXT_EXPORTS
     18  -DDBTPLYALASCA_EXPORTS
    1719)
    1820
    … …  
    100102    ${QT_LIBRARIES}
    101103    ${PACPUS_DEPENDENCIES_LIB}
     104        road_time
    102105)
    103106

  • branches/2.0-beta1/src/TestComponents/Video/CMakeLists.txt

    r90 r94  
    1515  ${QT_DEFINITIONS}
    1616  -DVIDEO_EXPORTS
     17  -DDBTPLYVISION_EXPORTS
    1718)
    1819

  • branches/2.0-beta1/src/TestComponents/Video/sensor/Camera1394.cpp

    r89 r94  
    7979  imageMutex_ = new QMutex;
    8080
    81   if (displaying_)
     81/*  if (displaying_)
    8282  {
    8383    viewer_ = new ImageViewer;
    … …  
    8686    viewer_->setWindowTitle(componentName);
    8787    connect(this, SIGNAL( newImage(QImage*) ), viewer_, SLOT( display(QImage*) ) );
    88   }
     88  }*/
    8989
    9090  return ComponentBase::CONFIGURED_OK;
    … …  
    282282    // send image in shared memory
    283283    if (firstTime) {
    284       shMem = new ShMem("IMAGE", qimage_->numBytes());
     284//      shMem = new ShMem("IMAGE", qimage_->numBytes());
    285285      firstTime = false;
    286286    }
    287287    assert(shMem);
    288     shMem->write(qimage_->bits(), qimage_->numBytes());
     288//    shMem->write(qimage_->bits(), qimage_->numBytes());
    289289
    290290#ifdef MEASURE_TIME

  • branches/2.0-beta1/src/TestComponents/test/CMakeLists.txt

    r90 r94  
    102102    ${QT_LIBRARIES}
    103103    ${OpenCV_LIBRARIES}
     104        road_time
    104105)
    105106

  • branches/2.0-beta1/src/TestComponents/test/testComponent1.cpp

    r89 r94  
    9797
    9898        LOG_INFO("Send data " << i << " time " << get_timestamp());
    99         fprintf(fp,"%u %lld \n",i, get_timestamp());
     99//        fprintf(fp,"%u %lld \n",i, get_timestamp());
    100100        usleep(waitTime);
    101101        i++;

  • branches/2.0-beta1/src/TestComponents/test/testComponent1.h

    r89 r94  
    55@date created 2010-06-03 16:13
    66@author Julien Moras
    7 @author Sergio Rodriguez
    87@version $Id: $
    98*/
    … …  
    2221#include "Pacpus/structure/genericStructures.h"
    2322
    24 namespace pacpus {
    25 
    26 typedef unsigned long long timestamp_t;
    27 
    28 static timestamp_t get_timestamp ()
    29 {
    30   struct timeval now;
    31   gettimeofday (&now, NULL);
    32   return  now.tv_usec + (timestamp_t)now.tv_sec * 1000000;
    33 }
    34 
    35 //class PacpusImage : public PacpusTimeStampedData {
    36 //public :
    37 //    QImage image;
    38 //};
    39 
     23namespace pacpus {                                                                             
    4024
    4125class TestComponent2;

  • branches/2.0-beta1/src/TestComponents/test/testComponent2.cpp

    r89 r94  
    9595//        }
    9696//    }
    97         fprintf(fp,"%u %lld \n",i++, get_timestamp());
     97//        fprintf(fp,"%u %lld \n",i++, get_timestamp());
    9898
    9999    setState(MONITOR_OK);
Note: See TracChangeset for help on using the changeset viewer.