ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 18:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

1) protect GetSubMesh() from the exception in case of an

Browse Source 
empty geom group (version 2)
2) 0021248: EDF SMESH: Dump and ExportToMED
+  pyDump<<_this()<<".SetAutoColor( "<<theAutoColor<<" )";
This commit is contained in:
eap 2011-04-25 13:23:19 +00:00
parent 171ee633a8
commit 5bd351dd12
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -652,14 +652,6 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShap
THROW_SALOME_CORBA_EXCEPTION("bad subShape reference", THROW_SALOME_CORBA_EXCEPTION("bad subShape reference",
SALOME::BAD_PARAM); 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_subMesh_var subMesh;
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(_this()); SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(_this());
try { try {
@ -669,6 +661,12 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShap
int subMeshId = _impl->GetMeshDS()->ShapeToIndex( myLocSubShape ); 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 ); subMesh = getSubMesh( subMeshId );
// create a new subMesh object servant if there is none for the shape // 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); Unexpect aCatch(SALOME_SalomeException);
_impl->SetAutoColor(theAutoColor); _impl->SetAutoColor(theAutoColor);
TPythonDump pyDump; // not to dump group->SetColor() from below code
pyDump<<_this()<<".SetAutoColor( "<<theAutoColor<<" )";
std::list<SALOMEDS::Color> aReservedColors; std::list<SALOMEDS::Color> aReservedColors;
map<int, SMESH::SMESH_GroupBase_ptr>::iterator it = _mapGroups.begin(); map<int, SMESH::SMESH_GroupBase_ptr>::iterator it = _mapGroups.begin();
for ( ; it != _mapGroups.end(); it++ ) { for ( ; it != _mapGroups.end(); it++ ) {