Merge branch 'master' of https://git.salome-platform.org/git/modules/smesh into rnc/zcracks_doc_integration

This commit is contained in:
Renaud Nédélec 2014-04-16 11:27:07 +02:00
commit 9f501ed1df

View File

@ -648,7 +648,16 @@ bool StdMeshers_Quadrangle_2D::computeQuadDominant(SMESH_Mesh& aMesh,
else
{
if ( SMDS_MeshFace* face = myHelper->AddFace(a, b, d, c))
{
meshDS->SetMeshElementOnShape(face, geomFaceID);
SMESH_ComputeErrorPtr& err = aMesh.GetSubMesh( aFace )->GetComputeError();
if ( !err || err->IsOK() || err->myName < COMPERR_WARNING )
{
err.reset( new SMESH_ComputeError( COMPERR_WARNING,
"Bad quality quad created"));
err->myBadElements.push_back( face );
}
}
--i;
}
}
@ -820,7 +829,16 @@ bool StdMeshers_Quadrangle_2D::computeQuadDominant(SMESH_Mesh& aMesh,
else
{
if ( SMDS_MeshFace* face = myHelper->AddFace(a, b, d, c))
{
meshDS->SetMeshElementOnShape(face, geomFaceID);
SMESH_ComputeErrorPtr& err = aMesh.GetSubMesh( aFace )->GetComputeError();
if ( !err || err->IsOK() || err->myName < COMPERR_WARNING )
{
err.reset( new SMESH_ComputeError( COMPERR_WARNING,
"Bad quality quad created"));
err->myBadElements.push_back( face );
}
}
--i;
}
}