From: eap <eap@opencascade.com>
Date: Mon, 25 Apr 2011 13:23:19 +0000 (+0000)
Subject: 1) protect GetSubMesh() from the exception in case of an
X-Git-Tag: V6_3_0b1~32
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5bd351dd1203cb14ea8777dc592c1d1d9e4c7a66;p=modules%2Fsmesh.git

1) protect GetSubMesh() from the exception in case of an
  empty geom group (version 2)
2) 0021248: EDF SMESH: Dump and ExportToMED
+  pyDump<<_this()<<".SetAutoColor( "<<theAutoColor<<" )";
---

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index d6f0405e4..944ab83b9 100644
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -652,14 +652,6 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShap
     THROW_SALOME_CORBA_EXCEPTION("bad subShape reference",
                                  SALOME::BAD_PARAM);
 
-  if ( aSubShapeObject->GetType() == GEOM_GROUP )
-  {
-    GEOM::GEOM_Object_var mainGeom = aSubShapeObject->GetMainShape() ;
-    TopoDS_Shape mainShape = _gen_i->GeomObjectToShape(mainGeom);
-    if ( mainShape.IsNull() || !mainShape.IsSame( _impl->GetShapeToMesh() ))
-      THROW_SALOME_CORBA_EXCEPTION("not sub-shape of the main shape", SALOME::BAD_PARAM);
-  }
-
   SMESH::SMESH_subMesh_var subMesh;
   SMESH::SMESH_Mesh_var    aMesh = SMESH::SMESH_Mesh::_narrow(_this());
   try {
@@ -669,6 +661,12 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShap
 
     int subMeshId = _impl->GetMeshDS()->ShapeToIndex( myLocSubShape );
 
+    if ( !subMeshId && ! _impl->GetMeshDS()->IsGroupOfSubShapes( myLocSubShape ))
+    {
+      TopoDS_Iterator it( myLocSubShape );
+      if ( it.More() )
+        THROW_SALOME_CORBA_EXCEPTION("not sub-shape of the main shape", SALOME::BAD_PARAM);
+    }
     subMesh = getSubMesh( subMeshId );
 
     // create a new subMesh object servant if there is none for the shape
@@ -2360,6 +2358,9 @@ void SMESH_Mesh_i::SetAutoColor(CORBA::Boolean theAutoColor) throw(SALOME::SALOM
   Unexpect aCatch(SALOME_SalomeException);
   _impl->SetAutoColor(theAutoColor);
 
+  TPythonDump pyDump; // not to dump group->SetColor() from below code
+  pyDump<<_this()<<".SetAutoColor( "<<theAutoColor<<" )";
+
   std::list<SALOMEDS::Color> aReservedColors;
   map<int, SMESH::SMESH_GroupBase_ptr>::iterator it = _mapGroups.begin();
   for ( ; it != _mapGroups.end(); it++ ) {