0020279: [CEA 334] control the "random" use when using mesh algorithms

   fix SetSourceMesh(): set mesh before calling NotifySubMeshesHypothesisModification()

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
index c7f2e76c951b0f9cd5524e63717650e34fb84c23..8c88c8eba2ce67d4e64e0e63fda8418bf27a57af 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
@@ -23,7 +23,6 @@
 //  File   : StdMeshers_ProjectionSource1D.cxx
 //  Author : Edward AGAPOV
 //  Module : SMESH
-//  $Header$
 //
 #include "StdMeshers_ProjectionSource1D.hxx"
 
@@ -127,9 +126,10 @@ void StdMeshers_ProjectionSource1D::SetVertexAssociation(const TopoDS_Shape& sou
 
 void StdMeshers_ProjectionSource1D::SetSourceMesh(SMESH_Mesh* mesh)
 {
-  if ( _sourceMesh != mesh )
+  if ( _sourceMesh != mesh ) {
+    _sourceMesh = mesh;
     NotifySubMeshesHypothesisModification();
-  _sourceMesh = mesh;
+  }
 }
 
 //=============================================================================
@@ -228,4 +228,3 @@ void StdMeshers_ProjectionSource1D::RestoreParams(const TopoDS_Shape& s1,
   _targetVertex = TopoDS::Vertex( s3 );
   _sourceMesh   = mesh;
 }
-

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
index a33f7d70dc0859d68d77a8fa12b1c3f55b0100ca..fc21c8954d502e56b658cc1fb662444cd65b18b6 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
@@ -23,8 +23,7 @@
 //  File   : StdMeshers_ProjectionSource2D.cxx
 //  Author : Edward AGAPOV
 //  Module : SMESH
-//  $Header$
-//
+
 #include "StdMeshers_ProjectionSource2D.hxx"
 
 #include "SMESH_Mesh.hxx"
@@ -137,9 +136,10 @@ void StdMeshers_ProjectionSource2D::SetVertexAssociation(const TopoDS_Shape& sou
 
 void StdMeshers_ProjectionSource2D::SetSourceMesh(SMESH_Mesh* mesh)
 {
-  if ( _sourceMesh != mesh )
+  if ( _sourceMesh != mesh ) {
+    _sourceMesh = mesh;
     NotifySubMeshesHypothesisModification();
-  _sourceMesh = mesh;
+  }
 }
 
 //=============================================================================

diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
index 190094542fc79b9745d4eb943ac41fc414faf9ee..02246294ead6ffdf1d3c5f0f58d90f026b7e1660 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
@@ -23,8 +23,7 @@
 //  File   : StdMeshers_ProjectionSource3D.cxx
 //  Author : Edward AGAPOV
 //  Module : SMESH
-//  $Header$
-//
+
 #include "StdMeshers_ProjectionSource3D.hxx"
 
 #include "utilities.h"
@@ -136,9 +135,10 @@ void StdMeshers_ProjectionSource3D::SetVertexAssociation(const TopoDS_Shape& sou
 
 void StdMeshers_ProjectionSource3D::SetSourceMesh(SMESH_Mesh* mesh)
 {
-  if ( _sourceMesh != mesh )
+  if ( _sourceMesh != mesh ) {
+    _sourceMesh = mesh;
     NotifySubMeshesHypothesisModification();
-  _sourceMesh = mesh;
+  }
 }
 
 //=============================================================================