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

0021439: EDF 2004 GEOM, SMESH: Dump of study gives bad geom group and stops with NameError exception

Browse Source 
fix _pyGen::FindObject() to restore the lost wrapping of hyp creation
This commit is contained in:
eap 2012-01-11 09:50:28 +00:00
parent 98921cf0d1
commit 9a55aad5ba
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -243,7 +243,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
MESSAGE ( "## COM " << myNbCommands << ": "<< aCommand->GetString() );
#endif
_pyID objID = aCommand->GetObject();
const _pyID& objID = aCommand->GetObject();
if ( objID.IsEmpty() )
return aCommand;
@ -251,7 +251,8 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
// Find an object to process theCommand
// SMESH_Gen method?
if ( objID == this->GetID() || objID == SMESH_2smeshpy::GenName()) {
if ( objID == this->GetID() || objID == SMESH_2smeshpy::GenName())
{
this->Process( aCommand );
return aCommand;
}
@ -831,8 +832,22 @@ void _pyGen::AddObject( Handle(_pyObject)& theObj )
Handle(_pyObject) _pyGen::FindObject( const _pyID& theObjID ) const
{
std::map< _pyID, Handle(_pyObject) >::const_iterator id_obj = myObjects.find( theObjID );
return ( id_obj == myObjects.end() ) ? Handle(_pyObject)() : id_obj->second;
{
map< _pyID, Handle(_pyObject) >::const_iterator id_obj = myObjects.find( theObjID );
if ( id_obj != myObjects.end() )
return id_obj->second;
}
{
map< _pyID, Handle(_pyMesh) >::const_iterator id_obj = myMeshes.find( theObjID );
if ( id_obj != myMeshes.end() )
return id_obj->second;
}
{
map< _pyID, Handle(_pyMeshEditor) >::const_iterator id_obj = myMeshEditors.find( theObjID );
if ( id_obj != myMeshEditors.end() )
return id_obj->second;
}
return Handle(_pyObject)();
}
//================================================================================