Porting on Mandriva 64 (to introduce VTKViewer_CellLocationsArray class that is respo...

diff --git a/src/VTKViewer/Makefile.in b/src/VTKViewer/Makefile.in
index 61b2e7daf6771c65532eb62471654ac58f4886ec..6b30c5153986df012789053a67e4118e7c2cf9dc 100755 (executable)
--- a/src/VTKViewer/Makefile.in
+++ b/src/VTKViewer/Makefile.in
@@ -12,14 +12,16 @@ VPATH=.:@srcdir@:@srcdir@/resources
 @COMMENCE@
 
 # header files 
-EXPORT_HEADERS= VTKViewer_Actor.h \
+EXPORT_HEADERS= \
+               VTKViewer.h \
+               VTKViewer_CellLocationsArray.h \
+               VTKViewer_Actor.h \
                VTKViewer_ExtractUnstructuredGrid.h \
                VTKViewer_ConvexTool.h \
                VTKViewer_Filter.h \
                VTKViewer_GeometryFilter.h \
                VTKViewer_AppendFilter.h \
                VTKViewer_Algorithm.h \
-               VTKViewer.h \
                VTKViewer_InteractorStyle.h \
                VTKViewer_PassThroughFilter.h \
                VTKViewer_RenderWindow.h \
@@ -44,32 +46,34 @@ PO_FILES = \
 # Libraries targets
 LIB = libVTKViewer.la
 
-LIB_SRC= VTKViewer_Actor.cxx \
-        VTKViewer_ExtractUnstructuredGrid.cxx \
-        VTKViewer_Filter.cxx \
-        VTKViewer_GeometryFilter.cxx \
-        VTKViewer_AppendFilter.cxx \
-        VTKViewer_InteractorStyle.cxx \
-        VTKViewer_PassThroughFilter.cxx \
-        VTKViewer_RenderWindow.cxx \
-        VTKViewer_RenderWindowInteractor.cxx \
-        VTKViewer_ShrinkFilter.cxx \
-        VTKViewer_Transform.cxx \
-        VTKViewer_TransformFilter.cxx \
-        VTKViewer_Trihedron.cxx \
-        VTKViewer_Utilities.cxx \
-        VTKViewer_VectorText.cxx \
-        VTKViewer_ViewManager.cxx \
-        VTKViewer_ViewModel.cxx \
-        VTKViewer_ConvexTool.cxx \
-        VTKViewer_ViewWindow.cxx               
+LIB_SRC= \
+       VTKViewer_CellLocationsArray.cxx \
+       VTKViewer_Actor.cxx \
+       VTKViewer_ExtractUnstructuredGrid.cxx \
+       VTKViewer_Filter.cxx \
+       VTKViewer_GeometryFilter.cxx \
+       VTKViewer_AppendFilter.cxx \
+       VTKViewer_InteractorStyle.cxx \
+       VTKViewer_PassThroughFilter.cxx \
+       VTKViewer_RenderWindow.cxx \
+       VTKViewer_RenderWindowInteractor.cxx \
+       VTKViewer_ShrinkFilter.cxx \
+       VTKViewer_Transform.cxx \
+       VTKViewer_TransformFilter.cxx \
+       VTKViewer_Trihedron.cxx \
+       VTKViewer_Utilities.cxx \
+       VTKViewer_VectorText.cxx \
+       VTKViewer_ViewManager.cxx \
+       VTKViewer_ViewModel.cxx \
+       VTKViewer_ConvexTool.cxx \
+       VTKViewer_ViewWindow.cxx                
 
 LIB_MOC = \
-         VTKViewer_RenderWindow.h \
-         VTKViewer_RenderWindowInteractor.h \
-         VTKViewer_ViewManager.h \
-         VTKViewer_ViewModel.h \
-         VTKViewer_ViewWindow.h 
+       VTKViewer_RenderWindow.h \
+       VTKViewer_RenderWindowInteractor.h \
+       VTKViewer_ViewManager.h \
+       VTKViewer_ViewModel.h \
+       VTKViewer_ViewWindow.h 
 
 BIN = VTKViewer
 

diff --git a/src/VTKViewer/VTKViewer.h b/src/VTKViewer/VTKViewer.h
index 0847acf553d530f22f923c1ce1ef695f6c9b78aa..91ccbd2e9259ff28626d3676af44ac143b29f76a 100755 (executable)
--- a/src/VTKViewer/VTKViewer.h
+++ b/src/VTKViewer/VTKViewer.h
@@ -16,6 +16,10 @@
 //
 // See http://www.salome-platform.org/
 //
+
+#ifndef VTKVIEWER_H
+#define VTKVIEWER_H
+
 #ifdef WNT
 #  ifdef VTKVIEWER_EXPORTS
 #    define VTKVIEWER_EXPORT __declspec( dllexport )
@@ -26,9 +30,4 @@
 #  define VTKVIEWER_EXPORT
 #endif
 
-#include <vtkSystemIncludes.h>
-
-#if !defined(vtkFloatingPointType)
-#define vtkFloatingPointType vtkFloatingPointType;
-typedef float vtkFloatingPointType;
 #endif

diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.cxx b/src/VTKViewer/VTKViewer_CellLocationsArray.cxx
new file mode 100644 (file)
index 0000000..777b7d9
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_CellLocationsArray.cxx
@@ -0,0 +1,33 @@
+//  SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   :
+//  Author :
+//  Module :
+//  $Header$
+
+#include "VTKViewer_CellLocationsArray.h"
+
+#include <vtkObjectFactory.h>
+
+vtkStandardNewMacro(VTKViewer_CellLocationsArray);

diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.h b/src/VTKViewer/VTKViewer_CellLocationsArray.h
new file mode 100644 (file)
index 0000000..67228ca
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_CellLocationsArray.h
@@ -0,0 +1,42 @@
+// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License.
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/
+//
+
+#ifndef VTKVIEWER_CELLLOCATIONS_H
+#define VTKVIEWER_CELLLOCATIONS_H
+
+#include "VTKViewer.h"
+
+#if (VTK_MAJOR_VERSION >= 4) &&  (VTK_MINOR_VERSION >= 4)
+#  include <vtkIdTypeArray.h>
+#  define TCellLocationsArray vtkIdTypeArray
+#else
+#  include <vtkIntArray.h>
+#  define TCellLocationsArray vtkIntArray
+#endif
+
+struct VTKVIEWER_EXPORT VTKViewer_CellLocationsArray : TCellLocationsArray
+{
+  static VTKViewer_CellLocationsArray* New();
+  
+  vtkTypeMacro(VTKViewer_CellLocationsArray,TCellLocationsArray);
+};
+
+#undef TCellLocationsArray
+
+#endif

diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
index a7cc37e52869ad2edbcc4672860909ad497f9b64..5dc5a433308e86c26bd3e2db99c27046251904fb 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
+++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
@@ -26,13 +26,12 @@
 
 
 #include "VTKViewer_ExtractUnstructuredGrid.h"
-//#include "utilities.h"
+#include "VTKViewer_CellLocationsArray.h"
 
 #include <vtkUnsignedCharArray.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkObjectFactory.h>
 #include <vtkCellArray.h>
-#include <vtkIdTypeArray.h>
 #include <vtkIdList.h>
 #include <vtkCell.h>
 
@@ -234,7 +233,7 @@ void VTKViewer_ExtractUnstructuredGrid::Execute(){
        }
       }
       if((aNbElems = aConnectivity->GetNumberOfCells())){
-       vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
+       VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
        aCellLocationsArray->SetNumberOfComponents(1);
        aCellLocationsArray->SetNumberOfTuples(aNbElems);
        aConnectivity->InitTraversal();
@@ -323,7 +322,7 @@ void VTKViewer_ExtractUnstructuredGrid::Execute(){
       }
     }
     if((aNbElems = aConnectivity->GetNumberOfCells())){
-      vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
+      VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
       aCellLocationsArray->SetNumberOfComponents(1);
       aCellLocationsArray->SetNumberOfTuples(aNbElems);
       aConnectivity->InitTraversal();