diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 588597c..8fc6d5a 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -1165,12 +1165,22 @@ ExeSetMachiningGeometry( const SELVECTOR& vIds) //----------------------------------------------------------------------------- bool -ExeApplyMachining( void) +ExePreviewMachining( bool bRecalc) { GseContext* pGseCtx = GetCurrGseContext() ; VERIFY_CTX_MACHMGR( pGseCtx, false) // imposto la geometria alla lavorazione corrente - return pGseCtx->m_pMachMgr->MachiningApply() ; + return pGseCtx->m_pMachMgr->MachiningPreview( bRecalc) ; +} + +//----------------------------------------------------------------------------- +bool +ExeApplyMachining( bool bRecalc) +{ + GseContext* pGseCtx = GetCurrGseContext() ; + VERIFY_CTX_MACHMGR( pGseCtx, false) + // imposto la geometria alla lavorazione corrente + return pGseCtx->m_pMachMgr->MachiningApply( bRecalc) ; } //----------------------------------------------------------------------------- diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 0a7c70a..3e9339a 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index c196754..9c9f2b4 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -1379,14 +1379,31 @@ LuaSetMachiningGeometry( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaPreviewMachining( lua_State* L) +{ + // 1 o nessun parametro : [bRecalc] + bool bRecalc = false ; + LuaGetParam( L, 1, bRecalc) ; + LuaClearStack( L) ; + // calcolo l'anteprima (se prevista) della lavorazione corrente + bool bOk = ExePreviewMachining( bRecalc) ; + // restituisco il risultato + LuaSetParam( L, bOk) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaApplyMachining( lua_State* L) { - // nessun parametro + // 1 o nessun parametro : [bRecalc] + bool bRecalc = false ; + LuaGetParam( L, 1, bRecalc) ; LuaClearStack( L) ; - // imposto la geometria alla lavorazione corrente - bool bOk = ExeApplyMachining() ; + // calcolo la lavorazione corrente + bool bOk = ExeApplyMachining( bRecalc) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -1911,6 +1928,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtSetCurrMachining", LuaSetCurrMachining) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSetMachiningParam", LuaSetMachiningParam) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSetMachiningGeometry", LuaSetMachiningGeometry) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtPreviewMachining", LuaPreviewMachining) ; bOk = bOk && luaMgr.RegisterFunction( "EgtApplyMachining", LuaApplyMachining) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetMachiningParam", LuaGetMachiningParam) ; // Simulation