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
Fix a doc of GetFilter()
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ConvToQuadOp.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index b32a648bae76cfd9dc3e75f088859aa7a711b679..33e1aaf078e01388236138f6436385dff420a9c2 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@
-330,11
+330,14
@@
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSourc
{
SMESH::long_array_var nbElemOfType = idSource->GetMeshInfo();
{
SMESH::long_array_var nbElemOfType = idSource->GetMeshInfo();
- bool hasBiQuad = ( nbElemOfType[SMDSEntity_BiQuad_Quadrangle ] ||
+ bool hasBiQuad = ( nbElemOfType[SMDSEntity_BiQuad_Triangle ] ||
+ nbElemOfType[SMDSEntity_BiQuad_Quadrangle ] ||
nbElemOfType[SMDSEntity_TriQuad_Hexa ] );
nbElemOfType[SMDSEntity_TriQuad_Hexa ] );
- bool hasLinStruct = ( nbElemOfType[SMDSEntity_Quadrangle ] ||
+ bool hasLinBiQuad = ( nbElemOfType[SMDSEntity_Triangle ] ||
+ nbElemOfType[SMDSEntity_Quadrangle ] ||
nbElemOfType[SMDSEntity_Hexa ] );
nbElemOfType[SMDSEntity_Hexa ] );
- bool hasQuadStruct = ( nbElemOfType[SMDSEntity_Quad_Quadrangle ] ||
+ bool hasQuadBiQuad = ( nbElemOfType[SMDSEntity_Quad_Triangle ] ||
+ nbElemOfType[SMDSEntity_Quad_Quadrangle ] ||
nbElemOfType[SMDSEntity_Quad_Hexa ] );
bool hasQuad = ( nbElemOfType[SMDSEntity_Quad_Edge ] ||
nbElemOfType[SMDSEntity_Quad_Hexa ] );
bool hasQuad = ( nbElemOfType[SMDSEntity_Quad_Edge ] ||
@@
-356,9
+359,9
@@
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSourc
int tgtType = 0;
if ( hasBiQuad )
tgtType |= ( Quadratic | Linear );
int tgtType = 0;
if ( hasBiQuad )
tgtType |= ( Quadratic | Linear );
- if ( hasLin
Struct
)
+ if ( hasLin
BiQuad
)
tgtType |= ( BiQuadratic | Quadratic );
tgtType |= ( BiQuadratic | Quadratic );
- if ( hasQuad
Struct
)
+ if ( hasQuad
BiQuad
)
tgtType |= ( BiQuadratic | Linear );
if ( hasQuad )
tgtType |= Linear;
tgtType |= ( BiQuadratic | Linear );
if ( hasQuad )
tgtType |= Linear;