From e56af02d1a07cb6f23b0b69368f3635942629fb7 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 27 Apr 2020 07:28:31 +0000
Subject: [PATCH] Include : - aggiornamento prototipi.

---
 EMkMachMgr.h  | 5 ++++-
 EXeExecutor.h | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index c70dadc..7dd03ba 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -153,6 +153,7 @@ class __declspec( novtable) IMachMgr
       virtual bool ImportSetup( const std::string& sName) = 0 ;
       virtual bool VerifyCurrSetup( STRVECTOR& vsErrors) = 0 ;
       virtual bool FindToolInCurrSetup( const std::string& sTool) = 0 ;
+      virtual bool GetToolsInCurrSetupPos( const std::string& sTcPos, STRVECTOR& vsTools) = 0 ;
       virtual bool UpdateCurrSetup( void) = 0 ;
       virtual bool EraseCurrSetup( void) = 0 ;
      // Machinings DataBase
@@ -286,6 +287,7 @@ class __declspec( novtable) IMachMgr
       virtual int  GetAxisId( const std::string& sAxis) const = 0 ;
       virtual int  GetHeadId( const std::string& sHead) const = 0 ;
       virtual int  GetHeadExitCount( const std::string& sHead) const = 0 ;
+      virtual int  GetTcPosId( const std::string& sTcPos) const = 0 ;
       virtual bool GetAxisToken( const std::string& sAxis, std::string& sToken) const = 0 ;
       virtual bool GetAxisType( const std::string& sAxis, bool& bLinear) const = 0 ;
       virtual bool GetAxisInvert( const std::string& sAxis, bool& bInvert) const = 0 ;
@@ -294,8 +296,9 @@ class __declspec( novtable) IMachMgr
       virtual bool GetAxisHomePos( const std::string& sAxis, double& dHomeVal) const = 0 ;
       virtual bool ResetAxisPos( const std::string& sAxis) = 0 ;
       virtual bool ResetAllAxesPos( void) = 0 ;
-      virtual bool GetAllHeadsNames( STRVECTOR& vNames) const = 0 ;
       virtual bool GetAllTablesNames( STRVECTOR& vNames) const = 0 ;
+      virtual bool GetAllHeadsNames( STRVECTOR& vNames) const = 0 ;
+      virtual bool GetAllTcPosNames( STRVECTOR& vNames) const = 0 ;
       virtual bool LoadTool( const std::string& sHead, int nExit, const std::string& sTool) = 0 ;
       virtual bool GetLoadedTool( const std::string& sHead, int nExit, std::string& sTool) const = 0 ;
       virtual bool UnloadTool( const std::string& sHead, int nExit) = 0 ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 834d955..ef9959d 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -862,6 +862,7 @@ EXE_EXPORT bool ExeGetDefaultSetupName( std::string& sName) ;
 EXE_EXPORT bool ExeImportSetup( const std::string& sName) ;
 EXE_EXPORT bool ExeVerifyCurrSetup( STRVECTOR& vsErrors) ;
 EXE_EXPORT bool ExeFindToolInCurrSetup( const std::string& sTool) ;
+EXE_EXPORT bool ExeGetToolsInCurrSetupPos( const std::string& sTcPos, STRVECTOR& vsTools) ;
 EXE_EXPORT bool ExeUpdateCurrSetup( void) ;
 EXE_EXPORT bool ExeEraseCurrSetup( void) ;
 // Machinings Database
@@ -977,11 +978,13 @@ EXE_EXPORT int  ExeGetTableId( const std::string& sTable) ;
 EXE_EXPORT int  ExeGetAxisId( const std::string& sAxis) ;
 EXE_EXPORT int  ExeGetHeadId( const std::string& sHead) ;
 EXE_EXPORT int  ExeGetHeadExitCount( const std::string& sHead) ;
+EXE_EXPORT int  ExeGetTcPosId( const std::string& sTcPos) ;
 EXE_EXPORT bool ExeGetAxisToken( const std::string& sAxis, std::string& sToken) ;
 EXE_EXPORT bool ExeGetAxisType( const std::string& sAxis, bool& bLinear) ;
 EXE_EXPORT bool ExeGetAxisInvert( const std::string& sAxis, bool& bInvert) ;
-EXE_EXPORT bool ExeGetAllHeadsNames( STRVECTOR& vNames) ;
 EXE_EXPORT bool ExeGetAllTablesNames( STRVECTOR& vNames) ;
+EXE_EXPORT bool ExeGetAllHeadsNames( STRVECTOR& vNames) ;
+EXE_EXPORT bool ExeGetAllTcPosNames( STRVECTOR& vNames) ;
 // Machine Calc
 EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ;
 EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ;