From 248c36ec7a9f41c4333c5a7bb1b38435993cc264 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 4 May 2011 14:16:19 +0000 Subject: [PATCH] Regression of 0020206: EDF SMESH 987: Netgen1D2D3D +submesh in Compute(), fix sorting submeshes according to dim of shape the algo assigned to aShapeDim = GetShapeDim( algoShape ); + if ( algoShape.ShapeType() == TopAbs_COMPOUND ) + { + TopoDS_Iterator it( algoShape ); + aShapeDim += GetShapeDim( it.Value() ); + } --- src/SMESH/SMESH_Gen.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 9dd6d0d05..cbc49c40a 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -38,10 +38,7 @@ #include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" -#include -#include -#include -#include +#include #include "memoire.h" @@ -222,6 +219,11 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, } // add smToCompute to shDim2sm map aShapeDim = GetShapeDim( algoShape ); + if ( algoShape.ShapeType() == TopAbs_COMPOUND ) + { + TopoDS_Iterator it( algoShape ); + aShapeDim += GetShapeDim( it.Value() ); + } shDim2sm.insert( make_pair( aShapeDim, smToCompute )); } else -- 2.39.2