From 2cba47d24f519c3f16082eeceea05aa6046412b9 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 3 Dec 2019 20:02:29 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- ENsAutoNester.h | 5 +++-- EXeExecutor.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ENsAutoNester.h b/ENsAutoNester.h index dc4717e..6da7fca 100644 --- a/ENsAutoNester.h +++ b/ENsAutoNester.h @@ -44,8 +44,9 @@ class __declspec( novtable) IAutoNester virtual ~IAutoNester( void) {} virtual bool Start( void) = 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 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 AddToolOutlineToPart( int nPartId, const PolyArc& ToolOutline) = 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 77a931d..9fa1eef 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -677,8 +677,9 @@ 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, int nToolOutlineId, - bool bCanFlip, bool bCanRotate, double dRotStep, 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 ExeAutoNestAddToolOutlineToPart( int nPartId, int nToolOutlineId) ; EXE_EXPORT bool ExeAutoNestSetInterpartGap( double dGap) ; EXE_EXPORT bool ExeAutoNestCompute( int nMaxTime) ; EXE_EXPORT bool ExeAutoNestCancelComputation( void) ;