From: apo <apo@opencascade.com>
Date: Mon, 10 Apr 2006 11:42:13 +0000 (+0000)
Subject: To provide compatibility between 4.2.2, 4.2.6 & 4.4 VTK library versions
X-Git-Tag: T3_2_0b1_pre1~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5153b0e8fd90c8abea25e66c8fc97f4ad4c31327;p=modules%2Fvisu.git

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 94e78c0b..e86a08c3 100644
--- 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 4c0beb8c..82da6ed1 100644
--- 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 b225434f..14b8718a 100755
--- 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 7050aed3..589f213a 100644
--- 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 3e278dc0..81094cc9 100644
--- 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 72af94a3..93d4b48e 100644
--- 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 1ddb55ff..7d8f8e1b 100755
--- 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 db7bec43..96686885 100644
--- 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 78b80566..00447923 100644
--- 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 7c237eec..3b6d6099 100644
--- 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 c7206654..0a151cb9 100644
--- 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 7afaf9b4..35fac0fc 100644
--- 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 93d34b31..35420a58 100644
--- 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)