diff --git a/ENsAutoNester.h b/ENsAutoNester.h index 96db9f8..b3de88b 100644 --- a/ENsAutoNester.h +++ b/ENsAutoNester.h @@ -44,7 +44,7 @@ class __declspec( novtable) IAutoNester 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, int nCount) = 0 ; + virtual bool AddPart( int nPartId, const PolyArc& Outline, bool bCanFlip, bool bCanRotate, 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 c99d106..6c6cb39 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -676,14 +676,14 @@ EXE_EXPORT bool ExeVerifyMachining( int nMchId, int& nResult) ; EXE_EXPORT int ExeVerifyCutAsSplitting( int nMchId) ; // AutoNesting EXE_EXPORT bool ExeAutoNestStart( void) ; -EXE_EXPORT bool ExeAutoNestAddSheet( int nSheetId, int nOutlineId, int nPriority, int nCount) ; -EXE_EXPORT bool ExeAutoNestAddPart( int nPartId, int nOutlineId, int nCount) ; +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 ExeAutoNestSetInterpartGap( double dGap) ; EXE_EXPORT bool ExeAutoNestCompute( int nMaxTime) ; EXE_EXPORT bool ExeAutoNestCancelComputation( void) ; EXE_EXPORT bool ExeAutoNestGetComputationStatus( int& nStatus) ; EXE_EXPORT bool ExeAutoNestPrintResults( const std::string& sHtmlFile) ; -EXE_EXPORT bool ExeAutoNestGetResults( int& nNestedParts, int& nTotParts, int& nTotSheets, int& nDiffSheets, double& dTotFillRatio) ; +EXE_EXPORT bool ExeAutoNestGetResults( int& nNestedParts, int& nParts, int& nSheets, int& nNestings, double& dTotFillRatio) ; EXE_EXPORT bool ExeAutoNestGetOneResult( int nInd, int& nType, int& nId, int& nFlag, double& dX, double& dY, double& dAngRot) ; // Collision Avoidance Tool SurfaceTriMesh