From cd1e810cf1abb439d512ac99cdf51b0ede9feec8 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 17 Oct 2016 07:57:36 +0000
Subject: [PATCH] EgtExecutor 1.6v3 : - aggiunta KeepFixture ed estesa
 KeepRawPart.

---
 EXE_MachMgr.cpp |  27 ++++++++++++++++++++++++---
 EgtExecutor.rc  | Bin 11694 -> 11694 bytes
 LUA_MachMgr.cpp |  24 ++++++++++++++++++++++--
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index b533ff8..0516196 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -455,16 +455,17 @@ ExeModifyRawPartHeight( int nRawId, double dHeight)
 
 //-----------------------------------------------------------------------------
 bool
-ExeKeepRawPart( int nRawId)
+ExeKeepRawPart( int nRawId, int nSouPhase)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
    VERIFY_CTX_MACHMGR( pGseCtx, false)
   // confermo il grezzo nella fase corrente della macchinata corrente
-   bool bOk = pGseCtx->m_pMachMgr->KeepRawPart( nRawId) ;
+   bool bOk = pGseCtx->m_pMachMgr->KeepRawPart( nRawId, nSouPhase) ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtKeepRawPart(" + ToString( nRawId) + ")" +
+      string sLua = "EgtKeepRawPart(" + ToString( nRawId) + "," +
+                                        ToString( nSouPhase) + ")" +
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
@@ -829,6 +830,26 @@ ExeAddFixture( const string& sName, const Point3d& ptPos, double dAngRotDeg, dou
    return nId ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeKeepFixture( int nFxtId, int nSouPhase)
+{
+   GseContext* pGseCtx = GetCurrGseContext() ;
+   VERIFY_CTX_MACHMGR( pGseCtx, false)
+  // confermo il bloccaggio nella fase corrente della macchinata corrente
+   bool bOk = pGseCtx->m_pMachMgr->KeepFixture( nFxtId, nSouPhase) ;
+   ExeSetModified() ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtKeepFixture(" + ToString( nFxtId) + "," +
+                                        ToString( nSouPhase) + ")" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
+  // restituisco il risultato
+   return bOk ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeRemoveFixture( int nFxtId)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 63c894cb57a55c7cc7736309a7bcc1615d8bcdea..ae4e3842e807a9846de88cf2b0935a6eadc6e4ea 100644
GIT binary patch
delta 97
zcmZ1%y)JsgA2vqg%@@V4Gflq2na5~6Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0GM?jL;wH)

delta 97
zcmZ1%y)JsgA2vp#%@@V4Gflq2na5}}Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0G96`JOBUy

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 4c654d1..4d9a0ab 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -453,12 +453,14 @@ LuaModifyRawPartHeight( lua_State* L)
 static int
 LuaKeepRawPart( lua_State* L)
 {
-  // 1 parametro : nRawId
+  // 1 o 2 parametri : nRawId [, nSouPhase]
    int nRawId ;
    LuaCheckParam( L, 1, nRawId)
+   int nSouPhase = 0 ;
+   LuaGetParam( L, 2, nSouPhase) ;
    LuaClearStack( L) ;
   // confermo il grezzo nella fase corrente della macchinata corrente
-   bool bOk = ExeKeepRawPart( nRawId) ;
+   bool bOk = ExeKeepRawPart( nRawId, nSouPhase) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -840,6 +842,23 @@ LuaAddFixture( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaKeepFixture( lua_State* L)
+{
+  // 1 o 2 parametri : nFxtId [, nSouPhase]
+   int nFxtId ;
+   LuaCheckParam( L, 1, nFxtId)
+   int nSouPhase = 0 ;
+   LuaGetParam( L, 2, nSouPhase) ;
+   LuaClearStack( L) ;
+  // confermo il bloccaggio nella fase corrente della macchinata corrente
+   bool bOk = ExeKeepFixture( nFxtId, nSouPhase) ;
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaRemoveFixture( lua_State* L)
@@ -2799,6 +2818,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableRef", LuaGetTableRef) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableArea", LuaGetTableArea) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddFixture", LuaAddFixture) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtKeepFixture", LuaKeepFixture) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveFixture", LuaRemoveFixture) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetFirstFixture", LuaGetFirstFixture) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetNextFixture", LuaGetNextFixture) ;