From 0cd13215a9e6f502370bbc7b09ce5464f13fcbde Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 11 Apr 2017 16:01:48 +0000
Subject: [PATCH] EgtMachKernel 1.8d2 : - in simulazione OnToolSelect ora
 imposta correttamente EMT.TCPOS.

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Generator.cpp    |   3 +--
 Simulator.cpp    |   3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 6c2f5684ec4b302e86d961c985e1e25ec9ca3bf3..b55ab9def2f13f53ebd9ed6b9548ea1a90ef7e9d 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU8!BZvS1

delta 97
zcmewt{V#gMFE&QQ&A-`fnHdcyKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmU3rBY*$^

diff --git a/Generator.cpp b/Generator.cpp
index dd5686f..ee39bcb 100644
--- a/Generator.cpp
+++ b/Generator.cpp
@@ -757,8 +757,7 @@ bool
 Generator::OnToolSelect( const string& sTool, const string& sHead, int nExit, const string& sTcPos)
 {
   // assegno il nome dell'utensile, la testa, l'uscita e l'eventuale posizione nel toolchanger
-   string sOutTool = ( ( sTool.empty() || sTool.front() == '*') ? "" : sTool) ;
-   bool bOk = m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_TOOL, sOutTool) ;
+   bool bOk = m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_TOOL, sTool) ;
    bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_HEAD, sHead) ;
    bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_EXIT, nExit) ;
    bOk = bOk && m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_TCPOS, sTcPos) ;
diff --git a/Simulator.cpp b/Simulator.cpp
index 92ca40d..1631eac 100644
--- a/Simulator.cpp
+++ b/Simulator.cpp
@@ -834,7 +834,8 @@ Simulator::OnToolSelect( const string& sTool, const string& sHead, int nExit, co
   // assegno il nome dell'utensile, la testa e l'uscita
    if ( ! m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_TOOL, sTool)  ||
         ! m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_HEAD, sHead)  ||
-        ! m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_EXIT, nExit))
+        ! m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_EXIT, nExit)  ||
+        ! m_pMachine->LuaSetGlobVar( GLOB_VAR + GVAR_TCPOS, sTcPos))
       return false ;
   // assegno il token e il nome degli assi
    int nNumAxes = int( m_AxesName.size()) ;