From 466f01bc985bc92701817eca9a541bbd2ab0c760 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 24 Nov 2015 22:14:07 +0000
Subject: [PATCH] Include : aggiornamento.

---
 EInAPI.h          |  1 +
 EMkMachMgr.h      |  1 +
 EMkSimuGenConst.h | 11 +++++++++++
 EXeExecutor.h     |  1 +
 4 files changed, 14 insertions(+)

diff --git a/EInAPI.h b/EInAPI.h
index 14d4d37..77e0fc1 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -462,6 +462,7 @@ EIN_EXPORT BOOL __stdcall EgtMoveCluster( int nId[], int nCount, double vtMove[3
 EIN_EXPORT BOOL __stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir) ;
 // Machines
 EIN_EXPORT BOOL __stdcall EgtSetCurrMachine( const wchar_t* wsMachineName) ;
+EIN_EXPORT BOOL __stdcall EgtGetCurrMachineName( wchar_t*& wsMachineName) ;
 // Machining Groups
 EIN_EXPORT int  __stdcall EgtGetMachGroupCount( void) ;
 EIN_EXPORT int  __stdcall EgtGetFirstMachGroup( void) ;
diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index 190b18f..b60e08b 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -36,6 +36,7 @@ class __declspec( novtable) IMachMgr
       virtual bool Insert( int nInsGrp) = 0 ;
      // Machines
       virtual bool SetCurrMachine( const std::string& sMachineName) = 0 ;
+      virtual bool GetCurrMachineName( std::string& sMachineName) const = 0 ;
      // MachGroups
       virtual int  GetMachGroupCount( void) const = 0 ;
       virtual int  GetFirstMachGroup( void) const = 0 ;
diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h
index a485f25..4aaf3c5 100644
--- a/EMkSimuGenConst.h
+++ b/EMkSimuGenConst.h
@@ -13,6 +13,17 @@
 
 #pragma once
 
+//------------------------ Criterio di scelta della soluzione -----------------
+enum SolChoiseCriterion { MCH_SCC_NONE = 0,
+                          MCH_SCC_ADIR_XP = 11,
+                          MCH_SCC_ADIR_XM = 12,
+                          MCH_SCC_ADIR_YP = 13,
+                          MCH_SCC_ADIR_YM = 14,
+                          MCH_SCC_ADIR_ZP = 15,
+                          MCH_SCC_ADIR_ZM = 16,
+                          MCH_SCC_ADIR_NEAR = 21,
+                          MCH_SCC_ADIR_FAR = 22} ;
+
 //------------------------ Stato del movimento di simulazione -----------------
 enum SimuStat { MCH_SIM_OK = 0,
                 MCH_SIM_END = 1,
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 3727bf8..8914c2c 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -470,6 +470,7 @@ EXE_EXPORT bool ExeUpdateMachMgr( void) ;
 EXE_EXPORT bool ExeInsertMachMgr( int nInsGrp) ;
 // Machines
 EXE_EXPORT bool ExeSetCurrMachine( const std::string& sMachineName) ;
+EXE_EXPORT bool ExeGetCurrMachineName( std::string& sMachineName) ;
 // Machining Groups
 EXE_EXPORT int  ExeGetMachGroupCount( void) ;
 EXE_EXPORT int  ExeGetFirstMachGroup( void) ;