To provide compatibility between 4.2.2, 4.2.6 & 4.4 VTK library versions

diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx
index 94e78c0ba2b273ff83e6a76ad4c53c0ecc658277..e86a08c3c0d30c2aeeb65058ee6ee0b4bc6f22c0 100644 (file)
--- a/src/CONVERTOR/VISU_IDMapper.hxx
+++ b/src/CONVERTOR/VISU_IDMapper.hxx
@@ -33,8 +33,8 @@
 */
 
 #include "MED_SharedPtr.hxx"
+#include "VTKViewer.h"
 
-#include <vtkSystemIncludes.h>
 #include <string>
 
 class vtkUnstructuredGrid;

diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h
index 4c0beb8c1469f57ea54d8c346628a25663db71ca..82da6ed1f9a45ce0dfbef88f7a3d05b869b758e8 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsSettings.h
+++ b/src/OBJECT/VISU_GaussPtsSettings.h
@@ -32,6 +32,8 @@
 #include <vtkObject.h>
 #include <vtkCommand.h>
 
+#include "VTKViewer.h"
+
 class vtkImageData;
 
 

diff --git a/src/PIPELINE/SALOME_ExtractGeometry.h b/src/PIPELINE/SALOME_ExtractGeometry.h
index b225434f8bdd7772557c6953ba9264300e0ffabc..14b8718ac117a4322606ab92fb613aa8973ea064 100755 (executable)
--- a/src/PIPELINE/SALOME_ExtractGeometry.h
+++ b/src/PIPELINE/SALOME_ExtractGeometry.h
@@ -20,6 +20,8 @@
 #ifndef SALOME_ExtractGeometry_H
 #define SALOME_ExtractGeometry_H
 
+#include "VTKViewer.h"
+
 #include <vtkExtractGeometry.h>
 #include <vtkSmartPointer.h>
 

diff --git a/src/PIPELINE/VISU_FieldTransform.hxx b/src/PIPELINE/VISU_FieldTransform.hxx
index 7050aed3b25364f8a183062dd472054c7c9e6888..589f213a6e527d51621fb0f94498a6c132a74d0d 100644 (file)
--- a/src/PIPELINE/VISU_FieldTransform.hxx
+++ b/src/PIPELINE/VISU_FieldTransform.hxx
@@ -29,9 +29,12 @@
 
 #include <vtkDataSetToDataSetFilter.h>
 
+#include "VTKViewer.h"
+
 class VTKViewer_Transform;
 
-class VTK_EXPORT VISU_FieldTransform : public vtkDataSetToDataSetFilter{
+class VTK_EXPORT VISU_FieldTransform : public vtkDataSetToDataSetFilter
+{
 public:
   vtkTypeMacro(VISU_FieldTransform,vtkDataSetToDataSetFilter);
   static VISU_FieldTransform *New();

diff --git a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
index 3e278dc0ac8579439b60436c6394558a9ab2c10b..81094cc90802e6fc8f34ab98eaf58f068e6940d4 100644 (file)
--- a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
+++ b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
@@ -28,12 +28,11 @@
 
 #ifndef __VISU_ImplicitFunctionWidget_h
 #define __VISU_ImplicitFunctionWidget_h
-////
-//==================================================================
-// class   : VISU_UnScaledActor
-// purpose :
-//==================================================================
+
 #include <vtkFollower.h>
+
+#include "VTKViewer.h"
+
 class VISU_UnScaledActor: public vtkFollower
 {
   
@@ -42,7 +41,6 @@ public:
   vtkTypeMacro(VISU_UnScaledActor,vtkFollower);
   static VISU_UnScaledActor *New();
   
-  
   void SetCenter(vtkFloatingPointType *);
   virtual void SetSize(int theSize);
   virtual void Render(vtkRenderer *theRenderer);

diff --git a/src/PIPELINE/VISU_LookupTable.hxx b/src/PIPELINE/VISU_LookupTable.hxx
index 72af94a33fbab893f5b9fd0a5b78587fba9079c9..93d4b48e8113a9ffd3536875a84f5442e572c069 100644 (file)
--- a/src/PIPELINE/VISU_LookupTable.hxx
+++ b/src/PIPELINE/VISU_LookupTable.hxx
@@ -11,7 +11,10 @@
 
 #include <vtkLookupTable.h>
 
-class VISU_LookupTable: public vtkLookupTable {
+#include "VTKViewer.h"
+
+class VISU_LookupTable: public vtkLookupTable 
+{
  public:
    vtkTypeMacro(VISU_LookupTable,vtkLookupTable);
    static VISU_LookupTable *New();

diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
index 1ddb55fff3421cd6d6a54d0999f5ae2519b49cd9..7d8f8e1bedf8c7bc5acac91c2f4f47c7da481deb 100755 (executable)
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
@@ -37,6 +37,8 @@
 #include <vtkSmartPointer.h>
 #include <vtkConfigure.h>
 
+#include "VTKViewer.h"
+
 class vtkCellArray;
 class vtkPoints;
 class vtkProperty;

diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.hxx b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
index db7bec430fab19f25c016d372bd4a05e3da0f19e..96686885329fe1a587e10a7d986b6b1f0f245f2a 100644 (file)
--- a/src/PIPELINE/VISU_ScalarBarCtrl.hxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
@@ -29,6 +29,8 @@
 
 #include <vtkObject.h>
 
+#include "VTKViewer.h"
+
 class vtkRenderer;
 class vtkLookupTable;
 class vtkScalarBarActor;

diff --git a/src/PIPELINE/VISU_WidgetCtrl.hxx b/src/PIPELINE/VISU_WidgetCtrl.hxx
index 78b805664a09cf243896e608015dd198c1fb04da..00447923cc317585d37e989bc556acb86d846f7b 100644 (file)
--- a/src/PIPELINE/VISU_WidgetCtrl.hxx
+++ b/src/PIPELINE/VISU_WidgetCtrl.hxx
@@ -29,9 +29,10 @@
 #ifndef __VISU_WidgetCtrl_hxx
 #define __VISU_WidgetCtrl_hxx
 
-
 #include <vtkImplicitFunction.h>
 
+#include "VTKViewer.h"
+
 class vtkImplicitFunction;
 class vtkObject;
 class vtkRenderWindowInteractor;

diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.h b/src/VISUGUI/VisuGUI_TimeAnimation.h
index 7c237eec01703afda3a6a457c0b37871896d08b3..3b6d60990cd2e51127890db0f2c797cc06db0fb5 100644 (file)
--- a/src/VISUGUI/VisuGUI_TimeAnimation.h
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.h
@@ -14,12 +14,12 @@
 #include "QtxDblSpinBox.h"
 #include "SALOMEDSClient_Study.hxx"
 
+#include "VTKViewer.h"
+
 #include <qdialog.h>
 #include <qbuttongroup.h>
 #include <qwidgetstack.h>
 
-#include <vtkSystemIncludes.h>
-
 #include <vector>
 #include <map>
 

diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh
index c7206654815966f7e7ce3ed1016effce6e9c5931..0a151cb9239f63373427c3b071a3247e4228dc2b 100644 (file)
--- a/src/VISU_I/VISU_Prs3d_i.hh
+++ b/src/VISU_I/VISU_Prs3d_i.hh
@@ -35,6 +35,8 @@
 #include "SALOME_GenericObj_i.hh"
 #include "SALOME_InteractiveObject.hxx"
 
+#include "VTKViewer.h"
+
 #include <vtkSmartPointer.h>
 
 class VISU_PipeLine;

diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh
index 7afaf9b43887a2502247990bab1a2c89d44f0893..35fac0fcc6d6b677ac44ba92875e6b5b026c1391 100644 (file)
--- a/src/VISU_I/VISU_Result_i.hh
+++ b/src/VISU_I/VISU_Result_i.hh
@@ -31,7 +31,8 @@
 #include "VISU_BoostSignals.h"
 #include "SALOME_GenericObj_i.hh"
 
-#include <vtkSystemIncludes.h>
+#include "VTKViewer.h"
+
 #include <gp_Dir.hxx>
 #include <vector>
 

diff --git a/src/VISU_SWIG/Makefile.in b/src/VISU_SWIG/Makefile.in
index 93d34b31e95746a29069fcde1a1e5ced7a66586c..35420a584a1e6edc8075e9fd7aa522decb488273 100644 (file)
--- a/src/VISU_SWIG/Makefile.in
+++ b/src/VISU_SWIG/Makefile.in
@@ -50,8 +50,13 @@ EXPORT_SHAREDPYSCRIPTS = VISU_shared_modules.py
 
 LIB_CLIENT_IDL =
 
-CPPFLAGS += -ftemplate-depth-32 $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QT_INCLUDES) \
-       $(VTK_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
+CPPFLAGS += -ftemplate-depth-32 \
+       $(PYTHON_INCLUDES) \
+       $(HDF5_INCLUDES) \
+       $(QT_INCLUDES) \
+       $(VTK_INCLUDES) \
+       -I${KERNEL_ROOT_DIR}/include/salome \
+       -I${GUI_ROOT_DIR}/include/salome \
        -I${MED_ROOT_DIR}/include/salome \
        $(BOOST_CPPFLAGS)