diff --git a/ENsAutoNester.h b/ENsAutoNester.h index b3de88b..dc4717e 100644 --- a/ENsAutoNester.h +++ b/ENsAutoNester.h @@ -43,8 +43,9 @@ class __declspec( novtable) IAutoNester public : virtual ~IAutoNester( void) {} virtual bool Start( void) = 0 ; - virtual bool AddSheet( int nSheetId, const PolyArc& Outline, int nPriority, int nCount) = 0 ; - virtual bool AddPart( int nPartId, const PolyArc& Outline, bool bCanFlip, bool bCanRotate, int nPriority, int nCount) = 0 ; + virtual bool AddSheet( int nSheetId, const PolyArc& Outline, double dKerf, int nPriority, int nCount) = 0 ; + virtual bool AddPart( int nPartId, const PolyArc& Outline, const PolyArc& ToolOutline, + bool bCanFlip, bool bCanRotate, double dRotStep, int nPriority, int nCount) = 0 ; virtual bool SetInterpartGap( double dGap) = 0 ; virtual bool Compute( int nMaxTime) = 0 ; virtual bool CancelComputation( void) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 6c6cb39..77a931d 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -677,7 +677,8 @@ EXE_EXPORT int ExeVerifyCutAsSplitting( int nMchId) ; // AutoNesting EXE_EXPORT bool ExeAutoNestStart( void) ; EXE_EXPORT bool ExeAutoNestAddSheet( int nSheetId, int nOutlineId, double dKerf, int nPriority, int nCount) ; -EXE_EXPORT bool ExeAutoNestAddPart( int nPartId, int nOutlineId, bool bCanFlip, bool bCanRotate, int nPriority, int nCount) ; +EXE_EXPORT bool ExeAutoNestAddPart( int nPartId, int nOutlineId, int nToolOutlineId, + bool bCanFlip, bool bCanRotate, double dRotStep, int nPriority, int nCount) ; EXE_EXPORT bool ExeAutoNestSetInterpartGap( double dGap) ; EXE_EXPORT bool ExeAutoNestCompute( int nMaxTime) ; EXE_EXPORT bool ExeAutoNestCancelComputation( void) ;