-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
set< SMESH_subMesh*, _SubLess > _subM; // submeshes relating to this srcMesh
set< SMESH_subMesh*, _SubLess > _copyMeshSubM; // submeshes requesting mesh copying
- set< SMESH_subMesh*, _SubLess > _copyGroupSubM; // submeshes requesting mesh copying
+ set< SMESH_subMesh*, _SubLess > _copyGroupSubM; // submeshes requesting group copying
set< SMESH_subMesh*, _SubLess > _computedSubM;
SMESHDS_SubMesh* _importMeshSubDS; // submesh storing a copy of _srcMesh
typedef map< SMESH_Mesh*, list< _ImportData > > TMesh2ImpData;
TMesh2ImpData _tgtMesh2ImportData;
- _Listener():SMESH_subMeshEventListener(/*isDeletable=*/false){}
+ _Listener():SMESH_subMeshEventListener(/*isDeletable=*/false,
+ "StdMeshers_Import_1D::_Listener") {}
public:
// return poiter to a static listener
// set listener to hear events of the submesh computed by "Import" algo
importSub->SetEventListener( get(), new _ListenerData(srcHyp), importSub );
- // set a listener to hear events of the source mesh
+ // set listeners to hear events of the source mesh
SMESH_subMesh* smToNotify = importSub;
- SMESH_subMesh* smToListen = srcMesh->GetSubMeshContaining(1);
- SMESH_subMeshEventListenerData* data = new _ListenerData(srcHyp, LISTEN_SRC_MESH);
- data->mySubMeshes.push_back( smToNotify );
- importSub->SetEventListener( get(), data, smToListen );
-
- // remeber the submesh importSub and its sub-submeshes
+ vector<SMESH_subMesh*> smToListen = srcHyp->GetSourceSubMeshes( srcMesh );
+ for ( size_t i = 0; i < smToListen.size(); ++i )
+ {
+ SMESH_subMeshEventListenerData* data = new _ListenerData(srcHyp, LISTEN_SRC_MESH);
+ data->mySubMeshes.push_back( smToNotify );
+ importSub->SetEventListener( get(), data, smToListen[i] );
+ }
+ // remember the submesh importSub and its sub-submeshes
_ImportData* iData = _Listener::getImportData( srcMesh, importSub->GetFather());
iData->trackHypParams( importSub, srcHyp );
iData->addComputed( importSub );
// clear the rest submeshes
if ( !d->_computedSubM.empty() )
{
- set< SMESH_subMesh*, _SubLess> subs;
- subs.swap( d->_computedSubM ); // avoid recursion via events
- while ( !subs.empty() )
+ d->_computedSubM.clear();
+ set< SMESH_subMesh*, _SubLess>::iterator sub = d->_subM.begin();
+ for ( ; sub != d->_subM.end(); ++sub )
{
- SMESH_subMesh* subM = *subs.begin(); subs.erase( subs.begin() );
+ SMESH_subMesh* subM = *sub;
_ListenerData* hypData = (_ListenerData*) subM->GetEventListenerData( get() );
if ( hypData )
d->removeGroups( sm, hypData->_srcHyp );
{
// re-call SetEventListener() to take into account valid parameters
// of ImportSource hypothesis
- SMESH_Gen* gen = subMesh->GetFather()->GetGen();
- if ( SMESH_Algo* algo = gen->GetAlgo(*subMesh->GetFather(), subMesh->GetSubShape()))
+ if ( SMESH_Algo* algo = subMesh->GetAlgo() )
algo->SetEventListener( subMesh );
}
}
{
removeImport = true;
}
- else if ( SMESH_subMesh::REMOVE_ALGO == event ||
- SMESH_subMesh::REMOVE_FATHER_ALGO == event )
+ else if (( SMESH_subMesh::REMOVE_ALGO == event ||
+ SMESH_subMesh::REMOVE_FATHER_ALGO == event ) &&
+ SMESH_subMesh::ALGO_EVENT == eventType )
{
- SMESH_Gen* gen = subMesh->GetFather()->GetGen();
- SMESH_Algo* algo = gen->GetAlgo(*subMesh->GetFather(),subMesh->GetSubShape() );
+ SMESH_Algo* algo = subMesh->GetAlgo();
removeImport = ( strncmp( "Import", algo->GetName(), 6 ) != 0 );
}
// treate removal of Import algo from subMesh
removeSubmesh( subMesh, (_ListenerData*) data );
}
- else if ( modifHyp )
+ else if ( modifHyp ||
+ ( SMESH_subMesh::CLEAN == event &&
+ SMESH_subMesh::COMPUTE_EVENT == eventType))
{
// treate modification of ImportSource hypothesis
clearSubmesh( subMesh, (_ListenerData*) data, /*all=*/false );
for ( ; d != dList.end(); ++d )
if ( d->_subM.count( subMesh ))
{
- set<SMESH_subMesh*>::iterator smIt = d->_subM.begin();
+ set<SMESH_subMesh*,_SubLess>::iterator smIt = d->_subM.begin();
for( ; smIt != d->_subM.end(); ++smIt )
if ( (*smIt)->IsMeshComputed() )
d->_computedSubM.insert( *smIt);
{
// To get SMESH_subMesh corresponding to srcMeshDS we need to have a shape
// for which SMESHDS_Mesh::IsGroupOfSubShapes() returns true.
- // And this shape must be different from subshapes of the main shape.
+ // And this shape must be different from sub-shapes of the main shape.
// So we create a compound containing
// 1) some sub-shapes of SMESH_Mesh::PseudoShape() corresponding to
// srcMeshDS->GetPersistentId()
e2e->clear();
// Remember created groups in order to remove them as soon as the srcHyp is
- // modified or something other similar happens. Store them in a hypothesis
- // as it stores its values anyway
+ // modified or something other similar happens. This imformation must be persistent,
+ // for that store them in a hypothesis as it stores its values in the file anyway
srcHyp->StoreResultGroups( resultGroups, *srcMeshDS, *tgtMeshDS );
}