From 52f164fb658ee0f92803649489757c52dbcb1ef3 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 27 Aug 2014 19:16:07 +0400 Subject: [PATCH 1/1] Fix a regression: Errors of hypothesis definition are not shown in GUI --- src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 2 +- src/SMESH_SWIG/StdMeshersBuilder.py | 3 ++- src/StdMeshers/StdMeshers_Projection_2D.cxx | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx index 379ed1b2b..836c2e360 100644 --- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx @@ -128,7 +128,7 @@ namespace SMESH } else { - QObject::tr(QString("SMESH_HYP_%1").arg(theHypStatus).toLatin1().data()); + aMsg += QObject::tr(QString("SMESH_HYP_%1").arg(theHypStatus).toLatin1().data()); if ( theHypStatus == SMESH::HYP_HIDDEN_ALGO ) { // PAL18501 CORBA::String_var hypType = theHyp->GetName(); diff --git a/src/SMESH_SWIG/StdMeshersBuilder.py b/src/SMESH_SWIG/StdMeshersBuilder.py index 0d6a55acb..1496202ff 100644 --- a/src/SMESH_SWIG/StdMeshersBuilder.py +++ b/src/SMESH_SWIG/StdMeshersBuilder.py @@ -830,12 +830,13 @@ class StdMeshersBuilder_Projection2D(Mesh_Algorithm): from salome.smesh.smeshBuilder import AssureGeomPublished AssureGeomPublished( self.mesh, geom ) hyp = self.Hypothesis("ProjectionSource2D", [face,mesh,srcV1,tgtV1,srcV2,tgtV2], - UseExisting=0) + UseExisting=0, toAdd=False) # it does not seem to be useful to reuse the existing "SourceFace" hypothesis #UseExisting=UseExisting, CompareMethod=self.CompareSourceFace) hyp.SetSourceFace( face ) hyp.SetSourceMesh( mesh ) hyp.SetVertexAssociation( srcV1, srcV2, tgtV1, tgtV2 ) + self.mesh.AddHypothesis(hyp, self.geom) return hyp pass # end of StdMeshersBuilder_Projection2D class diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index aef9d82b7..b0118c719 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx @@ -139,6 +139,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& !SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid source vertices"); SCRUTE((edge.IsNull())); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, srcMesh ))); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() ))); @@ -151,6 +152,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& if ( edge.IsNull() || !SMESH_MesherHelper::IsSubShape( edge, tgtMesh )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid target vertices"); SCRUTE((edge.IsNull())); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, tgtMesh ))); } @@ -159,6 +161,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& !SMESH_MesherHelper::IsSubShape( edge, theShape )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid target vertices"); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, theShape ))); } } @@ -168,6 +171,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& ( srcMesh == tgtMesh && theShape == _sourceHypo->GetSourceFace() )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid source face"); SCRUTE((SMESH_MesherHelper::IsSubShape( _sourceHypo->GetSourceFace(), srcMesh ))); SCRUTE((srcMesh == tgtMesh)); SCRUTE(( theShape == _sourceHypo->GetSourceFace() )); -- 2.30.2