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 9dd6d0d058f812fd065579ba679770413d80db36..cbc49c40a0dee543d650c6551a80d516ed91512d 100644 (file)
--- 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