diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 3bcd68e..5d70b5b 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -352,6 +352,12 @@ enum { MORTISE_FU_NONE = 0, MORTISE_FU_PARAL_BACK = 4, MORTISE_FU_PARAL_LEFT = 5, MORTISE_FU_PARAL_RIGHT = 6} ; +// Tipo di affondamento (plunge) +enum { MORTISE_PLUNGE_STEP = 0, + MORTISE_PLUNGE_START = 1, + MORTISE_PLUNGE_END = 2, + MORTISE_PLUNGE_START_END = 3, + MORTISE_PLUNGE_START_TO_END = 4} ; //---------------------------------------------------------------------------- // Parametri per finitura superfici diff --git a/EgtNumUtils.h b/EgtNumUtils.h index ab5ec75..7b229d5 100644 --- a/EgtNumUtils.h +++ b/EgtNumUtils.h @@ -17,14 +17,14 @@ inline int Clamp( int nVal, int nMin, int nMax) { - return ( nVal <= nMin ? nMin : nVal >= nMax ? nMax : nVal) ; + return ( nVal < nMin ? nMin : nMax < nVal ? nMax : nVal) ; } //---------------------------------------------------------------------------- inline double Clamp( double dVal, double dMin, double dMax) { - return ( dVal <= dMin ? dMin : dVal >= dMax ? dMax : dVal) ; + return ( dVal < dMin ? dMin : dMax < dVal ? dMax : dVal) ; } //----------------------------------------------------------------------------