From cad02e7fa25e4883d708a41eec74db946b156dc8 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 17 Jun 2017 17:08:53 +0000 Subject: [PATCH] EgtExecutor : - aggiunta Exe e Lua SpecialUpdateDisposition. --- EXE_MachMgr.cpp | 10 ++++++++++ LUA_MachMgr.cpp | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 0998626..28dcd7a 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -1940,6 +1940,16 @@ ExeSpecialApplyDisposition( int nId, bool bRecalc) return pMachMgr->DispositionSpecialApply( nId, bRecalc) ; } +//----------------------------------------------------------------------------- +bool +ExeSpecialUpdateDisposition( int nId) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // aggiorno assi macchina e collegamento con precedente della disposizione indicata + return pMachMgr->DispositionSpecialUpdate( nId) ; +} + //----------------------------------------------------------------------------- // Lavorazioni //----------------------------------------------------------------------------- diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index a87fa36..5c200f7 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -2153,6 +2153,21 @@ LuaSpecialApplyDisposition( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaSpecialUpdateDisposition( lua_State* L) +{ + // 1 parametro : nId + int nId ; + LuaCheckParam( L, 1, nId) + LuaClearStack( L) ; + // aggiorno assi macchina e collegamento con precedente della disposizione indicata + bool bOk = ExeSpecialUpdateDisposition( nId) ; + // restituisco il risultato + LuaSetParam( L, bOk) ; + return 1 ; +} + //------------------------------------------------------------------------------- // Machinings //------------------------------------------------------------------------------- @@ -3366,6 +3381,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) // Dispositions bOk = bOk && luaMgr.RegisterFunction( "EgtGetPhaseDisposition", LuaGetPhaseDisposition) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSpecialApplyDisposition", LuaSpecialApplyDisposition) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtSpecialUpdateDisposition", LuaSpecialUpdateDisposition) ; // Machinings bOk = bOk && luaMgr.RegisterFunction( "EgtAddMachining", LuaAddMachining) ; bOk = bOk && luaMgr.RegisterFunction( "EgtCreateMachining", LuaCreateMachining) ;