From a4220b74399d4841fdae8828c08f21d9a3615a04 Mon Sep 17 00:00:00 2001 From: abd Date: Tue, 2 Dec 2008 12:46:58 +0000 Subject: [PATCH] Right EXPORT defines. --- src/OBJECT/Makefile.am | 3 ++- src/OBJECT/VISU_Actor.h | 10 +++------- src/OBJECT/VISU_ActorBase.h | 10 ++-------- src/OBJECT/VISU_DataSetActor.h | 9 ++------- src/OBJECT/VISU_GaussPtsAct.h | 7 ++++--- src/OBJECT/VISU_GaussPtsDeviceActor.h | 5 +++-- src/OBJECT/VISU_GaussPtsSettings.h | 8 +++++--- src/OBJECT/VISU_IsoSurfActor.h | 3 ++- src/OBJECT/VISU_MeshAct.h | 3 ++- src/OBJECT/VISU_PickingSettings.h | 3 ++- src/OBJECT/VISU_PointMap3dActor.h | 3 ++- src/OBJECT/VISU_ScalarMapAct.h | 3 ++- src/OBJECT/VISU_VectorsAct.h | 3 ++- 13 files changed, 33 insertions(+), 37 deletions(-) diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 9c2ed5df..dd0d95dd 100644 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -44,7 +44,8 @@ salomeinclude_HEADERS = \ VISU_VectorsAct.h \ VISU_PointMap3dActor.h \ VISU_ActorBase.h \ - VISU_IsoSurfActor.h + VISU_IsoSurfActor.h \ + VISU_OBJECT.h dist_libVisuObject_la_SOURCES = \ VISU_Actor.cxx \ diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h index 34c1dcc8..704b4eeb 100644 --- a/src/OBJECT/VISU_Actor.h +++ b/src/OBJECT/VISU_Actor.h @@ -29,6 +29,8 @@ #ifndef VISU_ACTOR_H #define VISU_ACTOR_H +#include "VISU_OBJECT.h" + #include "SALOME_Actor.h" #include "VISU_ActorBase.h" #include "VISU_BoostSignals.h" @@ -52,12 +54,6 @@ class vtkFeatureEdges; class VISU_FramedTextActor; -#ifdef _WIN32 -#define VTKOCC_EXPORT __declspec (dllexport) -#else -#define VTKOCC_EXPORT VTK_EXPORT -#endif - namespace SVTK { namespace Representation @@ -73,7 +69,7 @@ namespace VISU } //---------------------------------------------------------------------------- -class VTKOCC_EXPORT VISU_Actor : public VISU_ActorBase +class VISU_OBJECT_EXPORT VISU_Actor : public VISU_ActorBase { public: vtkTypeMacro(VISU_Actor, VISU_ActorBase); diff --git a/src/OBJECT/VISU_ActorBase.h b/src/OBJECT/VISU_ActorBase.h index 2b9e414d..e8ac6e2e 100644 --- a/src/OBJECT/VISU_ActorBase.h +++ b/src/OBJECT/VISU_ActorBase.h @@ -29,18 +29,12 @@ #ifndef VISU_ACTOR_BASE_H #define VISU_ACTOR_BASE_H +#include "VISU_OBJECT.h" #include "SALOME_Actor.h" #include "VISU_BoostSignals.h" class VTKViewer_ShrinkFilter; -#ifdef _WIN32 -#define VTKOCC_EXPORT __declspec (dllexport) -#else -#define VTKOCC_EXPORT VTK_EXPORT -#endif - - //---------------------------------------------------------------------------- namespace VISU { @@ -49,7 +43,7 @@ namespace VISU //! This class defines an abstaract interface to manage actors -class VTKOCC_EXPORT VISU_ActorBase: public SALOME_Actor, +class VISU_OBJECT_EXPORT VISU_ActorBase: public SALOME_Actor, public boost::signalslib::trackable { public: diff --git a/src/OBJECT/VISU_DataSetActor.h b/src/OBJECT/VISU_DataSetActor.h index 4af55e3e..8f854a8d 100644 --- a/src/OBJECT/VISU_DataSetActor.h +++ b/src/OBJECT/VISU_DataSetActor.h @@ -28,6 +28,7 @@ #ifndef VISU_DATASETACTOR_H #define VISU_DATASETACTOR_H +#include "VISU_OBJECT.h" #include "VISU_Actor.h" class vtkDataSetMapper; @@ -36,14 +37,8 @@ class SALOME_ExtractPolyDataGeometry; class vtkImplicitBoolean; class vtkImplicitFunctionCollection; -#ifdef _WIN_32 -#define VTKOCC_EXPORT __declspec (dllexport) -#else -#define VTKOCC_EXPORT VTK_EXPORT -#endif - //---------------------------------------------------------------------------- -class VTKOCC_EXPORT VISU_DataSetActor : public VISU_Actor +class VISU_OBJECT_EXPORT VISU_DataSetActor : public VISU_Actor { public: vtkTypeMacro(VISU_DataSetActor,VISU_Actor); diff --git a/src/OBJECT/VISU_GaussPtsAct.h b/src/OBJECT/VISU_GaussPtsAct.h index 5c0b45ed..ecfc9576 100644 --- a/src/OBJECT/VISU_GaussPtsAct.h +++ b/src/OBJECT/VISU_GaussPtsAct.h @@ -29,6 +29,7 @@ #ifndef VISU_GaussPtsAct_HeaderFile #define VISU_GaussPtsAct_HeaderFile +#include "VISU_OBJECT.h" #include "VISU_Actor.h" #include "VISU_GaussPtsActorFactory.h" @@ -77,7 +78,7 @@ class vtkImplicitBoolean; - defining a way to handle VISU_ImplicitFunctionWidget; - global / local scalar bar mamangement. */ -class VTKOCC_EXPORT VISU_GaussPtsAct : public VISU_Actor +class VISU_OBJECT_EXPORT VISU_GaussPtsAct : public VISU_Actor { public: vtkTypeMacro(VISU_GaussPtsAct,VISU_Actor); @@ -355,7 +356,7 @@ class VISU_GaussPtsAct2; * which has two representation modes - outside and * inside segmentation cursor. */ -class VTKOCC_EXPORT VISU_GaussPtsAct1 : public VISU_GaussPtsAct +class VISU_OBJECT_EXPORT VISU_GaussPtsAct1 : public VISU_GaussPtsAct { public: vtkTypeMacro(VISU_GaussPtsAct1,VISU_GaussPtsAct); @@ -484,7 +485,7 @@ class VTKOCC_EXPORT VISU_GaussPtsAct1 : public VISU_GaussPtsAct //! Gauss Points Actor, displayed in the Segmented View. -class VTKOCC_EXPORT VISU_GaussPtsAct2 : public VISU_GaussPtsAct +class VISU_OBJECT_EXPORT VISU_GaussPtsAct2 : public VISU_GaussPtsAct { public: vtkTypeMacro(VISU_GaussPtsAct2,VISU_GaussPtsAct); diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.h b/src/OBJECT/VISU_GaussPtsDeviceActor.h index 5b25e78e..e887d0ab 100644 --- a/src/OBJECT/VISU_GaussPtsDeviceActor.h +++ b/src/OBJECT/VISU_GaussPtsDeviceActor.h @@ -29,6 +29,7 @@ #ifndef VISU_GAUSS_PTS_DEVICE_ACTOR_H #define VISU_GAUSS_PTS_DEVICE_ACTOR_H +#include "VISU_OBJECT.h" #include "VISU_Actor.h" #include "VTKViewer_GeometryFilter.h" @@ -51,7 +52,7 @@ namespace VISU { typedef vtkSmartPointer TTextureValue; - VTKOCC_EXPORT + VISU_OBJECT_EXPORT TTextureValue GetTexture(const std::string& theMainTexture, const std::string& theAlphaTexture); @@ -59,7 +60,7 @@ namespace VISU //============================================================================ -class VISU_GaussDeviceActorBase: public vtkLODActor +class VISU_OBJECT_EXPORT VISU_GaussDeviceActorBase: public vtkLODActor { public: vtkTypeMacro(VISU_GaussDeviceActorBase, vtkLODActor); diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h index 11435aeb..eba1ba8d 100644 --- a/src/OBJECT/VISU_GaussPtsSettings.h +++ b/src/OBJECT/VISU_GaussPtsSettings.h @@ -29,6 +29,8 @@ #ifndef VISU_GaussPtsSettings_HeaderFile #define VISU_GaussPtsSettings_HeaderFile +#include "VISU_OBJECT.h" + #include #include @@ -48,7 +50,7 @@ namespace VISU //! Base class of Gauss Points settings. -class VTKOCC_EXPORT VISU_GaussPtsSettings : public vtkObject +class VISU_OBJECT_EXPORT VISU_GaussPtsSettings : public vtkObject { public: vtkTypeMacro( VISU_GaussPtsSettings, vtkObject ); @@ -103,7 +105,7 @@ class VTKOCC_EXPORT VISU_GaussPtsSettings : public vtkObject * Clamp, Texture, Alpha threshold, Const size and Color. * Used by Gauss Points Actor. */ -class VTKOCC_EXPORT VISU_InsideCursorSettings : public VISU_GaussPtsSettings +class VISU_OBJECT_EXPORT VISU_InsideCursorSettings : public VISU_GaussPtsSettings { public: vtkTypeMacro( VISU_InsideCursorSettings, vtkObject ); @@ -134,7 +136,7 @@ class VTKOCC_EXPORT VISU_InsideCursorSettings : public VISU_GaussPtsSettings * Clamp, Texture, Alpha threshold, Const size and Color. * Used by Gauss Points Actor. */ -class VTKOCC_EXPORT VISU_OutsideCursorSettings : public VISU_GaussPtsSettings +class VISU_OBJECT_EXPORT VISU_OutsideCursorSettings : public VISU_GaussPtsSettings { public: vtkTypeMacro( VISU_OutsideCursorSettings, vtkObject ); diff --git a/src/OBJECT/VISU_IsoSurfActor.h b/src/OBJECT/VISU_IsoSurfActor.h index 0377ae6a..32651e54 100644 --- a/src/OBJECT/VISU_IsoSurfActor.h +++ b/src/OBJECT/VISU_IsoSurfActor.h @@ -29,6 +29,7 @@ #ifndef VISU_VectorsAct_HeaderFile #define VISU_VectorsAct_HeaderFile +#include "VISU_OBJECT.h" #include "VISU_ScalarMapAct.h" class vtkActor2D; @@ -38,7 +39,7 @@ class vtkPolyData; class VISU_LabelPointsFilter; -class VTKOCC_EXPORT VISU_IsoSurfActor : public VISU_ScalarMapAct +class VISU_OBJECT_EXPORT VISU_IsoSurfActor : public VISU_ScalarMapAct { public: vtkTypeMacro(VISU_IsoSurfActor, VISU_ScalarMapAct); diff --git a/src/OBJECT/VISU_MeshAct.h b/src/OBJECT/VISU_MeshAct.h index 86ea7308..d1062874 100644 --- a/src/OBJECT/VISU_MeshAct.h +++ b/src/OBJECT/VISU_MeshAct.h @@ -29,11 +29,12 @@ #ifndef VISU_MeshAct_HeaderFile #define VISU_MeshAct_HeaderFile +#include "VISU_OBJECT.h" #include "VISU_DataSetActor.h" #include "SVTK_DeviceActor.h" -class VTKOCC_EXPORT VISU_MeshAct : public VISU_DataSetActor +class VISU_OBJECT_EXPORT VISU_MeshAct : public VISU_DataSetActor { public: vtkTypeMacro(VISU_MeshAct,VISU_DataSetActor); diff --git a/src/OBJECT/VISU_PickingSettings.h b/src/OBJECT/VISU_PickingSettings.h index c5f30b38..4239f091 100644 --- a/src/OBJECT/VISU_PickingSettings.h +++ b/src/OBJECT/VISU_PickingSettings.h @@ -28,6 +28,7 @@ #ifndef VISU_PickingSettings_HeaderFile #define VISU_PickingSettings_HeaderFile +#include "VISU_OBJECT.h" #include #include @@ -48,7 +49,7 @@ namespace VISU * Info Window position, Zoom factor on first selected point, * Camera movement steps number and Display parent mesh. */ -class VTKOCC_EXPORT VISU_PickingSettings : public vtkObject +class VISU_OBJECT_EXPORT VISU_PickingSettings : public vtkObject { public: enum { BelowPoint = 0, TopLeftCorner }; diff --git a/src/OBJECT/VISU_PointMap3dActor.h b/src/OBJECT/VISU_PointMap3dActor.h index 4b960fa7..4794d211 100644 --- a/src/OBJECT/VISU_PointMap3dActor.h +++ b/src/OBJECT/VISU_PointMap3dActor.h @@ -29,6 +29,7 @@ #ifndef VISU_PointMap3dActor_HeaderFile #define VISU_PointMap3dActor_HeaderFile +#include "VISU_OBJECT.h" #include "SALOME_Actor.h" #include "VISU_DataSetActor.h" #include "VISU_BoostSignals.h" @@ -43,7 +44,7 @@ class VISU_ScalarBarActor; class VISU_DeformedGridPL; -class VTKOCC_EXPORT VISU_PointMap3dActor : public VISU_ActorBase +class VISU_OBJECT_EXPORT VISU_PointMap3dActor : public VISU_ActorBase { public: vtkTypeMacro(VISU_PointMap3dActor,SALOME_Actor); diff --git a/src/OBJECT/VISU_ScalarMapAct.h b/src/OBJECT/VISU_ScalarMapAct.h index d67cfa5f..7886f5c1 100644 --- a/src/OBJECT/VISU_ScalarMapAct.h +++ b/src/OBJECT/VISU_ScalarMapAct.h @@ -29,6 +29,7 @@ #ifndef VISU_ScalarMapAct_HeaderFile #define VISU_ScalarMapAct_HeaderFile +#include "VISU_OBJECT.h" #include "VISU_DataSetActor.h" class VISU_ScalarBarActor; @@ -36,7 +37,7 @@ class VISU_PointsDeviceActor; //---------------------------------------------------------------------------- -class VTKOCC_EXPORT VISU_ScalarMapAct : public VISU_DataSetActor +class VISU_OBJECT_EXPORT VISU_ScalarMapAct : public VISU_DataSetActor { public: vtkTypeMacro(VISU_ScalarMapAct,VISU_DataSetActor); diff --git a/src/OBJECT/VISU_VectorsAct.h b/src/OBJECT/VISU_VectorsAct.h index cc76ce48..9d23eba7 100644 --- a/src/OBJECT/VISU_VectorsAct.h +++ b/src/OBJECT/VISU_VectorsAct.h @@ -29,6 +29,7 @@ #ifndef VISU_VectorsAct_HeaderFile #define VISU_VectorsAct_HeaderFile +#include "VISU_OBJECT.h" #include "VISU_ScalarMapAct.h" #include @@ -36,7 +37,7 @@ class VTKViewer_Transform; class VISU_VectorsPL; -class VTKOCC_EXPORT VISU_VectorsAct : public VISU_ScalarMapAct +class VISU_OBJECT_EXPORT VISU_VectorsAct : public VISU_ScalarMapAct { public: vtkTypeMacro(VISU_VectorsAct,VISU_ScalarMapAct); -- 2.39.2