Changeset 110 in pacpussensors for trunk


Ignore:
Timestamp:
Dec 14, 2015, 12:09:20 PM (9 years ago)
Author:
DHERBOMEZ Gérald
Message:
  • minor modifications about dllexport and dllimport macros usages
Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Alasca/CMakeLists.txt

    r100 r110  
    99set(${PROJECT_NAME}_VERSION_MINOR 1)
    1010add_definitions( -DALASCAXT_EXPORTS )
     11add_definitions( -DALASCAXT_EXPORTS )
     12
    1113################################################################################
    1214create_export(EXPORT_HDR ${PROJECT_NAME})

  • trunk/CMakeLists.txt

    r109 r110  
    8282#add_subdirectory(Wifibot)         #depends on PacpusSocket, change PacpusSocket to PacpusUdpSocket
    8383#add_subdirectory(Ladybug)         #require Ladybug spherical camera's driver, not compiled yet
    84 add_subdirectory(StdDbtPlayerComponents) #require Gps
     84add_subdirectory(StdDbtPlayerComponents)
    8585#add_subdirectory(TelnetClient)
    86 #add_subdirectory(VelodyneComponent)
     86add_subdirectory(VelodyneComponent)
    8787
    8888# ========================================

  • trunk/StdDbtPlayerComponents/CMakeLists.txt

    r109 r110  
    88set(${PROJECT_NAME}_VERSION_MAJOR 0)
    99set(${PROJECT_NAME}_VERSION_MINOR 1)
    10 add_definitions( -DSTDDBTPLAYERCOMPONENTS_EXPORTS )
    11 add_definitions( -DDBTPLYSICK_EXPORTS)
    12 add_definitions( -DDBTPLYSICK_EXPORTS)
     10#add_definitions( -DSTDDBTPLAYERCOMPONENTS_EXPORTS )
     11#add_definitions( -DDBTPLYSICK_EXPORTS)
     12#add_definitions( -DDBTPLYSICK_EXPORTS)
     13add_definitions( -DPACPUSLIB_EXPORTS)
    1314################################################################################
    1415create_export(EXPORT_HDR ${PROJECT_NAME})
    … …  
    5152    DbtPlyVtgManager.h
    5253
    53     #${PROJECT_NAME}.xml
    54     #${PROJECT_NAME}_d.xml
     54    DbtPlyImageManager.h
     55    ImageViewer.h
    5556)
    5657set(PROJECT_SRCS
    … …  
    6768    DbtPlyGgaManager.cpp
    6869    DbtPlyVtgManager.cpp
     70    DbtPlyImageManager.cpp
     71    ImageViewer.cpp
    6972)
    7073
    … …  
    8386    DbtPlyVtgManager.h
    8487
     88    DbtPlyImageManager.h
     89    ImageViewer.h
    8590)
    8691
    … …  
    116121    optimized PacpusTools debug PacpusTools_d
    117122
    118     optimized NMEA0183LIB debug NMEA0183LIB_d
     123    #optimized NMEA0183LIB debug NMEA0183LIB_d
    119124
    120125)
    … …  
    131136                      ${QT_LIBRARIES}
    132137
    133     optimized NMEA0183LIB debug NMEA0183LIB_d
     138    #optimized NMEA0183LIB debug NMEA0183LIB_d
    134139                     )
    135140qt5_use_modules(${PROJECT_NAME} Network)

  • trunk/StdDbtPlayerComponents/DbtPlyAlascaManager.h

    r109 r110  
    1919//#include "structure/structure_telemetre.h"
    2020#include "../Alasca/AlascaData.h"
    21 // Export macro for DbtPlyAlasca DLL for Windows only
    22 #ifdef WIN32
    23 #   ifdef DBTPLYALASCA_EXPORTS
    24         // make DLL
    25 #       define DBTPLYALASCA_API __declspec(dllexport)
    26 #   else
    27         // use DLL
    28 #       define DBTPLYALASCA_API __declspec(dllimport)
    29 #   endif
    30 #else
    31     // On other platforms, simply ignore this
    32 #   define DBTPLYALASCA_API
    33 #endif
    3421
    3522namespace pacpus {
    … …  
    3724class ShMem;
    3825
    39 class DBTPLYALASCA_API DbtPlyAlascaManager
     26class PACPUSLIB_API DbtPlyAlascaManager
    4027        : public DbtPlyFileManager
    4128{

  • trunk/StdDbtPlayerComponents/DbtPlyCPTComponent.cpp

    r108 r110  
    1313#include "DbtPlyCPTComponent.h"
    1414
    15 //#include "../PoseViewer/PoseViewer.h"
    16 
    1715#include "kernel/DbiteFileTypes.h"
    1816#include "kernel/Log.h"
    … …  
    147145                }
    148146            }
    149             /*{
    150                 // TODO: emit pose
    151                 Pose p;
    152                 // emit position
    153                 p.p.lon = bestgpsposaFrame_.frame.Lon;
    154                 p.p.lat = bestgpsposaFrame_.frame.Lat;
    155                 p.p.alt = bestgpsposaFrame_.frame.Hgt;
    156                 Q_EMIT(newPoseAvailable(p));
    157             }*/
    158147            break;
    159148
    … …  
    268257void DbtPlyCPTComponent::displayUI()
    269258{
    270     /*    LOG_INFO("display GUI");
    271 
    272     mPoseViewer.reset(new PoseViewer());
    273     //mPoseViewer->setMutex(imageMutex_);
    274     mPoseViewer->setWindowTitle(name());
    275 
    276     qRegisterMetaType<Pose>("Pose");
    277     BOOST_VERIFY(
    278         connect(this, SIGNAL(newPoseAvailable(Pose)), mPoseViewer.get(), SLOT(addPose(Pose)))
    279     );
    280     mPoseViewer->show();*/
    281 }
    282 
     259
     260}
     261

  • trunk/StdDbtPlayerComponents/DbtPlyCPTComponent.h

    r109 r110  
    1717#include "../NMEA0183/include/nmea0183.h"
    1818
    19 //#include <boost/scoped_ptr.hpp>
    20 //#include <QScopedPointer>
    21 
    22 // Export macro for CPT DLL for Windows only
    23 #ifdef WIN32
    24 #   ifdef CPT_EXPORTS
    25         // make DLL
    26 #       define CPT_API __declspec(dllexport)
    27 #   else
    28         // use DLL
    29 #       define CPT_API __declspec(dllimport)
    30 #   endif
    31 #else
    32     // On other platforms, simply ignore this
    33 #   define CPT_API
    34 #endif
    3519
    3620#define UNKNOWN_NMEA_FRAME -1
    3721
    38 struct CPT_API Stream8Position
     22struct PACPUSLIB_API Stream8Position
    3923{
    4024    int32_t dataPos;
    … …  
    4327
    4428
    45 #include "../Gps/structure_gps.h"
    46 //#include "structure/genericStructures.h"
    47 #include "Pacpus/kernel/road_time.h"
     29#include <Pacpus/structures/structure_gps.h>
     30#include <Pacpus/structures/genericStructures.h>
     31#include <Pacpus/kernel/road_time.h>
    4832#include <QVector3D>
    4933#include <QMatrix4x4>
    50 namespace pacpus {
    51 class PacpusTimeStampedData {
    52         public:
    53             road_time_t time;
    54             road_timerange_t timerange;
    55             unsigned int sequenceNumber;
    56         };
    57 class Pose3D : public PacpusTimeStampedData {
    58 public:
    59             QVector3D position;
    60             QVector3D angle;
    61             //QMatrix3x3 poscov;
    62             //QMatrix3x3 angconv;
    63             QMatrix4x4 transform;
    64         };
    65 }
    66 //#include "../PoseViewer/PoseViewer.h"
    6734
    6835namespace pacpus {
    69 
    70 //class PoseViewer;
    7136class ShMem;
    7237
    73 //struct Pose;
    74 
    75 class CPT_API DbtPlyCPTComponent
     38class PACPUSLIB_API DbtPlyCPTComponent
    7639        : public DbtPlyFileManager
    7740{
    … …  
    9356    virtual void addOutputs();
    9457
    95 //Q_SIGNALS:
    96     //void newPoseAvailable(Pose pose);
    97 
    9858private:
    99     //boost::scoped_ptr<PoseViewer> mPoseViewer;
    100    //QScopedPointer<PoseViewer> mPoseViewer;
    101 
    10259    //ShMems
    10360    ShMem * mShMem;
    … …  
    10764    QString mDataFilename;
    10865
    109     //NMEA to do
    110     NMEA0183 nmea0183_;
    111 
     66    // NMEA0183
    11267    trame_gga_dbl ggaFrame_;
    11368    trame_gsa gsaFrame_;

  • trunk/StdDbtPlayerComponents/DbtPlyGgaManager.h

    r103 r110  
    3434namespace pacpus {
    3535
    36 class DBTPLYGPS_API DbtPlyGgaManager
     36class PACPUSLIB_API DbtPlyGgaManager
    3737        : public DbtPlyFileManager
    3838{

  • trunk/StdDbtPlayerComponents/DbtPlyGstManager.h

    r109 r110  
    2929namespace pacpus {
    3030
    31 class DBTPLYGPS_API DbtPlyGstManager
     31class PACPUSLIB_API DbtPlyGstManager
    3232        : public DbtPlyFileManager
    3333{

  • trunk/StdDbtPlayerComponents/DbtPlyImageManager.cpp

    r50 r110  
    2626
    2727using namespace std;
     28using namespace pacpus;
    2829
    2930DECLARE_STATIC_LOGGER("pacpus.base.DbtPlyImageManager");
    … …  
    137138        mShMemName = config.getProperty("shmem");
    138139    }
     140    if (config.getIntProperty("ui") == 1) {
     141        displayUI();
     142    }
     143
    139144    return DbtPlyFileManager::configureComponent(config);
    140145}

  • trunk/StdDbtPlayerComponents/DbtPlyImageManager.h

    r50 r110  
    1515#include <qobject.h>
    1616
    17 #include "StdDbtPlayerComponentsConfig.h"
    1817#include "Pacpus/DbitePlayer/DbtPlyFileManager.h"
    1918
    20 class ImageViewer;
    2119
    2220class QImage;
    … …  
    2624   
    2725class ShMem;
     26class ImageViewer;
    2827
    2928///
    3029///     shmem=STRING (name of output shared memory) default=IMAGE
    31 class STDDBTPLAYERCOMPONENTS_API DbtPlyImageManager
     30class PACPUSLIB_API DbtPlyImageManager
    3231        : public DbtPlyFileManager
    3332{

  • trunk/StdDbtPlayerComponents/DbtPlySickLDMRSManager.h

    r104 r110  
    3838class ShMem;
    3939
    40 class DBTPLYSICK_API DbtPlySickLDMRSManager
     40class PACPUSLIB_API DbtPlySickLDMRSManager
    4141        : public DbtPlyFileManager
    4242{

  • trunk/StdDbtPlayerComponents/DbtPlySickLMSManager.h

    r99 r110  
    1919#include "../Sick/SickLMSData.h"
    2020
    21 // Export macro for DbtPlySick DLL for Windows only
    22 #ifdef WIN32
    23 #   ifdef DBTPLYSICK_EXPORTS
    24         // make DLL
    25 #       define DBTPLYSICK_API __declspec(dllexport)
    26 #   else
    27         // use DLL
    28 #       define DBTPLYSICK_API __declspec(dllimport)
    29 #   endif
    30 #else
    31     // On other platforms, simply ignore this
    32 #   define DBTPLYSICK_API
    33 #endif
    3421
    3522namespace pacpus {
    … …  
    3724class ShMem;
    3825
    39 class DBTPLYSICK_API DbtPlySickLMSManager
     26class PACPUSLIB_API DbtPlySickLMSManager
    4027        : public DbtPlyFileManager
    4128{

  • trunk/StdDbtPlayerComponents/DbtPlyStereoManager.h

    r50 r110  
    1616namespace pacpus {
    1717
    18 class STDDBTPLAYERCOMPONENTS_API DbtPlyStereoManager
     18class PACPUSLIB_API DbtPlyStereoManager
    1919        : public DbtPlyFileManager
    2020{

  • trunk/StdDbtPlayerComponents/DbtPlyVtgManager.h

    r109 r110  
    3030class ComponentManager;
    3131
    32 class DBTPLYGPS_API DbtPlyVtgManager
     32class PACPUSLIB_API DbtPlyVtgManager
    3333        : public DbtPlyFileManager
    3434{

  • trunk/StdDbtPlayerComponents/ImageViewer.cpp

    r16 r110  
    2828#include <QPaintEvent>
    2929#include <QPixmap>
     30
     31namespace pacpus {
    3032
    3133using namespace std;
    … …  
    106108    cout << "duration = " << (int)(road_time() - tic_) << " " << text << "\n";
    107109}
     110
     111}

  • trunk/StdDbtPlayerComponents/ImageViewer.h

    r50 r110  
    1313#define IMAGEVIEWER_H
    1414
    15 #include "StdDbtPlayerComponentsConfig.h"
    1615#include "Pacpus/kernel/road_time.h"
    17 
    18 //# include "../../include/VisualMemoryManager/struct.h"
    1916
    2017#include <QFrame>
    … …  
    2219class QMutex;
    2320
    24 class STDDBTPLAYERCOMPONENTS_API ImageViewer
     21namespace pacpus {
     22
     23class ImageViewer
    2524        : public QFrame
    2625{
    … …  
    4847};
    4948
     49}
    5050#endif // IMAGEVIEWER_H
Note: See TracChangeset for help on using the changeset viewer.