From: eap <eap@opencascade.com>
Date: Wed, 4 May 2011 14:16:19 +0000 (+0000)
Subject: Regression of 0020206: EDF SMESH 987: Netgen1D2D3D +submesh
X-Git-Tag: V6_3_0b1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=248c36ec7a9f41c4333c5a7bb1b38435993cc264;p=modules%2Fsmesh.git

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() );
+          }
---

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 <gp_Pnt.hxx>
-#include <BRep_Tool.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopoDS_Iterator.hxx>
 
 #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