From 3cd59132dd850da1de889d652db9a672c8daad81 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 7 Oct 2019 06:42:36 +0000 Subject: [PATCH] EgtExecutor 2.1j2 : - aggiunte funzione Exe e Lua TdbGetCurrToolThDiam. --- EXE_MachMgr.cpp | 12 +++++++++++- EgtExecutor.rc | Bin 16184 -> 16184 bytes LUA_MachMgr.cpp | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 9e97d2c..f797d45 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -1308,6 +1308,16 @@ ExeTdbGetCurrToolMaxDepth( double& dMaxDepth) return pMachMgr->TdbGetCurrToolMaxDepth( dMaxDepth) ; } +//----------------------------------------------------------------------------- +bool +ExeTdbGetCurrToolThDiam( double& dThDiam) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero il diametro del portautensili + return pMachMgr->TdbGetCurrToolThDiam( dThDiam) ; +} + //----------------------------------------------------------------------------- int ExeTdbCurrToolDraw( int nGenCtx, int nToolCtx) @@ -1315,7 +1325,7 @@ ExeTdbCurrToolDraw( int nGenCtx, int nToolCtx) ExeSetCurrentContext( nGenCtx) ; IMachMgr* pMachMgr = GetCurrMachMgr() ; VERIFY_MACHMGR( pMachMgr, 999) - // recupero il massimo affondamento dell'utensile + // recupero il disegno dell'utensile return pMachMgr->TdbCurrToolDraw( nGenCtx, nToolCtx) ; } diff --git a/EgtExecutor.rc b/EgtExecutor.rc index e6b74ff8c64f26b7e5129cf1d89d73e95819784f..7d2c3f8ebddf2554150b559790e452d2d0cb6fde 100644 GIT binary patch delta 97 zcmdl{x1(;uA2vp#%@@V4Gflq2na5}}Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y| cF@rU@0x76sKgP|Iq`|@mV0Jo1HG5`Po delta 105 zcmdl{x1(;uA2vqA%@@V4Gflq2nKwB}L}GFQr`YBKt{N7g_(8eLOp^}?BE$`p+!!}6 e64qk|YjR~q(%{Fqd6G0(;-H)(Lc&0aLlyuHE+YN_ diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 75a053b..e424949 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -1436,6 +1436,22 @@ LuaTdbGetCurrToolMaxDepth( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaTdbGetCurrToolThDiam( lua_State* L) +{ + // nessun parametro + LuaClearStack( L) ; + // recupero il diametro del portautensili + double dVal ; + bool bOk = ExeTdbGetCurrToolThDiam( dVal) ; + if ( bOk) + LuaSetParam( L, dVal) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaTdbGetCurrToolDraw( lua_State* L) @@ -3624,6 +3640,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSetCurrToolParam", LuaTdbSetCurrToolParam) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolParam", LuaTdbGetCurrToolParam) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolMaxDepth", LuaTdbGetCurrToolMaxDepth) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolThDiam", LuaTdbGetCurrToolThDiam) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolDraw", LuaTdbGetCurrToolDraw) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbReload", LuaTdbReload) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSave", LuaTdbSave) ;