diff --git a/ENsAutoNester.h b/ENsAutoNester.h index 38d89fe..2029ab6 100644 --- a/ENsAutoNester.h +++ b/ENsAutoNester.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2019-2019 +// EgalTech 2019-2020 //---------------------------------------------------------------------------- -// File : ENsAutoNester.h Data : 28.11.19 Versione : 2.1k6 +// File : ENsAutoNester.h Data : 29.01.20 Versione : 2.2a2 // Contenuto : Dichiarazione della interfaccia IAutoNester. // // @@ -46,6 +46,7 @@ class __declspec( novtable) IAutoNester virtual bool AddSheet( int nSheetId, const PolyArc& Outline, double dKerf, int nPriority, int nCount) = 0 ; virtual bool AddDefectToSheet( int nSheetId, const PolyArc& Outline) = 0 ; virtual bool AddPart( int nPartId, const PolyArc& Outline, bool bCanFlip, bool bCanRotate, double dRotStep, int nPriority, int nCount) = 0 ; + virtual bool AddHoleToPart( int nPartId, const PolyArc& Hole) = 0 ; virtual bool AddAnotherOutlineToPart( int nPartId, const PolyArc& AnotherOutline) = 0 ; virtual bool AddToolOutlineToPart( int nPartId, const PolyArc& ToolOutline) = 0 ; virtual bool SetInterpartGap( double dGap) = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index ca1aa38..94145e0 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -692,7 +692,8 @@ EXE_EXPORT bool ExeAutoNestStart( void) ; EXE_EXPORT bool ExeAutoNestAddSheet( int nSheetId, int nOutlineId, double dKerf, int nPriority, int nCount) ; EXE_EXPORT bool ExeAutoNestAddDefectToSheet( int nSheetId, int nDefectId) ; EXE_EXPORT bool ExeAutoNestAddPart( int nPartId, int nOutlineId, bool bCanFlip, bool bCanRotate, double dRotStep, int nPriority, int nCount) ; -EXE_EXPORT bool ExeAddAnotherOutlineToPart( int nPartId, int nAnotherOutlineId) ; +EXE_EXPORT bool ExeAutoNestAddHoleToPart( int nPartId, int nHoleId) ; +EXE_EXPORT bool ExeAutoNestAddAnotherOutlineToPart( int nPartId, int nAnotherOutlineId) ; EXE_EXPORT bool ExeAutoNestAddToolOutlineToPart( int nPartId, int nToolOutlineId) ; EXE_EXPORT bool ExeAutoNestSetInterpartGap( double dGap) ; EXE_EXPORT bool ExeAutoNestCompute( bool bMinimizeOnXvsY, int nMaxTime) ;