mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-26 09:20:34 +05:00
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)
This commit is contained in:
parent
ba76cf6d96
commit
45b8d1c35a
@ -31,6 +31,7 @@
|
||||
#include "SMESH_ExtractGeometry.h"
|
||||
#include "SMESH_ControlsDef.hxx"
|
||||
#include "SMESH_ActorUtils.h"
|
||||
#include "VTKViewer_CellLocationsArray.h"
|
||||
|
||||
#include <VTKViewer_Transform.h>
|
||||
#include <VTKViewer_TransformFilter.h>
|
||||
@ -55,7 +56,6 @@
|
||||
|
||||
#include <vtkCell.h>
|
||||
#include <vtkIdList.h>
|
||||
#include <vtkIdTypeArray.h>
|
||||
#include <vtkCellArray.h>
|
||||
#include <vtkUnsignedCharArray.h>
|
||||
|
||||
@ -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 );
|
||||
|
||||
|
@ -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 <vtkCell.h>
|
||||
#include <vtkIdList.h>
|
||||
#include <vtkIdTypeArray.h>
|
||||
#include <vtkCellArray.h>
|
||||
#include <vtkUnsignedCharArray.h>
|
||||
|
||||
@ -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 );
|
||||
|
||||
|
@ -62,6 +62,7 @@
|
||||
#include "SVTK_ViewModel.h"
|
||||
#include "SVTK_Selector.h"
|
||||
#include "SVTK_ViewWindow.h"
|
||||
#include "VTKViewer_CellLocationsArray.h"
|
||||
|
||||
// OCCT Includes
|
||||
#include <TColStd_MapOfInteger.hxx>
|
||||
@ -89,7 +90,6 @@
|
||||
// VTK Includes
|
||||
#include <vtkCell.h>
|
||||
#include <vtkIdList.h>
|
||||
#include <vtkIdTypeArray.h>
|
||||
#include <vtkCellArray.h>
|
||||
#include <vtkUnsignedCharArray.h>
|
||||
#include <vtkUnstructuredGrid.h>
|
||||
@ -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);
|
||||
|
||||
|
@ -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 <vtkCell.h>
|
||||
#include <vtkIdList.h>
|
||||
#include <vtkIdTypeArray.h>
|
||||
#include <vtkCellArray.h>
|
||||
#include <vtkUnsignedCharArray.h>
|
||||
#include <vtkUnstructuredGrid.h>
|
||||
@ -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);
|
||||
|
||||
|
@ -54,6 +54,7 @@
|
||||
#include "SVTK_Selector.h"
|
||||
#include "SVTK_ViewModel.h"
|
||||
#include "SVTK_ViewWindow.h"
|
||||
#include "VTKViewer_CellLocationsArray.h"
|
||||
|
||||
// OCCT Includes
|
||||
#include <Precision.hxx>
|
||||
@ -68,7 +69,6 @@
|
||||
#include <vtkPolygon.h>
|
||||
#include <vtkConvexPointSet.h>
|
||||
#include <vtkIdList.h>
|
||||
#include <vtkIdTypeArray.h>
|
||||
#include <vtkCellArray.h>
|
||||
#include <vtkUnsignedCharArray.h>
|
||||
#include <vtkUnstructuredGrid.h>
|
||||
@ -1320,7 +1320,7 @@ void SMESHGUI_CuttingOfQuadsDlg::displayPreview()
|
||||
}
|
||||
}
|
||||
|
||||
vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New();
|
||||
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
|
||||
aCellLocationsArray->SetNumberOfComponents(1);
|
||||
aCellLocationsArray->SetNumberOfTuples(aNbCells);
|
||||
|
||||
|
@ -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 <vtkCell.h>
|
||||
#include <vtkIdList.h>
|
||||
#include <vtkIdTypeArray.h>
|
||||
#include <vtkCellArray.h>
|
||||
#include <vtkUnsignedCharArray.h>
|
||||
#include <vtkUnstructuredGrid.h>
|
||||
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user