ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-28 14:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a regression: Errors of hypothesis definition are not shown in GUI

Browse Source
This commit is contained in:
eap 2014-08-27 19:16:07 +04:00
parent ac82d3163a
commit 52f164fb65
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
View File

@ -128,7 +128,7 @@ namespace SMESH
} }
else 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 if ( theHypStatus == SMESH::HYP_HIDDEN_ALGO ) { // PAL18501
CORBA::String_var hypType = theHyp->GetName(); CORBA::String_var hypType = theHyp->GetName();

3
src/SMESH_SWIG/StdMeshersBuilder.py
View File

@ -830,12 +830,13 @@ class StdMeshersBuilder_Projection2D(Mesh_Algorithm):
from salome.smesh.smeshBuilder import AssureGeomPublished from salome.smesh.smeshBuilder import AssureGeomPublished
AssureGeomPublished( self.mesh, geom ) AssureGeomPublished( self.mesh, geom )
hyp = self.Hypothesis("ProjectionSource2D", [face,mesh,srcV1,tgtV1,srcV2,tgtV2], 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 # it does not seem to be useful to reuse the existing "SourceFace" hypothesis
#UseExisting=UseExisting, CompareMethod=self.CompareSourceFace) #UseExisting=UseExisting, CompareMethod=self.CompareSourceFace)
hyp.SetSourceFace( face ) hyp.SetSourceFace( face )
hyp.SetSourceMesh( mesh ) hyp.SetSourceMesh( mesh )
hyp.SetVertexAssociation( srcV1, srcV2, tgtV1, tgtV2 ) hyp.SetVertexAssociation( srcV1, srcV2, tgtV1, tgtV2 )
self.mesh.AddHypothesis(hyp, self.geom)
return hyp return hyp
pass # end of StdMeshersBuilder_Projection2D class pass # end of StdMeshersBuilder_Projection2D class

4
src/StdMeshers/StdMeshers_Projection_2D.cxx
View File

@ -139,6 +139,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh&
!SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() )) !SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() ))
{ {
theStatus = HYP_BAD_PARAMETER; theStatus = HYP_BAD_PARAMETER;
error("Invalid source vertices");
SCRUTE((edge.IsNull())); SCRUTE((edge.IsNull()));
SCRUTE((SMESH_MesherHelper::IsSubShape( edge, srcMesh ))); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, srcMesh )));
SCRUTE((SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() ))); 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 )) if ( edge.IsNull() || !SMESH_MesherHelper::IsSubShape( edge, tgtMesh ))
{ {
theStatus = HYP_BAD_PARAMETER; theStatus = HYP_BAD_PARAMETER;
error("Invalid target vertices");
SCRUTE((edge.IsNull())); SCRUTE((edge.IsNull()));
SCRUTE((SMESH_MesherHelper::IsSubShape( edge, tgtMesh ))); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, tgtMesh )));
} }
@ -159,6 +161,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh&
!SMESH_MesherHelper::IsSubShape( edge, theShape )) !SMESH_MesherHelper::IsSubShape( edge, theShape ))
{ {
theStatus = HYP_BAD_PARAMETER; theStatus = HYP_BAD_PARAMETER;
error("Invalid target vertices");
SCRUTE((SMESH_MesherHelper::IsSubShape( edge, theShape ))); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, theShape )));
} }
} }
@ -168,6 +171,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh&
( srcMesh == tgtMesh && theShape == _sourceHypo->GetSourceFace() )) ( srcMesh == tgtMesh && theShape == _sourceHypo->GetSourceFace() ))
{ {
theStatus = HYP_BAD_PARAMETER; theStatus = HYP_BAD_PARAMETER;
error("Invalid source face");
SCRUTE((SMESH_MesherHelper::IsSubShape( _sourceHypo->GetSourceFace(), srcMesh ))); SCRUTE((SMESH_MesherHelper::IsSubShape( _sourceHypo->GetSourceFace(), srcMesh )));
SCRUTE((srcMesh == tgtMesh)); SCRUTE((srcMesh == tgtMesh));
SCRUTE(( theShape == _sourceHypo->GetSourceFace() )); SCRUTE(( theShape == _sourceHypo->GetSourceFace() ));