Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshEditPreview.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
index b8522893ff76f0a50a75b1708994d3f4c6ce546f..b411a3f4d73736d9e3e6e8dc0f2587f7823e1a0d 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-34,7
+34,7
@@
// SALOME GUI includes
#include <SVTK_Renderer.h>
#include <SVTK_ViewWindow.h>
// SALOME GUI includes
#include <SVTK_Renderer.h>
#include <SVTK_ViewWindow.h>
-#include <VTKViewer_CellLocationsArray.h>
+
//
#include <VTKViewer_CellLocationsArray.h>
// VTK includes
#include <vtkCellArray.h>
// VTK includes
#include <vtkCellArray.h>
@@
-153,6
+153,7
@@
vtkIdType getCellType( const SMDSAbs_ElementType theType,
else if ( theNbNodes == 20 ) return VTK_QUADRATIC_HEXAHEDRON;
else if ( theNbNodes == 27 ) return VTK_TRIQUADRATIC_HEXAHEDRON;
else if ( theNbNodes == 15 ) return VTK_QUADRATIC_WEDGE;
else if ( theNbNodes == 20 ) return VTK_QUADRATIC_HEXAHEDRON;
else if ( theNbNodes == 27 ) return VTK_TRIQUADRATIC_HEXAHEDRON;
else if ( theNbNodes == 15 ) return VTK_QUADRATIC_WEDGE;
+ else if ( theNbNodes == 18 ) return VTK_BIQUADRATIC_QUADRATIC_WEDGE;
else if ( theNbNodes == 13 ) return VTK_QUADRATIC_PYRAMID;//VTK_CONVEX_POINT_SET;
else return VTK_EMPTY_CELL;
else if ( theNbNodes == 13 ) return VTK_QUADRATIC_PYRAMID;//VTK_CONVEX_POINT_SET;
else return VTK_EMPTY_CELL;
@@
-166,10
+167,10
@@
vtkIdType getCellType( const SMDSAbs_ElementType theType,
*/
//================================================================================
*/
//================================================================================
-void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct
*
previewData)
+void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct
&
previewData)
{
// Create points
{
// Create points
- const SMESH::nodes_array& aNodesXYZ = previewData
->
nodesXYZ;
+ const SMESH::nodes_array& aNodesXYZ = previewData
.
nodesXYZ;
vtkPoints* aPoints = vtkPoints::New();
aPoints->SetNumberOfPoints(aNodesXYZ.length());
vtkPoints* aPoints = vtkPoints::New();
aPoints->SetNumberOfPoints(aNodesXYZ.length());
@@
-181,8
+182,8
@@
void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewD
aPoints->Delete();
// Create cells
aPoints->Delete();
// Create cells
- const SMESH::long_array& anElemConnectivity = previewData
->
elementConnectivities;
- const SMESH::types_array& anElemTypes = previewData
->
elementTypes;
+ const SMESH::long_array& anElemConnectivity = previewData
.
elementConnectivities;
+ const SMESH::types_array& anElemTypes = previewData
.
elementTypes;
vtkIdType aCellsSize = anElemConnectivity.length() + anElemTypes.length();
vtkIdType aNbCells = anElemTypes.length();
vtkIdType aCellsSize = anElemConnectivity.length() + anElemTypes.length();
vtkIdType aNbCells = anElemTypes.length();
@@
-216,12
+217,13
@@
void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewD
anIdList->Delete();
// Insert cells in grid
anIdList->Delete();
// Insert cells in grid
-
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocations
Array::New();
+
vtkIdTypeArray* aCellLocationsArray = vtkIdType
Array::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
- for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
+ vtkIdType const *pts(nullptr);
+ for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
myGrid->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity );
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
myGrid->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity );