ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-24 16:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

#17799 EDF 20211 - Problem with exporting to GEOM

Browse Source 
Find existing sub-shapes by name and by ids
This commit is contained in:
eap 2019-10-30 14:53:36 +03:00
parent 9c7efc01ae
commit d52c607e29
1 changed files with 75 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -2986,7 +2986,8 @@ namespace // utils for CopyMeshWithGeom()
{
typedef std::map< std::string, std::string > TStr2StrMap;
typedef std::map< std::string, std::set< std::string > > TStr2StrSetMap;
//typedef std::map< std::set<int>, int > TIdSet2IndexMap;
typedef std::map< std::set<int>, int > TIdSet2IndexMap;
typedef std::map< std::string, int > TName2IndexMap;
//================================================================================
/*!
@ -3004,8 +3005,9 @@ namespace // utils for CopyMeshWithGeom()
TStr2StrMap myOld2NewEntryMap; // map of study entries
//GEOM::ListOfGO_var mySubshapes; // sub-shapes existing in the new geometry
//TIdSet2IndexMap myIds2SubshapeIndex; // to find an existing sub-shape
GEOM::ListOfGO_var mySubshapes; // sub-shapes existing in the new geometry
TIdSet2IndexMap myIds2SubshapeIndex; // to find an existing sub-shape
TName2IndexMap myName2SubshapeIndex; // to find an existing sub-shape by name
bool myGIPMapDone;
GEOM::ListOfListOfLong_var myGIPMap; // filled by GetInPlaceMap()
@ -3044,16 +3046,18 @@ namespace // utils for CopyMeshWithGeom()
CORBA::String_var newEntry = newSO->GetID();
myOld2NewEntryMap.insert( std::make_pair( std::string( oldEntry.in() ),
std::string( newEntry.in() )));
std::string newMainEntry = newEntry.in();
SALOMEDS::Study_var study = myGen_i->getStudyServant();
GEOM::GEOM_Gen_var geomGen = myGen_i->GetGeomEngine();
GEOM::GEOM_IShapesOperations_wrap op = geomGen->GetIShapesOperations();
GEOM::ListOfGO_var subShapes = op->GetExistingSubObjects( mainShapeNew,
mySubshapes = op->GetExistingSubObjects( mainShapeNew,
/*groupsOnly=*/false );
for ( CORBA::ULong i = 0; i < subShapes->length(); ++i )
for ( CORBA::ULong i = 0; i < mySubshapes->length(); ++i )
{
newSO = myGen_i->ObjectToSObject( subShapes[ i ]);
newSO = myGen_i->ObjectToSObject( mySubshapes[ i ]);
SALOMEDS::ChildIterator_wrap anIter = study->NewChildIterator( newSO );
bool refFound = false;
for ( ; anIter->More(); anIter->Next() )
{
SALOMEDS::SObject_wrap so = anIter->Value();
@ -3061,10 +3065,24 @@ namespace // utils for CopyMeshWithGeom()
{
oldEntry = oldSO->GetID();
newEntry = newSO->GetID();
if (( refFound = ( newMainEntry != oldEntry.in() )))
myOld2NewEntryMap.insert( std::make_pair( std::string( oldEntry.in() ),
std::string( newEntry.in() )));
}
}
if ( !refFound )
{
GEOM::GEOM_Object_var father = mySubshapes[ i ]->GetMainShape();
if ( father->_is_equivalent( mainShapeNew ))
{
GEOM::ListOfLong_var ids = mySubshapes[ i ]->GetSubShapeIndices();
std::set< int > idSet( &ids[0] , &ids[0] + ids->length() );
myIds2SubshapeIndex.insert( std::make_pair( idSet, i ));
CORBA::String_var name = newSO->GetName();
if ( name.in()[0] )
myName2SubshapeIndex.insert( std::make_pair( name.in(), i ));
}
}
}
}
@ -3088,7 +3106,7 @@ namespace // utils for CopyMeshWithGeom()
GEOM::GEOM_Object_var mainShapeNew = myNewMesh_i->GetShapeToMesh();
GEOM::GEOM_Gen_var geomGen = myGen_i->GetGeomEngine();
// try to find by entry
// try to find by entry or name
if ( myToPublish )
{
CORBA::String_var oldEntry = oldShape->GetStudyEntry();
@ -3097,6 +3115,22 @@ namespace // utils for CopyMeshWithGeom()
{
newShape = getShapeByEntry( o2nID->second );
}
if ( newShape->_is_nil() )
{
CORBA::String_var name = oldShape->GetName();
TName2IndexMap::iterator n2ind = myName2SubshapeIndex.find( name.in() );
if ( n2ind != myName2SubshapeIndex.end() )
{
newShape = GEOM::GEOM_Object::_duplicate( mySubshapes[ n2ind->second ]);
GEOM::ListOfLong_var oldIndices = oldShape->GetSubShapeIndices();
GEOM::ListOfLong_var newIndices = newShape->GetSubShapeIndices();
if ( oldIndices->length() == 0 ||
newIndices->length() == 0 ||
getShapeType( myNewMesh_i, newIndices[0] ) !=
getShapeType( mySrcMesh_i, oldIndices[0] ))
newShape = GEOM::GEOM_Object::_nil();
}
}
}
if ( newShape->_is_nil() )
@ -3114,10 +3148,18 @@ namespace // utils for CopyMeshWithGeom()
newIndices.clear();
newShape = getInPlace( oldShape );
}
if ( !newIndices.empty() )
if ( !newIndices.empty() && newShape->_is_nil() )
{
// search for a sub-shape with same ids
std::set< int > idSet( newIndices.begin(), newIndices.end() );
TIdSet2IndexMap::iterator ids2ind = myIds2SubshapeIndex.find( idSet );
if ( ids2ind != myIds2SubshapeIndex.end() ) {
newShape = GEOM::GEOM_Object::_duplicate( mySubshapes[ ids2ind->second ]);
}
if ( newShape->_is_nil() )
try
{
// create a new shape
if ( newIndices.size() > 1 || oldShape->GetType() == GEOM_GROUP )
{
int groupType = getShapeType( myNewMesh_i, newIndices[0] );