0022414: [CEA 1010] Regressio on tests 01_composite.py

Fix for a vertex w/o a node
This commit is contained in:
eap 2013-11-25 09:14:33 +00:00
parent 1faf00f679
commit a004160516

View File

@ -1397,6 +1397,8 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
bool WisF = true;
int i,j,geomFaceID = meshDS->ShapeToIndex(F);
UpdateDegenUV( quad );
int nb = quad->side[0]->NbPoints();
int nr = quad->side[1]->NbPoints();
int nt = quad->side[2]->NbPoints();
@ -1436,14 +1438,14 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
int addh = 0;
int addv = 0;
// Orientation of face and 3 main domain for future faces
// ----------- Old version ---------------
// orientation of face and 3 main domain for future faces
// 0 top 1
// 1------------1
// | | | |
// | | | |
// | |C | |
// | L | | R |
// left | | | | rigth
// left | |__| | rigth
// | / \ |
// | / C \ |
// |/ \|
@ -1451,15 +1453,14 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
// 0 bottom 1
// ----------- New version ---------------
// orientation of face and 3 main domain for future faces
// 0 top 1
// 1------------1
// | |____| |
// | |_C__| |
// | / \ |
// | / C \ |
// left |/________\| rigth
// | |
// | |
// | C |
// | |
// 0------------0
// 0 bottom 1
@ -1481,8 +1482,6 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref (SMESH_Mesh & aMesh,
if (uv_eb.size() != nb || uv_er.size() != nr || uv_et.size() != nt || uv_el.size() != nl)
return error(COMPERR_BAD_INPUT_MESH);
UpdateDegenUV( quad );
// arrays for normalized params
TColStd_SequenceOfReal npb, npr, npt, npl;
for (i=0; i<nb; i++) {
@ -3588,7 +3587,7 @@ int StdMeshers_Quadrangle_2D::GetCorners(const TopoDS_Face& theFace,
theVertices.push_back( v );
cornerInd.push_back( angles.size() );
}
angles.push_back( angleByVertex( v ));
angles.push_back( angleByVertex.IsBound( v ) ? angleByVertex( v ) : -M_PI );
edgeVec.push_back( *edge );
}