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

SWP12743

Browse Source 
Using Precision::Angular() for detection of values equal to zero
This commit is contained in:
abd 2006-08-01 10:17:49 +00:00
parent ba7df26a44
commit aebc245a9a
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Controls/SMESH_Controls.cxx
View File

@ -801,13 +801,13 @@ SMDSAbs_ElementType Warping::GetType() const
double Taper::GetValue( const TSequenceOfXYZ& P ) double Taper::GetValue( const TSequenceOfXYZ& P )
{ {
if ( P.size() != 4 ) if ( P.size() != 4 )
return 0; return 0.;
// Compute taper // Compute taper
double J1 = getArea( P( 4 ), P( 1 ), P( 2 ) ) / 2; double J1 = getArea( P( 4 ), P( 1 ), P( 2 ) ) / 2.;
double J2 = getArea( P( 3 ), P( 1 ), P( 2 ) ) / 2; double J2 = getArea( P( 3 ), P( 1 ), P( 2 ) ) / 2.;
double J3 = getArea( P( 2 ), P( 3 ), P( 4 ) ) / 2; double J3 = getArea( P( 2 ), P( 3 ), P( 4 ) ) / 2.;
double J4 = getArea( P( 3 ), P( 4 ), P( 1 ) ) / 2; double J4 = getArea( P( 3 ), P( 4 ), P( 1 ) ) / 2.;
double JA = 0.25 * ( J1 + J2 + J3 + J4 ); double JA = 0.25 * ( J1 + J2 + J3 + J4 );
if ( JA <= Precision::Confusion() ) if ( JA <= Precision::Confusion() )
@ -841,42 +841,46 @@ SMDSAbs_ElementType Taper::GetType() const
*/ */
static inline double skewAngle( const gp_XYZ& p1, const gp_XYZ& p2, const gp_XYZ& p3 ) static inline double skewAngle( const gp_XYZ& p1, const gp_XYZ& p2, const gp_XYZ& p3 )
{ {
gp_XYZ p12 = ( p2 + p1 ) / 2; gp_XYZ p12 = ( p2 + p1 ) / 2.;
gp_XYZ p23 = ( p3 + p2 ) / 2; gp_XYZ p23 = ( p3 + p2 ) / 2.;
gp_XYZ p31 = ( p3 + p1 ) / 2; gp_XYZ p31 = ( p3 + p1 ) / 2.;
gp_Vec v1( p31 - p2 ), v2( p12 - p23 ); gp_Vec v1( p31 - p2 ), v2( p12 - p23 );
return v1.Magnitude() < gp::Resolution() || v2.Magnitude() < gp::Resolution() ? 0 : v1.Angle( v2 ); return v1.Magnitude() < gp::Resolution() || v2.Magnitude() < gp::Resolution() ? 0. : v1.Angle( v2 );
} }
double Skew::GetValue( const TSequenceOfXYZ& P ) double Skew::GetValue( const TSequenceOfXYZ& P )
{ {
if ( P.size() != 3 && P.size() != 4 ) if ( P.size() != 3 && P.size() != 4 )
return 0; return 0.;
// Compute skew // Compute skew
static double PI2 = PI / 2; static double PI2 = PI / 2.;
if ( P.size() == 3 ) if ( P.size() == 3 )
{ {
double A0 = fabs( PI2 - skewAngle( P( 3 ), P( 1 ), P( 2 ) ) ); double A0 = fabs( PI2 - skewAngle( P( 3 ), P( 1 ), P( 2 ) ) );
double A1 = fabs( PI2 - skewAngle( P( 1 ), P( 2 ), P( 3 ) ) ); double A1 = fabs( PI2 - skewAngle( P( 1 ), P( 2 ), P( 3 ) ) );
double A2 = fabs( PI2 - skewAngle( P( 2 ), P( 3 ), P( 1 ) ) ); double A2 = fabs( PI2 - skewAngle( P( 2 ), P( 3 ), P( 1 ) ) );
return Max( A0, Max( A1, A2 ) ) * 180 / PI; return Max( A0, Max( A1, A2 ) ) * 180. / PI;
} }
else else
{ {
gp_XYZ p12 = ( P( 1 ) + P( 2 ) ) / 2; gp_XYZ p12 = ( P( 1 ) + P( 2 ) ) / 2.;
gp_XYZ p23 = ( P( 2 ) + P( 3 ) ) / 2; gp_XYZ p23 = ( P( 2 ) + P( 3 ) ) / 2.;
gp_XYZ p34 = ( P( 3 ) + P( 4 ) ) / 2; gp_XYZ p34 = ( P( 3 ) + P( 4 ) ) / 2.;
gp_XYZ p41 = ( P( 4 ) + P( 1 ) ) / 2; gp_XYZ p41 = ( P( 4 ) + P( 1 ) ) / 2.;
gp_Vec v1( p34 - p12 ), v2( p23 - p41 ); gp_Vec v1( p34 - p12 ), v2( p23 - p41 );
double A = v1.Magnitude() <= gp::Resolution() || v2.Magnitude() <= gp::Resolution() double A = v1.Magnitude() <= gp::Resolution() || v2.Magnitude() <= gp::Resolution()
? 0 : fabs( PI2 - v1.Angle( v2 ) ); ? 0. : fabs( PI2 - v1.Angle( v2 ) );
return A * 180 / PI; //BUG SWP12743
if ( A < Precision::Angular() )
return 0.;
return A * 180. / PI;
} }
} }