Changeset 94 in pacpusframework for branches/2.0-beta1/include

Timestamp:

May 22, 2013, 3:25:24 PM (12 years ago)

Author:

DHERBOMEZ Gérald

Message:

fix windows

Location:

branches/2.0-beta1/include

Files:

• Pacpus/kernel/PacpusEvent.h (modified) (3 diffs)
• Pacpus/kernel/inputOutputBase.h (modified) (4 diffs)
• Pacpus/kernel/inputOutputInterface.h (modified) (1 diff)
• Pacpus/structure/genericLidarStructures.h (modified) (1 diff)
• PacpusCityVIP/Video/sensor/Camera1394.h (modified) (2 diffs)

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

@@ -4 +4 @@
 #include <QEvent>
 #include "Pacpus/kernel/road_time.h"
+#include <Pacpus/kernel/pacpus.h>
 
 namespace pacpus {
@@ -32 +33 @@
 };
 
-class PacpusEvent : public QEvent
+class PACPUSLIB_API PacpusEvent : public QEvent
 {
 public:
@@ -50 +51 @@
 };
 
-class PacpusGenericEvent : public PacpusEvent
+class PACPUSLIB_API PacpusGenericEvent : public PacpusEvent
 {
 public:

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

@@ -3 +3 @@
 
 #include <Pacpus/kernel/ConnectionBase.h>
+#include <Pacpus/kernel/pacpus.h>
 
 #include <typeinfo>
@@ -13 +14 @@
 class ComponentBase;
 
-class AbstractInterface : public QObject
+class PACPUSLIB_API AbstractInterface : public QObject
 {
      Q_OBJECT
@@ -30 +31 @@
 };
 
-class InputInterfaceBase : public AbstractInterface
+class PACPUSLIB_API InputInterfaceBase : public AbstractInterface
 {
     Q_OBJECT
@@ -41 +42 @@
 };
 
-class OutputInterfaceBase: public AbstractInterface
+class PACPUSLIB_API OutputInterfaceBase: public AbstractInterface
 {
     Q_OBJECT

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

@@ -2 +2 @@
 #define IN_OUT_INTERFACE_H
 
+#include <Pacpus/kernel/pacpus.h>
 #include <Pacpus/kernel/inputOutputBase.h>
 #include <Pacpus/kernel/Log.h>

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

@@ -51 +51 @@
         }*/
         nbLayer = layerCount;
-        for (typename QVector<LidarLayer>::iterator it = layers.begin(), itend = layers.end(); it != itend; ++it)
+        for (/*typename*/ QVector<LidarLayer>::iterator it = layers.begin(), itend = layers.end(); it != itend; ++it)
                     it->points.reserve(pointsPerLayer);
 

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

@@ -70 +70 @@
 #include "kernel/ComponentBase.h"
 #include "kernel/DbiteFile.h"
-#include "../DbtPlyPluginVision/ImageViewer.h"
+//#include "../DbtPlyPluginVision/ImageViewer.h"
 
 #ifdef WIN32
+#       define NOMINMAX 
 #   include <windows.h>
 #   include "C1394Camera/1394Camera.h"
@@ -154 +155 @@
     pacpus::DbiteFile file_;
 
-  ImageViewer * viewer_;
+//  ImageViewer * viewer_;
   
 };