diff --git a/Chiseling.cpp b/Chiseling.cpp index 265699a..e606838 100644 --- a/Chiseling.cpp +++ b/Chiseling.cpp @@ -1034,7 +1034,7 @@ Chiseling::Chain( int nGrpDestId) if ( pCrv->GetExtrusion( vtTemp)) { vtExtr = vtTemp ; double dTemp ; - if ( pCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // la aggiungo alla curva composta diff --git a/Disposition.cpp b/Disposition.cpp index 70c7e6f..c604176 100644 --- a/Disposition.cpp +++ b/Disposition.cpp @@ -570,7 +570,7 @@ Disposition::AddFixture( const string& sName, const Point3d& ptPos, double dAngD Vector3d vtMove = ( m_ptRef1 + vtDelta1 + ptPos) - ORIG ; m_pGeomDB->TranslateGlob( nFixtId, vtMove) ; // la ruoto - if ( fabs( dAngDeg) > EPS_ANG_SMALL) + if ( abs( dAngDeg) > EPS_ANG_SMALL) m_pGeomDB->RotateGroup( nFixtId, ORIG, Z_AX, dAngDeg) ; // recupero ingombro sottopezzo (rimpicciolisco un poco per tolleranza) BBox3d b3Fixt ; @@ -759,7 +759,7 @@ Disposition::PlaceFixture( int nId, const Point3d& ptPos, double dAngDeg, double Vector3d vtMove = ( m_ptRef1 + vtDelta1 + ptPos) - ORIG ; m_pGeomDB->TranslateGlob( nId, vtMove) ; // lo ruoto - if ( fabs( dAngDeg) > EPS_ANG_SMALL) + if ( abs( dAngDeg) > EPS_ANG_SMALL) m_pGeomDB->RotateGroup( nId, ORIG, Z_AX, dAngDeg) ; // muovo eventuale parte mobile int nMobId = m_pGeomDB->GetFirstNameInGroup( nId, FXT_MOBILE) ; diff --git a/Drilling.cpp b/Drilling.cpp index ac44fd8..5b9eb8d 100644 --- a/Drilling.cpp +++ b/Drilling.cpp @@ -692,7 +692,7 @@ Drilling::Chain( int nGrpDestId) if ( pCrv->GetExtrusion( vtTemp)) { vtExtr = vtTemp ; double dTemp ; - if ( pCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // la aggiungo alla curva composta @@ -1269,7 +1269,7 @@ Drilling::GetHoleData( SelData Id, Hole& hole) m_pMchMgr->SetLastError( 2104, "Error in Drilling : Depth not computable") ; return false ; } - if ( fabs( dDepth) < EPS_SMALL) { + if ( abs( dDepth) < EPS_SMALL) { m_pMchMgr->SetLastError( 2105, "Error in Drilling : Drill with zero depth") ; return false ; } @@ -1337,11 +1337,11 @@ bool Drilling::DoStandardDrilling( const Hole& hole, SelData Id, int nPathId) { // aggiusto alcuni parametri del ciclo di foratura - double dStartSlowLen = fabs( m_Params.m_dStartSlowLen) ; - if ( fabs( m_TParams.m_dStartFeed - m_TParams.m_dFeed) < EPS_SMALL) + double dStartSlowLen = abs( m_Params.m_dStartSlowLen) ; + if ( abs( m_TParams.m_dStartFeed - m_TParams.m_dFeed) < EPS_SMALL) dStartSlowLen = 0 ; - double dEndSlowLen = ( hole.bBlind ? 0 : fabs( m_Params.m_dEndSlowLen)) ; - if ( fabs( m_TParams.m_dTipFeed - m_TParams.m_dFeed) < EPS_SMALL) + double dEndSlowLen = ( hole.bBlind ? 0 : abs( m_Params.m_dEndSlowLen)) ; + if ( abs( m_TParams.m_dTipFeed - m_TParams.m_dFeed) < EPS_SMALL) dEndSlowLen = 0 ; if ( ( dStartSlowLen + dEndSlowLen) > hole.dLen) { dStartSlowLen = dStartSlowLen / ( dStartSlowLen + dEndSlowLen) * hole.dLen ; @@ -1464,11 +1464,11 @@ bool Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId) { // aggiusto alcuni parametri del ciclo di foratura - double dStartSlowLen = fabs( m_Params.m_dStartSlowLen) ; - if ( fabs( m_TParams.m_dStartFeed - m_TParams.m_dFeed) < EPS_SMALL) + double dStartSlowLen = abs( m_Params.m_dStartSlowLen) ; + if ( abs( m_TParams.m_dStartFeed - m_TParams.m_dFeed) < EPS_SMALL) dStartSlowLen = 0 ; - double dEndSlowLen = ( hole.bBlind ? 0 : fabs( m_Params.m_dEndSlowLen)) ; - if ( fabs( m_TParams.m_dTipFeed - m_TParams.m_dFeed) < EPS_SMALL) + double dEndSlowLen = ( hole.bBlind ? 0 : abs( m_Params.m_dEndSlowLen)) ; + if ( abs( m_TParams.m_dTipFeed - m_TParams.m_dFeed) < EPS_SMALL) dEndSlowLen = 0 ; if ( ( dStartSlowLen + dEndSlowLen) > hole.dLen) { dStartSlowLen = dStartSlowLen / ( dStartSlowLen + dEndSlowLen) * hole.dLen ; diff --git a/GeoCalc.cpp b/GeoCalc.cpp index 4e23a58..6ca4d62 100644 --- a/GeoCalc.cpp +++ b/GeoCalc.cpp @@ -35,7 +35,7 @@ GetRotationComponent( const Vector3d& vtDir1, double dComp, const Vector3d& vtDi // determino se equiversi o controversi bool bEquiv = ( vtDir2 * vtRotAx) > 0 ; // se le componenti concordano, angolo indeterminato - if ( fabs( dT0w - ( bEquiv ? dComp : - dComp)) < 0.5 * SIN_EPS_ANG_SMALL) { + if ( abs( dT0w - ( bEquiv ? dComp : - dComp)) < 0.5 * SIN_EPS_ANG_SMALL) { bDet = false ; return 1 ; } @@ -66,11 +66,11 @@ GetRotationComponent( const Vector3d& vtDir1, double dComp, const Vector3d& vtDi // calcolo della seconda parte dell'angolo // denominatore nullo ... - if ( ( fabs( dT0v) < EPS_ZERO && fabs( dT0u) < EPS_ZERO) || fabs( dSinG) < SIN_EPS_ANG_ZERO) { + if ( ( abs( dT0v) < EPS_ZERO && abs( dT0u) < EPS_ZERO) || abs( dSinG) < SIN_EPS_ANG_ZERO) { // calcolo della componenete di T0 lungo Z double dT0z = vtDir1 * vtDir2 ; // se le componenti concordano, angolo indeterminato - if ( fabs( dT0z - dComp) < 0.5 * SIN_EPS_ANG_SMALL) { + if ( abs( dT0z - dComp) < 0.5 * SIN_EPS_ANG_SMALL) { bDet = false ; return 1 ; } @@ -82,7 +82,7 @@ GetRotationComponent( const Vector3d& vtDir1, double dComp, const Vector3d& vtDi double dDenom = dT0uv * dSinG ; double dNumer = dComp - dT0w * dCosG ; // due angoli possibili - if ( fabs( dDenom) > fabs( dNumer)) { + if ( abs( dDenom) > abs( dNumer)) { double dDeltaAngRad = acos( dNumer / dDenom) ; dAng1Deg = ( dOffsAngRad + dDeltaAngRad) * RADTODEG ; dAng2Deg = ( dOffsAngRad - dDeltaAngRad) * RADTODEG ; @@ -90,7 +90,7 @@ GetRotationComponent( const Vector3d& vtDir1, double dComp, const Vector3d& vtDi return 2 ; } // un angolo possibile - else if ( fabs( dDenom) > fabs( dNumer) - SIN_EPS_ANG_ZERO) { + else if ( abs( dDenom) > abs( dNumer) - SIN_EPS_ANG_ZERO) { if ( dDenom * dNumer > 0) dAng1Deg = dOffsAngRad * RADTODEG ; else diff --git a/MachineCalc.cpp b/MachineCalc.cpp index 88df30a..adae4c4 100644 --- a/MachineCalc.cpp +++ b/MachineCalc.cpp @@ -838,8 +838,8 @@ Machine::GetMyAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, dTemp = 1 - dCompHSuAxR1 * dCompHSuAxR1 ; double dCompHOrtAxR1 = ( ( dTemp > EPS_ZERO) ? sqrt( dTemp) : 0) ; // verifica ( controllo verso e max delta angolare < 0.002 deg) - if ( fabs( dCompTSuAxR1 - dCompHSuAxR1) < EPS_SMALL && - fabs( dCompTOrtAxR1 * dCompHSuAxR1 - dCompHOrtAxR1 * dCompTSuAxR1) < 2 * SIN_EPS_ANG_SMALL) { + if ( abs( dCompTSuAxR1 - dCompHSuAxR1) < EPS_SMALL && + abs( dCompTOrtAxR1 * dCompHSuAxR1 - dCompHOrtAxR1 * dCompTSuAxR1) < 2 * SIN_EPS_ANG_SMALL) { nStat = 1 ; vtDirH1 = vtDirHn ; vtDirI1 = vtDirIn ; diff --git a/MachiningsMgr.cpp b/MachiningsMgr.cpp index 17dba4e..50f0e70 100644 --- a/MachiningsMgr.cpp +++ b/MachiningsMgr.cpp @@ -1019,7 +1019,7 @@ MachiningsMgr::SetSafeZ( double dSafeZ) if ( dSafeZ < - EPS_SMALL) return false ; // se cambiato, salvo e setto modifica - if ( fabs( dSafeZ - m_dSafeZ) > EPS_SMALL) { + if ( abs( dSafeZ - m_dSafeZ) > EPS_SMALL) { m_dSafeZ = dSafeZ ; m_bModified = true ; } @@ -1034,7 +1034,7 @@ MachiningsMgr::SetSafeAggrBottZ( double dSafeAggrBottZ) if ( dSafeAggrBottZ < - EPS_SMALL) return false ; // se cambiato, salvo e setto modifica - if ( fabs( dSafeAggrBottZ - m_dSafeAggrBottZ) > EPS_SMALL) { + if ( abs( dSafeAggrBottZ - m_dSafeAggrBottZ) > EPS_SMALL) { m_dSafeAggrBottZ = dSafeAggrBottZ ; m_bModified = true ; } @@ -1049,7 +1049,7 @@ MachiningsMgr::SetExtraLOnCutRegion( double dExtraL) if ( dExtraL < - EPS_SMALL) return false ; // se cambiato, salvo e setto modifica - if ( fabs( dExtraL - m_dExtraLOnCutRegion) > EPS_SMALL) { + if ( abs( dExtraL - m_dExtraLOnCutRegion) > EPS_SMALL) { m_dExtraLOnCutRegion = dExtraL ; m_bModified = true ; } @@ -1064,7 +1064,7 @@ MachiningsMgr::SetExtraROnDrillRegion( double dExtraR) if ( dExtraR < - EPS_SMALL) return false ; // se cambiato, salvo e setto modifica - if ( fabs( dExtraR - m_dExtraROnDrillRegion) > EPS_SMALL) { + if ( abs( dExtraR - m_dExtraROnDrillRegion) > EPS_SMALL) { m_dExtraROnDrillRegion = dExtraR ; m_bModified = true ; } @@ -1081,7 +1081,7 @@ MachiningsMgr::SetHoleDiamToler( double dToler) if ( abs( dToler) < EPS_SMALL) dToler = EPS_SMALL ; // se cambiato, salvo e setto modifica - if ( fabs( dToler - m_dHoleDiamToler) > EPS_SMALL) { + if ( abs( dToler - m_dHoleDiamToler) > EPS_SMALL) { m_dHoleDiamToler = dToler ; m_bModified = true ; } @@ -1096,7 +1096,7 @@ MachiningsMgr::SetExtSawArcMinRad( double dRad) if ( dRad < - EPS_SMALL) return false ; // se cambiato, salvo e setto modifica - if ( fabs( dRad - m_dExtSawArcMinRad) > EPS_SMALL) { + if ( abs( dRad - m_dExtSawArcMinRad) > EPS_SMALL) { m_dExtSawArcMinRad = dRad ; m_bModified = true ; } @@ -1112,7 +1112,7 @@ MachiningsMgr::SetIntSawArcMaxSideAng( double dSideAng) if ( dSideAng < - EPS_ANG_SMALL || dSideAng > MAX_SIDE_ANG + EPS_ANG_SMALL) return false ; // se cambiato, salvo e setto modifica - if ( fabs( dSideAng - m_dIntSawArcMaxSideAng) > EPS_ANG_SMALL) { + if ( abs( dSideAng - m_dIntSawArcMaxSideAng) > EPS_ANG_SMALL) { m_dIntSawArcMaxSideAng = dSideAng ; m_bModified = true ; } diff --git a/Milling.cpp b/Milling.cpp index 8cb2ecf..41ca12c 100644 --- a/Milling.cpp +++ b/Milling.cpp @@ -1194,7 +1194,7 @@ Milling::Chain( int nGrpDestId) if ( pCrv->GetExtrusion( vtTemp)) { vtExtr = vtTemp ; double dTemp ; - if ( pCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // la aggiungo alla curva composta diff --git a/MillingData.cpp b/MillingData.cpp index c0acc53..9d461a5 100644 --- a/MillingData.cpp +++ b/MillingData.cpp @@ -540,7 +540,7 @@ MillingData::VerifyLeadOutType( int nVal) const bool MillingData::VerifySideAngle( double dVal) const { - return ( ( dVal > - EPS_SMALL && dVal < 90 + EPS_SMALL) || fabs( dVal - 99) < EPS_SMALL) ; + return ( ( dVal > - EPS_SMALL && dVal < 90 + EPS_SMALL) || abs( dVal - 99) < EPS_SMALL) ; } //---------------------------------------------------------------------------- diff --git a/Mortising.cpp b/Mortising.cpp index 0deb1d9..b918520 100644 --- a/Mortising.cpp +++ b/Mortising.cpp @@ -969,7 +969,7 @@ Mortising::Chain( int nGrpDestId) if ( pCrv->GetExtrusion( vtTemp)) { vtExtr = vtTemp ; double dTemp ; - if ( pCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // la aggiungo alla curva composta diff --git a/Operation.cpp b/Operation.cpp index 2fe9009..969a18c 100644 --- a/Operation.cpp +++ b/Operation.cpp @@ -118,7 +118,7 @@ Operation::GetElevation( int nPhase, const Point3d& ptP, // se tratto di intersezione coincidente, considero la posizione più lontana, ovvero 2 if ( Info.nILTT == ILTT_SEGM || Info.nILTT == ILTT_SEGM_ON_EDGE) { // se prosegue un tratto precedente, non devo controllare sia minimo - if ( fabs( dElev - Info.dU) < EPS_SMALL) + if ( abs( dElev - Info.dU) < EPS_SMALL) dElev = Info.dU2 ; else dElev = min( dElev, Info.dU2) ; @@ -193,7 +193,7 @@ Operation::GetElevation( int nPhase, const Point3d& ptP1, const Point3d& ptP2, // se tratto di intersezione coincidente, considero la posizione più lontana, ovvero 2 if ( Info.nILTT == ILTT_SEGM || Info.nILTT == ILTT_SEGM_ON_EDGE) { // se prosegue un tratto precedente, non devo controllare sia minimo - if ( fabs( dElevP - Info.dU) < EPS_SMALL) + if ( abs( dElevP - Info.dU) < EPS_SMALL) dElevP = Info.dU2 ; else dElevP = min( dElevP, Info.dU2) ; @@ -1159,8 +1159,8 @@ Operation::CalculateClPathAxesValues( int nClPathId, int nLinAxes, int nRotAxes, continue ; // calcolo i delta asse con eventuale peso bool bFirst = ( i == 0) ; - dDelta1 += fabs( vAng1[i] - vAxRotPrec[i]) * ( bFirst ? dRot1W : 1) ; - dDelta2 += fabs( vAng2[i] - vAxRotPrec[i]) * ( bFirst ? dRot1W : 1) ; + dDelta1 += abs( vAng1[i] - vAxRotPrec[i]) * ( bFirst ? dRot1W : 1) ; + dDelta2 += abs( vAng2[i] - vAxRotPrec[i]) * ( bFirst ? dRot1W : 1) ; } if ( bAng2 && ( dDelta2 < dDelta1 - EPS_ANG_SMALL || ! bAng1)) vAng1 = vAng2 ; @@ -1605,7 +1605,7 @@ Operation::AdjustOneStartMovement( int nClPathId, int nPrevClPathId, const DBLVE // altrimenti else { // se Z pressochè uguali non devo fare alcunché - if ( fabs( vAxCurr[2] - vAxPrev[2]) <= 100 * EPS_SMALL) + if ( abs( vAxCurr[2] - vAxPrev[2]) <= 100 * EPS_SMALL) return true ; // se Z corrente maggiore della precedente else if ( vAxCurr[2] > vAxPrev[2]) { diff --git a/Pocketing.cpp b/Pocketing.cpp index 28549e7..d4f7cc6 100644 --- a/Pocketing.cpp +++ b/Pocketing.cpp @@ -1158,7 +1158,7 @@ Pocketing::Chain( int nGrpDestId) if ( pCrv->GetExtrusion( vtTemp)) { vtExtr = vtTemp ; double dTemp ; - if ( pCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // la aggiungo alla curva composta diff --git a/Sawing.cpp b/Sawing.cpp index 15442c2..cf96970 100644 --- a/Sawing.cpp +++ b/Sawing.cpp @@ -1070,7 +1070,7 @@ Sawing::Chain( int nGrpDestId) if ( pCrv->GetExtrusion( vtTemp)) { vtExtr = vtTemp ; double dTemp ; - if ( pCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // la aggiungo alla curva composta @@ -1239,7 +1239,7 @@ Sawing::ProcessPath( int nPathId, int nPvId, int nClId) } // se lama non centrata e richiesto, eseguo offset - if ( m_Params.m_nWorkSide != SAW_WS_CENTER && fabs( GetOffsL()) > EPS_SMALL) { + if ( m_Params.m_nWorkSide != SAW_WS_CENTER && abs( GetOffsL()) > EPS_SMALL) { double dOffs = ( m_Params.m_nWorkSide == SAW_WS_RIGHT) ? GetOffsL() : - GetOffsL() ; if ( ! pCompo->SimpleOffset( dOffs, ICurve::OFF_EXTEND)) return false ; @@ -3346,7 +3346,7 @@ Sawing::CalculateToolAndCorrVersors( const Vector3d& vtTang, int nHeadSide, int vtCorr = Z_AX ; // Se lama sbandata - if ( fabs( dSideAng) > EPS_ANG_SMALL) { + if ( abs( dSideAng) > EPS_ANG_SMALL) { if ( nWorkSide == SAW_WS_RIGHT) { vtTool.Rotate( vtTang, - dSideAng) ; vtCorr.Rotate( vtTang, - dSideAng) ; @@ -3396,7 +3396,7 @@ Sawing::AdjustIntArcForSide( ICurve* pCurve, double dSideAng) else dOffs = m_TParams.m_dThick ; // correzione per angolo di fianco - if ( fabs( dSideAng) > EPS_ANG_SMALL) + if ( abs( dSideAng) > EPS_ANG_SMALL) dOffs *= cos( dSideAng * DEGTORAD) ; // eseguo offset curva ( nel piano XY globale) return pCurve->SimpleOffset( dOffs) ; diff --git a/SawingData.cpp b/SawingData.cpp index d4435a1..45ad5ca 100644 --- a/SawingData.cpp +++ b/SawingData.cpp @@ -505,7 +505,7 @@ SawingData::VerifySideAngle( double dVal) const { const double MAX_SIDE_ANG = 75.0 + EPS_ANG_SMALL ; const double AUTO_SIDE_ANG = 99 ; - return ( ( dVal > - MAX_SIDE_ANG && dVal < MAX_SIDE_ANG) || fabs( dVal - AUTO_SIDE_ANG) < EPS_ANG_SMALL) ; + return ( ( dVal > - MAX_SIDE_ANG && dVal < MAX_SIDE_ANG) || abs( dVal - AUTO_SIDE_ANG) < EPS_ANG_SMALL) ; } //----------------------------------------------------------------------------