diff --git a/EGkCurveAux.h b/EGkCurveAux.h index d1136b5..6656e5e 100644 --- a/EGkCurveAux.h +++ b/EGkCurveAux.h @@ -152,6 +152,17 @@ EGK_EXPORT bool CalcCurveLimitOffset( const ICurve& crvC, double& dOffs) ; //! Calcola, se possibile, le curve di offset del valore richiesto come curve singole EGK_EXPORT bool CalcCurveSingleCurvesOffset( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, double dOffs) ; +//---------------------------------------------------------------------------- +//! Calcola, se possibile, le curve di offset dato un vettore di curve aperte/chiuse +EGK_EXPORT bool CalcOffsetCurves( const ICURVEPVECTOR& vpCrvs, ICURVEPOVECTOR& vCrvs, double dOffs, + int nType = ICurve::OFF_FILLET) ; + +//---------------------------------------------------------------------------- +//! Calcola, se possibile, le fat curve di offset dato un vettore di curve aperte/chiuse +EGK_EXPORT bool CalcFatOffsetCurves( const ICURVEPVECTOR& vpCrvs, ICURVEPOVECTOR& vCrvs, double dOffs, + bool bSquareEnds, bool bSquareMids, + bool bMergeOnlySameProps = true) ; + //---------------------------------------------------------------------------- //! Resetta l'oggetto voronoi associato alla curva liberandone la memoria EGK_EXPORT void ResetCurveVoronoi( const ICurve& crvC) ; \ No newline at end of file diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 8e4196f..6e484e5 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -397,7 +397,8 @@ enum { SURFFIN_SUB_ZIGZAG = 0, SURFFIN_SUB_SPIRALOUT = 3, SURFFIN_SUB_Z_CONST = 4, SURFFIN_SUB_OPTIMAL = 5, - SURFFIN_SUB_PROJECT = 6} ; + SURFFIN_SUB_PROJECT = 6, + SURFFIN_SUB_PENCIL = 7} ; // Tipo di attacco enum { SURFFIN_LI_NONE = 0, SURFFIN_LI_LINEAR = 1,