From 45b8d1c35a847b6ca68ae6f332fae7003f4d57be Mon Sep 17 00:00:00 2001 From: apo Date: Fri, 7 Apr 2006 07:12:53 +0000 Subject: [PATCH] Porting on Mandriva 64 (to use VTKViewer_CellLocationsArray class that is responsible for representation of the CellLocationsArray in the different versions of the VTK library - 4.4 and 4.2.6) --- src/OBJECT/SMESH_DeviceActor.cxx | 8 ++++---- src/OBJECT/SMESH_Object.cxx | 4 ++-- src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx | 4 ++-- src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx | 4 ++-- src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx | 4 ++-- src/SMESHGUI/SMESHGUI_NodesDlg.cxx | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/OBJECT/SMESH_DeviceActor.cxx b/src/OBJECT/SMESH_DeviceActor.cxx index 92ea388d4..bf094ba9b 100644 --- a/src/OBJECT/SMESH_DeviceActor.cxx +++ b/src/OBJECT/SMESH_DeviceActor.cxx @@ -31,6 +31,7 @@ #include "SMESH_ExtractGeometry.h" #include "SMESH_ControlsDef.hxx" #include "SMESH_ActorUtils.h" +#include "VTKViewer_CellLocationsArray.h" #include #include @@ -55,7 +56,6 @@ #include #include -#include #include #include @@ -366,7 +366,7 @@ SMESH_DeviceActor } } - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents( 1 ); aCellLocationsArray->SetNumberOfTuples( aNbCells ); @@ -426,7 +426,7 @@ SMESH_DeviceActor } } - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents( 1 ); aCellLocationsArray->SetNumberOfTuples( aNbCells ); @@ -508,7 +508,7 @@ SMESH_DeviceActor } } - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents( 1 ); aCellLocationsArray->SetNumberOfTuples( aNbCells ); diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx index ae6bd15f5..ca0e7418e 100644 --- a/src/OBJECT/SMESH_Object.cxx +++ b/src/OBJECT/SMESH_Object.cxx @@ -33,13 +33,13 @@ #include "SMESH_ControlsDef.hxx" #include "SalomeApp_Application.h" #include "VTKViewer_ExtractUnstructuredGrid.h" +#include "VTKViewer_CellLocationsArray.h" #include CORBA_SERVER_HEADER(SMESH_Gen) #include CORBA_SERVER_HEADER(SALOME_Exception) #include #include -#include #include #include @@ -418,7 +418,7 @@ void SMESH_VisualObjDef::buildElemPrs() // Insert cells in grid - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents( 1 ); aCellLocationsArray->SetNumberOfTuples( aNbCells ); diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx index ead5e655b..0022b3f5c 100755 --- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx @@ -62,6 +62,7 @@ #include "SVTK_ViewModel.h" #include "SVTK_Selector.h" #include "SVTK_ViewWindow.h" +#include "VTKViewer_CellLocationsArray.h" // OCCT Includes #include @@ -89,7 +90,6 @@ // VTK Includes #include #include -#include #include #include #include @@ -1226,7 +1226,7 @@ vtkUnstructuredGrid* SMESHGUI_MeshPatternDlg::getGrid() else aCellTypesArray->InsertNextValue(VTK_EMPTY_CELL); } - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents(1); aCellLocationsArray->SetNumberOfTuples(aNbCells); diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx index 48d82dbfe..ebcfd21d8 100644 --- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx @@ -52,6 +52,7 @@ #include "SALOME_ListIO.hxx" #include "SVTK_ViewWindow.h" +#include "VTKViewer_CellLocationsArray.h" #include "utilities.h" @@ -61,7 +62,6 @@ // VTK includes #include #include -#include #include #include #include @@ -547,7 +547,7 @@ void SMESHGUI_MoveNodesDlg::redisplayPreview() aCellTypesArray->InsertNextValue(VTK_VERTEX); anIdList->Delete(); - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents(1); aCellLocationsArray->SetNumberOfTuples(1); diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx index 32e1a59d1..f658c0d53 100755 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx @@ -54,6 +54,7 @@ #include "SVTK_Selector.h" #include "SVTK_ViewModel.h" #include "SVTK_ViewWindow.h" +#include "VTKViewer_CellLocationsArray.h" // OCCT Includes #include @@ -68,7 +69,6 @@ #include #include #include -#include #include #include #include @@ -1320,7 +1320,7 @@ void SMESHGUI_CuttingOfQuadsDlg::displayPreview() } } - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents(1); aCellLocationsArray->SetNumberOfTuples(aNbCells); diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx index 67206eca3..9ac5b9cc6 100644 --- a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx @@ -54,6 +54,7 @@ #include "SVTK_Selector.h" #include "SVTK_ViewWindow.h" +#include "VTKViewer_CellLocationsArray.h" #include "SALOME_Actor.h" #include "SALOME_ListIO.hxx" @@ -63,7 +64,6 @@ // VTK Includes #include #include -#include #include #include #include @@ -148,7 +148,7 @@ namespace SMESH { aCells->InsertNextCell(anIdList); aCellTypesArray->InsertNextValue(VTK_VERTEX); - vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); aCellLocationsArray->SetNumberOfComponents(1); aCellLocationsArray->SetNumberOfTuples(1);