From 240cb796340ea27f06a953a1009b4acdaf1868ed Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 4 Dec 2019 19:49:46 +0000
Subject: [PATCH] Include : - aggiornamento prototipi.

---
 EInAPI.h        | 1 +
 ENsAutoNester.h | 2 +-
 EXeExecutor.h   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/EInAPI.h b/EInAPI.h
index 1f9b051..4e51297 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -577,6 +577,7 @@ EIN_EXPORT BOOL __stdcall EgtMoveToSnapPointOnCollision( int nId[], int nCount,
 EIN_EXPORT void __stdcall EgtSaveCollInfo( void) ;
 EIN_EXPORT void __stdcall EgtRestoreCollInfo( void) ;
 EIN_EXPORT BOOL __stdcall EgtGetPartClusterCenterGlob( int nId[], int nCount, double ptCen[3]) ;
+EIN_EXPORT BOOL __stdcall EgtAutomaticPackParts( int nId[], int nCount, BOOL bMinimizeOnXvsY, BOOL bReducedCut, int nMaxTime) ;
 EIN_EXPORT BOOL __stdcall EgtVerifyMachining( int nMchId, int* pnResult) ;
 EIN_EXPORT int  __stdcall EgtVerifyCutAsSplitting( int nMchId) ;
 
diff --git a/ENsAutoNester.h b/ENsAutoNester.h
index 6da7fca..2aacf86 100644
--- a/ENsAutoNester.h
+++ b/ENsAutoNester.h
@@ -48,7 +48,7 @@ class __declspec( novtable) IAutoNester
       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 Compute( bool bMinimizeOnXvsY, int nMaxTime) = 0 ;
       virtual bool CancelComputation( void) = 0 ;
       virtual bool GetComputationStatus( int& nStatus) = 0 ;
       virtual bool GetResults( double& dTotFillRatio, ANIVECT& vANI) = 0 ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 9fa1eef..34f6fcf 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -671,6 +671,7 @@ EXE_EXPORT bool ExeMoveToSnapPointOnCollision( const INTVECTOR& vIds, bool bRedu
 EXE_EXPORT void ExeSaveCollInfo( void) ;
 EXE_EXPORT void ExeRestoreCollInfo( void) ;
 EXE_EXPORT bool ExeGetPartClusterCenterGlob( const INTVECTOR& vIds, Point3d& ptCen) ;
+EXE_EXPORT bool ExeAutomaticPackParts( INTVECTOR& vIds, bool bMinimizeOnXvsY, bool bReducedCut, int nMaxTime) ;
 // Machining Nest
 EXE_EXPORT bool ExeVerifyMachining( int nMchId, int& nResult) ;
 EXE_EXPORT int  ExeVerifyCutAsSplitting( int nMchId) ;
@@ -681,7 +682,7 @@ 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 ExeAutoNestCompute( bool bMinimizeOnXvsY, int nMaxTime) ;
 EXE_EXPORT bool ExeAutoNestCancelComputation( void) ;
 EXE_EXPORT bool ExeAutoNestGetComputationStatus( int& nStatus) ;
 EXE_EXPORT bool ExeAutoNestPrintResults( const std::string& sHtmlFile) ;