ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-12 00:29:18 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for test case geom/bugs_05/F7

Browse Source
This commit is contained in:
skv 2015-04-20 18:23:17 +03:00
parent f115f2d5e7
commit cd38446206
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
View File

@ -416,19 +416,18 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF,
aPx[i]=aInfoEx.Location(); aPx[i]=aInfoEx.Location();
} }
// //
Standard_Boolean isRectangle = Standard_True;
for (i=0; i<4; ++i) { for (i=0; i<4; ++i) {
j=(i==3) ? 0 : i+1; j=(i==3) ? 0 : i+1;
aDot=aDx[i]*aDx[j]; aDot=aDx[i]*aDx[j];
if (fabs (aDot) > myTolerance) { if (fabs (aDot) > myTolerance) {
aInfo.SetKindOfName(GEOMAlgo_KN_QUADRANGLE); isRectangle = Standard_False;
return; break;
} }
} }
// //
// rectangle // rectangle
aInfo.SetKindOfName(GEOMAlgo_KN_RECTANGLE); // shift location to the center
//
// shift location to the center and calc. sizes
aXYZc.SetCoord(0.,0.,0.); aXYZc.SetCoord(0.,0.,0.);
TopExp::MapShapes(aF, TopAbs_VERTEX, aMV); TopExp::MapShapes(aF, TopAbs_VERTEX, aMV);
for (i=1; i<=aNbV; ++i) { for (i=1; i<=aNbV; ++i) {
@ -440,33 +439,41 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF,
// //
// Location : aPc in center of rectangle // Location : aPc in center of rectangle
// Position : 0z is plane normal // Position : 0z is plane normal
// 0x is along length // 0x is along the first edge (quadrangle) or
// along length (rectangle)
// //
aXYZc.Divide(4.); aXYZc.Divide(4.);
aPc.SetXYZ(aXYZc); aPc.SetXYZ(aXYZc);
// aDX=aDx[0];
gp_Lin aL0(aPx[0], aDx[0]); aInfo.SetLocation(aPc);
gp_Lin aL1(aPx[1], aDx[1]);
// if (isRectangle) {
aD0=aL0.Distance(aPc); // Calculate sizes
aD1=aL1.Distance(aPc); gp_Lin aL0(aPx[0], aDx[0]);
// gp_Lin aL1(aPx[1], aDx[1]);
aLength=aD0; //
aWidth =aD1; aD0=aL0.Distance(aPc);
aDX=aL1.Direction(); aD1=aL1.Distance(aPc);
if (aD0<aD1) { //
aLength=aD1; aLength=aD1;
aWidth =aD0; aWidth =aD0;
aDX=aL0.Direction();
if (aD0>aD1) {
aLength=aD0;
aWidth =aD1;
aDX=aDx[1];
}
//
aLength=2.*aLength;
aWidth =2.*aWidth;
//
aInfo.SetLength(aLength);
aInfo.SetWidth(aWidth);
aInfo.SetKindOfName(GEOMAlgo_KN_RECTANGLE);
} else {
aInfo.SetKindOfName(GEOMAlgo_KN_QUADRANGLE);
} }
// //
aLength=2.*aLength;
aWidth =2.*aWidth;
//
aInfo.SetLocation(aPc);
aInfo.SetLength(aLength);
aInfo.SetWidth(aWidth);
//
const gp_Dir& aDZ=aPln.Axis().Direction(); const gp_Dir& aDZ=aPln.Axis().Direction();
gp_Ax2 aAx2(aPc, aDZ, aDX); gp_Ax2 aAx2(aPc, aDZ, aDX);
gp_Ax3 aAx3(aAx2); gp_Ax3 aAx3(aAx2);