From 1c7d4f87fe7a06b68d590150ef3332174a474ec0 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 28 Jan 2017 08:01:50 +0000
Subject: [PATCH] Include : - aggiornamenti.

---
 EInAPI.h      | 5 +++--
 EMkMachMgr.h  | 5 +++--
 EXeExecutor.h | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/EInAPI.h b/EInAPI.h
index 315644a..4bdadf1 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -537,8 +537,6 @@ EIN_EXPORT int  __stdcall EgtGetMachGroupId( const wchar_t* wsName) ;
 EIN_EXPORT BOOL __stdcall EgtSetCurrMachGroup( int nMGroupId) ;
 EIN_EXPORT BOOL __stdcall EgtResetCurrMachGroup( void) ;
 EIN_EXPORT int  __stdcall EgtGetCurrMachGroup( void) ;
-// Setup
-EIN_EXPORT int  __stdcall EgtGetCurrSetup( void) ;
 // Phases
 EIN_EXPORT int  __stdcall EgtAddPhase( void) ;
 EIN_EXPORT BOOL __stdcall EgtSetCurrPhase( int nPhase, BOOL bForced) ;
@@ -610,6 +608,9 @@ EIN_EXPORT BOOL __stdcall EgtTdbReload( void) ;
 EIN_EXPORT BOOL __stdcall EgtTdbSave( void) ;
 EIN_EXPORT BOOL __stdcall EgtTdbGetToolDir( wchar_t*& wsToolDir) ;
 EIN_EXPORT BOOL __stdcall EgtTdbGetToolHolderDir( wchar_t*& wsTHolderDir) ;
+// Setup
+EIN_EXPORT int  __stdcall EgtGetCurrSetup( void) ;
+EIN_EXPORT BOOL __stdcall EgtImportSetup( const wchar_t* wsName) ;
 // Machinings DataBase
 EIN_EXPORT BOOL __stdcall EgtMdbGetMachiningNewName( const wchar_t* wsName, wchar_t*& wsNewName) ;
 EIN_EXPORT BOOL __stdcall EgtMdbAddMachining( const wchar_t* wsName, int nType) ;
diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index 0016461..bb6c2d9 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -50,8 +50,6 @@ class __declspec( novtable) IMachMgr
       virtual bool SetCurrMachGroup( int nId) = 0 ;
       virtual bool ResetCurrMachGroup( void) = 0 ;
       virtual int  GetCurrMachGroup( void) const = 0 ;
-     // Setup
-      virtual int  GetCurrSetup( void) const = 0 ;
      // Phases
       virtual int  AddPhase( void) = 0 ;
       virtual bool SetCurrPhase( int nPhase, bool bForced = false) = 0 ;
@@ -125,6 +123,9 @@ class __declspec( novtable) IMachMgr
       virtual bool TdbSave( void) const = 0 ;
       virtual bool TdbGetToolDir( std::string& sToolDir) const = 0 ;
       virtual bool TdbGetToolHolderDir( std::string& sTHolderDir) const = 0 ;
+     // Setup
+      virtual int  GetCurrSetup( void) const = 0 ;
+      virtual bool ImportSetup( const std::string& sName) = 0 ;
      // Machinings DataBase
       virtual bool MdbGetMachiningNewName( std::string& sName) const = 0 ;
       virtual bool MdbAddMachining( const std::string& sName, int nType) = 0 ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index cc97c12..6cb6b45 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -584,8 +584,6 @@ EXE_EXPORT int  ExeGetMachGroupId( const std::string& sName) ;
 EXE_EXPORT bool ExeSetCurrMachGroup( int nMGroupId) ;
 EXE_EXPORT bool ExeResetCurrMachGroup( void) ;
 EXE_EXPORT int  ExeGetCurrMachGroup( void) ;
-// Setup
-EXE_EXPORT int  ExeGetCurrSetup( void) ;
 // Phases
 EXE_EXPORT int  ExeAddPhase( void) ;
 EXE_EXPORT bool ExeSetCurrPhase( int nPhase, bool bForced) ;
@@ -659,6 +657,9 @@ EXE_EXPORT bool ExeTdbReload( void) ;
 EXE_EXPORT bool ExeTdbSave( void) ;
 EXE_EXPORT bool ExeTdbGetToolDir( std::string& sToolDir) ;
 EXE_EXPORT bool ExeTdbGetToolHolderDir( std::string& sTHolderDir) ;
+// Setup
+EXE_EXPORT int  ExeGetCurrSetup( void) ;
+EXE_EXPORT bool ExeImportSetup( const std::string& sName) ;
 // Machinings Database
 EXE_EXPORT bool ExeMdbGetMachiningNewName( std::string& sName) ;
 EXE_EXPORT bool ExeMdbAddMachining( const std::string& sName, int nType) ;