52447: Re-compute fails after hypothesis modification

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index e87b147c3fb068a431aa755607360a22c7ef35c3..4da6bf9ffda286faae4ac101d6de3d94caaca1d2 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -2299,16 +2299,31 @@ void SMESH_subMesh::setEventListener(EventListener*     listener,
 /*!
  * \brief Return an event listener data
  * \param listener - the listener whose data is
 /*!
  * \brief Return an event listener data
  * \param listener - the listener whose data is

+ * \param myOwn - if \c true, returns a listener set by this sub-mesh,
+ *        else returns a listener listening to events of this sub-mesh

  * \retval EventListenerData* - found data, maybe NULL
  */
 //================================================================================
 
  * \retval EventListenerData* - found data, maybe NULL
  */
 //================================================================================
 

-EventListenerData* SMESH_subMesh::GetEventListenerData(EventListener* listener) const
+EventListenerData* SMESH_subMesh::GetEventListenerData(EventListener* listener,
+                                                       const bool     myOwn) const

 {
 {

-  map< EventListener*, EventListenerData* >::const_iterator l_d =
-    _eventListeners.find( listener );
-  if ( l_d != _eventListeners.end() )
-    return l_d->second;
+  if ( myOwn )
+  {
+    list< OwnListenerData >::const_iterator d;
+    for ( d = _ownListeners.begin(); d != _ownListeners.end(); ++d )
+    {
+      if ( d->myListener == listener && _father->MeshExists( d->myMeshID ))
+        return d->mySubMesh->GetEventListenerData( listener, !myOwn );
+    }
+  }
+  else
+  {
+    map< EventListener*, EventListenerData* >::const_iterator l_d =
+      _eventListeners.find( listener );
+    if ( l_d != _eventListeners.end() )
+      return l_d->second;
+  }

   return 0;
 }
 
   return 0;
 }
 


@@ -2316,16 +2331,31 @@ EventListenerData* SMESH_subMesh::GetEventListenerData(EventListener* listener)
 /*!
  * \brief Return an event listener data
  * \param listenerName - the listener name
 /*!
  * \brief Return an event listener data
  * \param listenerName - the listener name

+ * \param myOwn - if \c true, returns a listener set by this sub-mesh,
+ *        else returns a listener listening to events of this sub-mesh

  * \retval EventListenerData* - found data, maybe NULL
  */
 //================================================================================
 
  * \retval EventListenerData* - found data, maybe NULL
  */
 //================================================================================
 

-EventListenerData* SMESH_subMesh::GetEventListenerData(const string& listenerName) const
+EventListenerData* SMESH_subMesh::GetEventListenerData(const string& listenerName,
+                                                       const bool    myOwn) const

 {
 {

-  map< EventListener*, EventListenerData* >::const_iterator l_d = _eventListeners.begin();
-  for ( ; l_d != _eventListeners.end(); ++l_d )
-    if ( listenerName == l_d->first->GetName() )
-      return l_d->second;
+  if ( myOwn )
+  {
+    list< OwnListenerData >::const_iterator d;
+    for ( d = _ownListeners.begin(); d != _ownListeners.end(); ++d )
+    {
+      if ( _father->MeshExists( d->myMeshID ) && listenerName == d->myListener->GetName())
+        return d->mySubMesh->GetEventListenerData( listenerName, !myOwn );
+    }
+  }
+  else
+  {
+    map< EventListener*, EventListenerData* >::const_iterator l_d = _eventListeners.begin();
+    for ( ; l_d != _eventListeners.end(); ++l_d )
+      if ( listenerName == l_d->first->GetName() )
+        return l_d->second;
+  }

   return 0;
 }
 
   return 0;
 }
 

diff --git a/src/SMESH/SMESH_subMesh.hxx b/src/SMESH/SMESH_subMesh.hxx
index f38d6367a53d925f21715f565c88e8010c9651a4..36a37740080173452ce1e9322e33a44836d31b5e 100644 (file)
--- a/src/SMESH/SMESH_subMesh.hxx
+++ b/src/SMESH/SMESH_subMesh.hxx
@@ -139,16 +139,22 @@ class SMESH_EXPORT SMESH_subMesh
   /*!
    * \brief Return an event listener data
     * \param listener - the listener whose data is
   /*!
    * \brief Return an event listener data
     * \param listener - the listener whose data is

+    * \param myOwn - if \c true, returns a listener set by this sub-mesh,
+    *        else returns a listener listening to events of this sub-mesh

     * \retval EventListenerData* - found data, maybe NULL
    */
     * \retval EventListenerData* - found data, maybe NULL
    */

-  EventListenerData* GetEventListenerData(EventListener* listener) const;
+  EventListenerData* GetEventListenerData(EventListener* listener,
+                                          const bool     myOwn=false) const;

 
   /*!
    * \brief Return an event listener data
     * \param listenerName - the listener name
 
   /*!
    * \brief Return an event listener data
     * \param listenerName - the listener name

+    * \param myOwn - if \c true, returns a listener set by this sub-mesh,
+    *        else returns a listener listening to events of this sub-mesh

     * \retval EventListenerData* - found data, maybe NULL
    */
     * \retval EventListenerData* - found data, maybe NULL
    */

-  EventListenerData* GetEventListenerData(const std::string& listenerName) const;
+  EventListenerData* GetEventListenerData(const std::string& listenerName,
+                                          const bool         myOwn=false) const;

 
   /*!
    * \brief Unregister the listener and delete it and it's data
 
   /*!
    * \brief Unregister the listener and delete it and it's data

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 9739fcb3e878159389a4dc4df2378ef259cdfa67..32ac43e84acfd4b30c31fe3d88030573f2e20bed 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -2383,9 +2383,21 @@ void StdMeshers_ProjectionUtils::SetEventListener(SMESH_subMesh* subMesh,
       }
       else
       {
       }
       else
       {

-        subMesh->SetEventListener( getSrcSubMeshListener(),
-                                   SMESH_subMeshEventListenerData::MakeData( subMesh ),
-                                   srcShapeSM );
+        if ( SMESH_subMeshEventListenerData* data =
+             srcShapeSM->GetEventListenerData( getSrcSubMeshListener() ))
+        {
+          bool alreadyIn =
+            (std::find( data->mySubMeshes.begin(),
+                        data->mySubMeshes.end(), subMesh ) != data->mySubMeshes.end() );
+          if ( !alreadyIn )
+            data->mySubMeshes.push_back( subMesh );
+        }
+        else
+        {
+          subMesh->SetEventListener( getSrcSubMeshListener(),
+                                     SMESH_subMeshEventListenerData::MakeData( subMesh ),
+                                     srcShapeSM );
+        }

       }
     }
   }
       }
     }
   }