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
Clarification
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshEditPreview.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
index ef9ac22ad31e41cc782d610860acdbb2ec97c600..878819bf6165765e0f23e711e1a8c49a54ec0044 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-126,8
+126,9
@@
vtkIdType getCellType( const SMDSAbs_ElementType theType,
{
switch( theType )
{
{
switch( theType )
{
+ case SMDSAbs_Ball: return VTK_VERTEX;
case SMDSAbs_Node: return VTK_VERTEX;
case SMDSAbs_Node: return VTK_VERTEX;
- case SMDSAbs_Edge:
+ case SMDSAbs_Edge:
if( theNbNodes == 2 ) return VTK_LINE;
else if ( theNbNodes == 3 ) return VTK_QUADRATIC_EDGE;
else return VTK_EMPTY_CELL;
if( theNbNodes == 2 ) return VTK_LINE;
else if ( theNbNodes == 3 ) return VTK_QUADRATIC_EDGE;
else return VTK_EMPTY_CELL;
@@
-152,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;
@@
-165,14
+167,14
@@
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());
- for (
in
t i = 0; i < aNodesXYZ.length(); i++ ) {
+ for (
size_
t i = 0; i < aNodesXYZ.length(); i++ ) {
aPoints->SetPoint( i, aNodesXYZ[i].x, aNodesXYZ[i].y, aNodesXYZ[i].z );
}
myGrid->SetPoints(aPoints);
aPoints->SetPoint( i, aNodesXYZ[i].x, aNodesXYZ[i].y, aNodesXYZ[i].z );
}
myGrid->SetPoints(aPoints);
@@
-180,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();
@@
-196,7
+198,7
@@
void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewD
vtkIdList *anIdList = vtkIdList::New();
int aNodePos = 0;
vtkIdList *anIdList = vtkIdList::New();
int aNodePos = 0;
- for (
in
t i = 0; i < anElemTypes.length(); i++ ) {
+ for (
size_
t i = 0; i < anElemTypes.length(); i++ ) {
const SMESH::ElementSubType& anElementSubType = anElemTypes[i];
SMDSAbs_ElementType aType = SMDSAbs_ElementType(anElementSubType.SMDS_ElementType);
vtkIdType aNbNodes = anElementSubType.nbNodesInElement;
const SMESH::ElementSubType& anElementSubType = anElemTypes[i];
SMDSAbs_ElementType aType = SMDSAbs_ElementType(anElementSubType.SMDS_ElementType);
vtkIdType aNbNodes = anElementSubType.nbNodesInElement;
@@
-220,7
+222,8
@@
void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct* previewD
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
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 );
@@
-298,7
+301,7
@@
void SMESHGUI_MeshEditPreview::SetArrowShapeAndNb( int nbArrows,
myLabelActors.resize( nbArrows, ( vtkTextActor*) NULL );
char label[] = "X";
if ( labels )
myLabelActors.resize( nbArrows, ( vtkTextActor*) NULL );
char label[] = "X";
if ( labels )
- for ( int i
P = 0, i
A = 0; iA < nbArrows; ++iA )
+ for ( int iA = 0; iA < nbArrows; ++iA )
{
label[0] = labels[iA];
vtkTextMapper* text = vtkTextMapper::New();
{
label[0] = labels[iA];
vtkTextMapper* text = vtkTextMapper::New();
@@
-332,7
+335,7
@@
void SMESHGUI_MeshEditPreview::SetArrows( const gp_Ax1* axes,
{
vtkPoints* aPoints = myGrid->GetPoints();
{
vtkPoints* aPoints = myGrid->GetPoints();
- for ( int iP = 0, iA = 0; iA < myLabelActors.size(); ++iA )
+ for ( int iP = 0, iA = 0; iA <
(int)
myLabelActors.size(); ++iA )
{
gp_Trsf trsf;
trsf.SetTransformation( gp_Ax3( axes[iA].Location(), axes[iA].Direction() ), gp::XOY() );
{
gp_Trsf trsf;
trsf.SetTransformation( gp_Ax3( axes[iA].Location(), axes[iA].Direction() ), gp::XOY() );
@@
-403,3
+406,14
@@
vtkUnstructuredGrid* SMESHGUI_MeshEditPreview::GetGrid() const
{
return myGrid;
}
{
return myGrid;
}
+
+//================================================================================
+/*!
+ * \brief Returns myViewWindow
+ */
+//================================================================================
+
+SVTK_ViewWindow* SMESHGUI_MeshEditPreview::GetViewWindow() const
+{
+ return myViewWindow;
+}