From be6ea01c003ddeff222abf96f0d5ab4eab03a4c2 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Tue, 4 Jan 2022 08:06:42 +0100
Subject: [PATCH] =?UTF-8?q?EgtExecutor=202.4a1=20:=20-=20ExeGetRawPartFrom?=
 =?UTF-8?q?Part=20non=20imposta=20pi=C3=B9=20progetto=20modificato=20(non?=
 =?UTF-8?q?=20lo=20modifica)=20-=20ExeGetCalcTool=20ora=20restituisce=20ut?=
 =?UTF-8?q?ensile,=20testa=20e=20uscita.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EXE_MachMgr.cpp |  47 ++++++++++-------------------------------------
 EgtExecutor.rc  | Bin 16184 -> 16176 bytes
 LUA_MachMgr.cpp |   2 +-
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index b0c96b0..3275b76 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -822,13 +822,6 @@ ExeGetRawPartFromPart( int nPartId)
    VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
   // cerco il grezzo della fase corrente della macchinata corrente cui appartiene il pezzo
    int nRawId = pMachMgr->GetRawPartFromPart( nPartId) ;
-   ExeSetModified() ;
-  // se richiesto, salvo il comando Lua equivalente
-   if ( IsCmdLog()) {
-      string sLua = "EgtGetRawPartFromPart(" + ToString( nPartId) + ")" +
-                    " -- Id=" + ToString( nRawId) ;
-      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
-   }
   // restituisco il risultato
    return nRawId ;
 }
@@ -3148,6 +3141,16 @@ ExeSetRotAxisBlock( const string& sAxis, double dVal)
    return pMachMgr->SetRotAxisBlock( sAxis, dVal) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetCalcTool( string& sTool, string& sHead, int& nExit)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // restituisco l'utensile, la testa e l'uscita correnti per il calcolo sulla macchina della macchinata corrente
+   return ( pMachMgr->GetCalcTool( sTool)  &&  pMachMgr->GetCalcHead( sHead)  &&  pMachMgr->GetCalcExit( nExit)) ;
+}
+
 //----------------------------------------------------------------------------
 bool
 ExeGetRotAxisBlocked( int nInd, string& sAxis, double& dVal)
@@ -3158,36 +3161,6 @@ ExeGetRotAxisBlocked( int nInd, string& sAxis, double& dVal)
    return pMachMgr->GetRotAxisBlocked( nInd, sAxis, dVal) ;
 }
 
-//-----------------------------------------------------------------------------
-bool
-ExeGetCalcTool( string& sTool)
-{
-   IMachMgr* pMachMgr = GetCurrMachMgr() ;
-   VERIFY_MACHMGR( pMachMgr, false)
-  // restituisco il nome dell'utensile corrente per il calcolo sulla macchina della macchinata corrente
-   return pMachMgr->GetCalcTool( sTool) ;
-}
-
-//-----------------------------------------------------------------------------
-bool
-ExeGetCalcHead( string& sHead)
-{
-   IMachMgr* pMachMgr = GetCurrMachMgr() ;
-   VERIFY_MACHMGR( pMachMgr, false)
-  // restituisco il nome della testa corrente per il calcolo sulla macchina della macchinata corrente
-   return pMachMgr->GetCalcHead( sHead) ;
-}
-
-//-----------------------------------------------------------------------------
-bool
-ExeGetCalcExit( int& nExit)
-{
-   IMachMgr* pMachMgr = GetCurrMachMgr() ;
-   VERIFY_MACHMGR( pMachMgr, false)
-  // restituisco il numero dell'uscita corrente per il calcolo sulla macchina della macchinata corrente
-   return pMachMgr->GetCalcExit( nExit) ;
-}
-
 //-----------------------------------------------------------------------------
 bool
 ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 7d59b2a2e220c2383d4df67f179f6d7c30be12a1..3a60cb46429cc4b609357c12f8211acaaa68d5fb 100644
GIT binary patch
delta 419
zcmdl{x1nysCpJzK1|0@N5T1NdOq0=M^KUU(CiZfMM1~@U)XDOaos+L{X0e(8`G%7N
zxpgNOaP5*bVo+d6VyFa?t_<lwnH&a$dh5k?+>DGSK(*qN{Zw9TuH#K%#BT?`V(a7s
zg2;9lC~d-T$K*P0yU7cL4<YQCT*n(U`2j1(<~^cZ1niTS{7i~}fOa`do+Nz$#jdE$
aYh(%8!>{-r$sXeTRH6*^(`G-FS5g4xsckm^

delta 419
zcmdl`x1(;uCpK<l1|0@N1|uM8Joz`9CZq9YRd!h>_7H|thGd3}$&TFClUq1<uo^Su
z02MfLJ(o0OP+&-6s05O(4CxGsKyj$r%|Nw`jK-5Ma)?jv5E0tkA)>*!`5dnhBXM@v
zP2M0_2Dc}9a-UEQZo7c)s+>GW_z;S9R!qd$6e3BSZv>?=eKSv%c;7TAlIEKnWn|w(
IsN9eO0M09ArvLx|

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 3e07f70..ba53b76 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -3323,7 +3323,7 @@ LuaGetCalcTool( lua_State* L)
    string sTool ;
    string sHead ;
    int nExit ;
-   bool bOk = ExeGetCalcTool( sTool) && ExeGetCalcHead( sHead) && ExeGetCalcExit( nExit) ;
+   bool bOk = ExeGetCalcTool( sTool, sHead, nExit) ;
   // restituisco il risultato
    if ( bOk) {
       LuaSetParam( L, sTool) ;