0021920: [CEA 689] Get some measure functions on groups available in GUI and TUI

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_ConvToQuadOp.cxx

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index 42dad5775bddadc227098f0551b34c656aa2cbee..33e1aaf078e01388236138f6436385dff420a9c2 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  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
@@ -330,11 +330,14 @@ SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSourc
 {
   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      ] );
-  bool hasLinStruct  = ( nbElemOfType[SMDSEntity_Quadrangle ] ||
+  bool hasLinBiQuad  = ( nbElemOfType[SMDSEntity_Triangle   ] ||
+                         nbElemOfType[SMDSEntity_Quadrangle ] ||
                          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      ] ||
@@ -356,9 +359,9 @@ SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSourc
   int tgtType = 0;
   if ( hasBiQuad )
     tgtType |= ( Quadratic | Linear );
-  if ( hasLinStruct )
+  if ( hasLinBiQuad )
     tgtType |= ( BiQuadratic | Quadratic );
-  if ( hasQuadStruct )
+  if ( hasQuadBiQuad )
     tgtType |= ( BiQuadratic | Linear );
   if ( hasQuad )
     tgtType |= Linear;