From 3787a4a1fdf6cc83fa3af50e92279ff898027070 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 28 Nov 2018 17:06:06 +0000 Subject: [PATCH] EgtExecutor 1.9k2 : - aggiunta funzione Exe e Lua TdbGetCurrToolMaxDepth. --- EXE_MachMgr.cpp | 10 ++++++++++ EgtExecutor.rc | Bin 16154 -> 16154 bytes LUA_MachMgr.cpp | 23 ++++++++++++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 4f1c6b3..0f343df 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -1276,6 +1276,16 @@ ExeTdbGetCurrToolParam( int nType, string& sVal) return pMachMgr->TdbGetCurrToolParam( nType, sVal) ; } +//----------------------------------------------------------------------------- +bool +ExeTdbGetCurrToolMaxDepth( double& dMaxDepth) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero il massimo affondamento dell'utensile + return pMachMgr->TdbGetCurrToolMaxDepth( dMaxDepth) ; +} + //----------------------------------------------------------------------------- bool ExeTdbReload( void) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 63be37240493a2aa8fc5336e156b44eda15a2da8..0862642f03461e3c7bbaa3d596e015e9cd6dc761 100644 GIT binary patch delta 97 zcmbPLH>+;LA2vp#%@@V4Gflq2na5}}Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y| cF@rU@0x76sKgP|Iq`|@m7F0HV?#*8l(j delta 97 zcmbPLH>+;LA2vqA%@@V4Gflq2na5~2Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y| cF@rU@0x76sKgP|Iq`|@m7F0HI7D&j0`b diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 924c7b1..cdb75ff 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2015 +// EgalTech 2015-2018 //---------------------------------------------------------------------------- -// File : LUA_MachMgr.cpp Data : 24.03.15 Versione : 1.6c8 +// File : LUA_MachMgr.cpp Data : 27.11.18 Versione : 1.9k2 // Contenuto : Funzioni Machining Manager per LUA. // // @@ -1365,7 +1365,7 @@ LuaTdbGetCurrToolParam( lua_State* L) int nType ; LuaCheckParam( L, 1, nType) LuaClearStack( L) ; - // recupero il parametro dell'utensile voluto + // recupero il parametro voluto dell'utensile corrente if ( ( nType & TPA_BOOL) != 0) { bool bVal ; bool bOk = ExeTdbGetCurrToolParam( nType, bVal) ; @@ -1403,6 +1403,22 @@ LuaTdbGetCurrToolParam( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaTdbGetCurrToolMaxDepth( lua_State* L) +{ + // nessun parametro + LuaClearStack( L) ; + // recupero il massimo affondamento dell'utensile corrente + double dVal ; + bool bOk = ExeTdbGetCurrToolMaxDepth( dVal) ; + if ( bOk) + LuaSetParam( L, dVal) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaTdbReload( lua_State* L) @@ -3544,6 +3560,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtTdbIsCurrToolModified", LuaTdbIsCurrToolModified) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSetCurrToolParam", LuaTdbSetCurrToolParam) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolParam", LuaTdbGetCurrToolParam) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolMaxDepth", LuaTdbGetCurrToolMaxDepth) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbReload", LuaTdbReload) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSave", LuaTdbSave) ; // Setup