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

PAL13473 (Build repetitive mesh):

Browse Source 
an arg added to constructor of SMESH_subMeshEventListener
This commit is contained in:
eap 2006-12-07 08:29:52 +00:00
parent e17285fe3d
commit d4a97eee6e
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SMESH/SMESH_subMesh.cxx
View File

@ -1491,12 +1491,12 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
break; break;
} }
if ( _algoState != oldAlgoState ) if ( _algoState != oldAlgoState || event == MODIF_HYP )
{ {
if (_algoState == HYP_OK && algo )
algo->SetEventListener( this );
if ( oldAlgoState == HYP_OK ) if ( oldAlgoState == HYP_OK )
DeleteOwnListeners(); DeleteOwnListeners();
if (_algoState == HYP_OK && algo )
algo->SetEventListener( this );
} }
NotifyListenersOnEvent( event, COMPUTE_EVENT ); NotifyListenersOnEvent( event, COMPUTE_EVENT );
@ -1883,8 +1883,8 @@ void SMESH_subMesh::DeleteEventListener(EventListener* listener)
map< EventListener*, EventListenerData* >::iterator l_d = map< EventListener*, EventListenerData* >::iterator l_d =
myEventListeners.find( listener ); myEventListeners.find( listener );
if ( l_d != myEventListeners.end() ) { if ( l_d != myEventListeners.end() ) {
delete l_d->first; if ( l_d->first->IsDeletable() ) delete l_d->first;
delete l_d->second; if ( l_d->second->IsDeletable() ) delete l_d->second;
myEventListeners.erase( l_d ); myEventListeners.erase( l_d );
} }
} }

19
src/SMESH/SMESH_subMeshEventListener.hxx
View File

@ -42,7 +42,10 @@ struct SMESH_subMeshEventListenerData;
// ------------------------------------------------------------------ // ------------------------------------------------------------------
class SMESH_subMeshEventListener { class SMESH_subMeshEventListener {
bool myIsDeletable; //!< if true, it will be deleted by SMESH_subMesh
public: public:
SMESH_subMeshEventListener(bool isDeletable):myIsDeletable(isDeletable) {}
bool IsDeletable() const { return myIsDeletable; }
/*! /*!
* \brief Do something on a certain event * \brief Do something on a certain event
* \param event - algo_event or compute_event itself (of SMESH_subMesh) * \param event - algo_event or compute_event itself (of SMESH_subMesh)
@ -69,11 +72,13 @@ public:
struct SMESH_subMeshEventListenerData struct SMESH_subMeshEventListenerData
{ {
//!< to recognize data type bool myIsDeletable; //!< if true, it will be deleted by SMESH_subMesh
int myType; int myType; //!< to recognize data type
//!< generally: submeshes depending on the one storing this data std::list<SMESH_subMesh*> mySubMeshes; //!< generally: submeshes depending
std::list<SMESH_subMesh*> mySubMeshes; // on the one storing this data
//!< subMesh where data public:
SMESH_subMeshEventListenerData(bool isDeletable):myIsDeletable(isDeletable) {}
bool IsDeletable() const { return myIsDeletable; }
/*! /*!
* \brief Create a default listener data. * \brief Create a default listener data.
@ -82,12 +87,12 @@ struct SMESH_subMeshEventListenerData
* \retval SMESH_subMeshEventListenerData* - a new listener data * \retval SMESH_subMeshEventListenerData* - a new listener data
* *
* See SMESH_subMeshEventListener::ProcessEvent() to know how the default * See SMESH_subMeshEventListener::ProcessEvent() to know how the default
* listener uses it * listener uses it (implementation is in SMESH_subMesh.cxx)
*/ */
static SMESH_subMeshEventListenerData* MakeData(SMESH_subMesh* dependentSM, static SMESH_subMeshEventListenerData* MakeData(SMESH_subMesh* dependentSM,
const int type = 0) const int type = 0)
{ {
SMESH_subMeshEventListenerData* data = new SMESH_subMeshEventListenerData; SMESH_subMeshEventListenerData* data = new SMESH_subMeshEventListenerData(true);
data->mySubMeshes.push_back( dependentSM ); data->mySubMeshes.push_back( dependentSM );
data->myType = type; data->myType = type;
return data; return data;

2
src/StdMeshers/StdMeshers_Projection_1D.cxx
View File

@ -354,7 +354,7 @@ void StdMeshers_Projection_1D::SetEventListener(SMESH_subMesh* subMesh)
srcMesh->GetSubMesh( _sourceHypo->GetSourceEdge() ); srcMesh->GetSubMesh( _sourceHypo->GetSourceEdge() );
if ( srcEdgeSM != subMesh ) if ( srcEdgeSM != subMesh )
subMesh->SetEventListener( new SMESH_subMeshEventListener(), subMesh->SetEventListener( new SMESH_subMeshEventListener(true),
SMESH_subMeshEventListenerData::MakeData( subMesh ), SMESH_subMeshEventListenerData::MakeData( subMesh ),
srcEdgeSM ); srcEdgeSM );
} }

2
src/StdMeshers/StdMeshers_Projection_2D.cxx
View File

@ -631,7 +631,7 @@ void StdMeshers_Projection_2D::SetEventListener(SMESH_subMesh* subMesh)
SMESH_subMesh* srcFaceSM = SMESH_subMesh* srcFaceSM =
srcMesh->GetSubMesh( _sourceHypo->GetSourceFace() ); srcMesh->GetSubMesh( _sourceHypo->GetSourceFace() );
subMesh->SetEventListener( new SMESH_subMeshEventListener(), subMesh->SetEventListener( new SMESH_subMeshEventListener(true),
SMESH_subMeshEventListenerData::MakeData( subMesh ), SMESH_subMeshEventListenerData::MakeData( subMesh ),
srcFaceSM ); srcFaceSM );
} }

2
src/StdMeshers/StdMeshers_Projection_3D.cxx
View File

@ -430,7 +430,7 @@ void StdMeshers_Projection_3D::SetEventListener(SMESH_subMesh* subMesh)
srcMesh->GetSubMesh( _sourceHypo->GetSource3DShape() ); srcMesh->GetSubMesh( _sourceHypo->GetSource3DShape() );
if ( srcShapeSM != subMesh ) if ( srcShapeSM != subMesh )
subMesh->SetEventListener( new SMESH_subMeshEventListener(), subMesh->SetEventListener( new SMESH_subMeshEventListener(true),
SMESH_subMeshEventListenerData::MakeData( subMesh ), SMESH_subMeshEventListenerData::MakeData( subMesh ),
srcShapeSM ); srcShapeSM );
} }