diff --git a/EXE_GdbCreateCurve.cpp b/EXE_GdbCreateCurve.cpp index 0ed482c..0221ab9 100644 --- a/EXE_GdbCreateCurve.cpp +++ b/EXE_GdbCreateCurve.cpp @@ -1295,13 +1295,13 @@ ExeCreateCurveFillet( int nParentId, int nCrv1, const Point3d& ptNear1, if ( dTrim1 > EPS_ZERO) pCrv1->TrimStartAtParam( dTrim1) ; else if ( dTrim1 < - EPS_ZERO) - pCrv1->TrimEndAtParam( fabs( dTrim1)) ; + pCrv1->TrimEndAtParam( abs( dTrim1)) ; // recupero e aggiusto la seconda curva ICurve* pCrv2 = GetCurve( pGeomDB->GetGeoObj( nCrv2)) ; if ( dTrim2 > EPS_ZERO) pCrv2->TrimStartAtParam( dTrim2) ; else if ( dTrim2 < - EPS_ZERO) - pCrv2->TrimEndAtParam( fabs( dTrim2)) ; + pCrv2->TrimEndAtParam( abs( dTrim2)) ; } ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente @@ -1359,13 +1359,13 @@ ExeCreateCurveChamfer( int nParentId, int nCrv1, const Point3d& ptNear1, if ( dTrim1 > EPS_ZERO) pCrv1->TrimStartAtParam( dTrim1) ; else if ( dTrim1 < - EPS_ZERO) - pCrv1->TrimEndAtParam( fabs( dTrim1)) ; + pCrv1->TrimEndAtParam( abs( dTrim1)) ; // recupero e aggiusto la seconda curva ICurve* pCrv2 = GetCurve( pGeomDB->GetGeoObj( nCrv2)) ; if ( dTrim2 > EPS_ZERO) pCrv2->TrimStartAtParam( dTrim2) ; else if ( dTrim2 < - EPS_ZERO) - pCrv2->TrimEndAtParam( fabs( dTrim2)) ; + pCrv2->TrimEndAtParam( abs( dTrim2)) ; } ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente @@ -1581,7 +1581,7 @@ MyCreateCurveCompo( int nParentId, const INTVECTOR& vIds, bool bErase) if ( pCopCrv->GetExtrusion( vtTemp)) { vtExtr = vtTemp ; double dTemp ; - if ( pCopCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCopCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // aggiungo alla composita @@ -1707,7 +1707,7 @@ MyCreateCurveCompoByChain( int nParentId, const INTVECTOR& vIds, if ( vtExtr.IsSmall()) vtExtr = vtTemp ; double dTemp ; - if ( pCopCrv->GetThickness( dTemp) && fabs( dTemp) > fabs( dThick)) + if ( pCopCrv->GetThickness( dTemp) && abs( dTemp) > abs( dThick)) dThick = dTemp ; } // la aggiungo alla curva composta diff --git a/EXE_GdbCreateSurf.cpp b/EXE_GdbCreateSurf.cpp index 15c071b..2987f80 100644 --- a/EXE_GdbCreateSurf.cpp +++ b/EXE_GdbCreateSurf.cpp @@ -59,7 +59,7 @@ ExeCreateSurfFrRectangle( int nParentId, const Point3d& ptIni, const Point3d& pt double dWidth = ptCrossI.x ; double dLen = ptCrossI.y ; // creo il rettangolo nel suo riferimento intrinseco - PtrOwner pSfr( GetSurfFlatRegionRectangle( fabs( dWidth), dLen)) ; + PtrOwner pSfr( GetSurfFlatRegionRectangle( abs( dWidth), dLen)) ; bOk = bOk && ! IsNull( pSfr) ; // eventuale traslazione per larghezza negativa if ( bOk && dWidth < 0) @@ -109,7 +109,7 @@ ExeCreateSurfFrRectangle3P( int nParentId, const Point3d& ptIni, double dWidth = ptCrossI.x ; double dLen = ptCrossI.y ; // creo il rettangolo nel suo riferimento intrinseco - PtrOwner pSfr( GetSurfFlatRegionRectangle( fabs( dWidth), dLen)) ; + PtrOwner pSfr( GetSurfFlatRegionRectangle( abs( dWidth), dLen)) ; bOk = bOk && ! IsNull( pSfr) ; // eventuale traslazione per larghezza negativa if ( bOk && dWidth < 0) @@ -159,7 +159,7 @@ ExeCreateSurfFrStadium( int nParentId, const Point3d& ptIni, const Point3d& ptCr double dWidth = ptCrossI.x ; double dLen = ptCrossI.y ; // creo lo stadium nel suo riferimento intrinseco - PtrOwner pSfr( GetSurfFlatRegionStadium( fabs( dWidth), dLen)) ; + PtrOwner pSfr( GetSurfFlatRegionStadium( abs( dWidth), dLen)) ; bOk = bOk && ! IsNull( pSfr) ; // eventuale traslazione per larghezza negativa if ( bOk && dWidth < 0) @@ -655,7 +655,7 @@ ExeCreateSurfTmBox( int nParentId, const Point3d& ptIni, const Point3d& ptCross, double dWidth = ptCrossI.x ; double dLen = ptCrossI.y ; // creo il box nel suo riferimento intrinseco - PtrOwner pSTM( GetSurfTriMeshBox( fabs( dWidth), dLen, dHeight)) ; + PtrOwner pSTM( GetSurfTriMeshBox( abs( dWidth), dLen, dHeight)) ; bOk = bOk && ! IsNull( pSTM) ; // eventuale traslazione per larghezza negativa if ( bOk && dWidth < 0) @@ -712,7 +712,7 @@ ExeCreateSurfTmPyramid( int nParentId, const Point3d& ptIni, const Point3d& ptCr double dWidth = ptCrossI.x ; double dLen = ptCrossI.y ; // creo la piramide nel suo riferimento intrinseco - PtrOwner pSTM( GetSurfTriMeshPyramid( fabs( dWidth), dLen, dHeight)) ; + PtrOwner pSTM( GetSurfTriMeshPyramid( abs( dWidth), dLen, dHeight)) ; bOk = bOk && ! IsNull( pSTM) ; // eventuale traslazione per larghezza negativa if ( bOk && dWidth < 0) diff --git a/EXE_NstBoxNesting.cpp b/EXE_NstBoxNesting.cpp index 8309c2b..04b7211 100644 --- a/EXE_NstBoxNesting.cpp +++ b/EXE_NstBoxNesting.cpp @@ -121,7 +121,7 @@ ExePackBox( int nId, double dXmin, double dYmin, double dXmax, double dYmax, dou sort( vY.begin(), vY.end(), greater()) ; } // Elimino i valori coincidenti - vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return fabs( a - b) < EPS_SMALL ;}), vY.end()) ; + vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return abs( a - b) < EPS_SMALL ;}), vY.end()) ; // Testo le Y in ordine opportuno bool bFound = false ; double dXok = INFINITO, dYok = INFINITO ; @@ -232,7 +232,7 @@ ExePackBoxCluster( const INTVECTOR& vIds, double dXmin, double dYmin, double dXm sort( vY.begin(), vY.end(), greater()) ; } // Elimino i valori coincidenti - vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return fabs( a - b) < EPS_SMALL ;}), vY.end()) ; + vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return abs( a - b) < EPS_SMALL ;}), vY.end()) ; // Testo le Y in ordine opportuno bool bFound = false ; double dXok = INFINITO, dYok = INFINITO ; @@ -446,7 +446,7 @@ ExeMoveBoxCluster( const INTVECTOR& vIds, Vector3d& vtMove, nId2 = ( bInRoot ? ExeGetNextPart( nId2, true) : ExeGetNextGroup( nId2)) ; } // Ordino questi box in senso contrario al movimento - if ( fabs( vtMoveXY.x) >= fabs( vtMoveXY.y)) { + if ( abs( vtMoveXY.x) >= abs( vtMoveXY.y)) { if ( vtMoveXY.x > 0) // movimento prevalente in X+ -> ordine secondo X decrescente sort( vBox.begin(), vBox.end(), []( const BBox3d& a, const BBox3d& b) diff --git a/EXE_NstCreateFlatParts.cpp b/EXE_NstCreateFlatParts.cpp index 3046363..5e118ac 100644 --- a/EXE_NstCreateFlatParts.cpp +++ b/EXE_NstCreateFlatParts.cpp @@ -234,7 +234,7 @@ CreateFlatPartsByRegions( int nLay) else { double dArea ; pCrv->GetAreaXY( dArea) ; - if ( fabs( dArea) > 1) { + if ( abs( dArea) > 1) { if ( dArea < 0) { pCrv->Invert() ; dArea = - dArea ; @@ -248,7 +248,7 @@ CreateFlatPartsByRegions( int nLay) } // ordino le aree in senso decrescente sort( vArea.begin(), vArea.end(), - []( const INTDBL& a, const INTDBL&b) { return fabs( a.second) > fabs( b.second) ; }) ; + []( const INTDBL& a, const INTDBL&b) { return abs( a.second) > abs( b.second) ; }) ; // creo i pezzi a partire dalle curve chiuse più grandi e dalle curve che vi sono contenute for ( int i = 0 ; i < int( vArea.size()) ; ++ i) { if ( vArea[i].first == GDB_ID_NULL) diff --git a/EXE_NstPartNesting.cpp b/EXE_NstPartNesting.cpp index 66febe6..230cc18 100644 --- a/EXE_NstPartNesting.cpp +++ b/EXE_NstPartNesting.cpp @@ -1659,7 +1659,7 @@ MyRotatePartCluster( IGeomDB* pGeomDB, const INTVECTOR& vTrueIds, BBox3d& b3Clus // Se movimento risultante nullo, non faccio alcunché dRotAngDeg = dAng ; - if ( fabs( dAng) < EPS_ANG_SMALL) + if ( abs( dAng) < EPS_ANG_SMALL) return true ; // Eseguo rotazione dei pezzi del cluster @@ -1753,7 +1753,7 @@ ExeAlignPartClusterOnCollision( const INTVECTOR& vIds, bool bReducedCut, bool& b double dU ; if ( ! pCrv->GetParamAtPoint( ptCntL, dU, 10 * EPS_SMALL)) return false ; - if ( fabs( dU - round( dU)) < 100 * EPS_PARAM) + if ( abs( dU - round( dU)) < 100 * EPS_PARAM) dU = round( dU) ; Point3d ptPp ; Vector3d vtTp ; @@ -1780,7 +1780,7 @@ ExeAlignPartClusterOnCollision( const INTVECTOR& vIds, bool bReducedCut, bool& b Point3d ptCen = s_scInfo.ptP1 ; if ( ! ExeRotatePartCluster( vIds, bReducedCut, ptCen, dRotAngDeg)) return false ; - bMoved = ( fabs( dRotAngDeg) > 100.0 * EPS_ANG_ZERO) ; + bMoved = ( abs( dRotAngDeg) > 100.0 * EPS_ANG_ZERO) ; return true ; } diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 1f2f60a..469e9c0 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_GeoSnap.cpp b/LUA_GeoSnap.cpp index 8261ab3..f470135 100644 --- a/LUA_GeoSnap.cpp +++ b/LUA_GeoSnap.cpp @@ -439,7 +439,7 @@ LuaExtrusionByThickness( lua_State* L) Vector3d vtExtr ; double dThick ; if ( ExeCurveExtrusion( nId, nRefId, vtExtr) && ! vtExtr.IsSmall() && - ExeCurveThickness( nId, &dThick) && fabs( dThick) > EPS_SMALL) + ExeCurveThickness( nId, &dThick) && abs( dThick) > EPS_SMALL) vtExtr *= dThick ; else vtExtr = V_NULL ;