From d638f57a3d48dedec61afa9894aa548dc596a11b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 10 Mar 2018 10:38:26 +0000 Subject: [PATCH] EgtExecutor 1.9c3 : - aggiunta a Exe funzione ExeTextGetFont - aggiunte a Lua funzioni EgtTextGetContent e EgtTextGetFont. --- EXE_GeoSnap.cpp | 15 +++++++++++++++ EgtExecutor.rc | Bin 15088 -> 15088 bytes LUA_GeoSnap.cpp | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/EXE_GeoSnap.cpp b/EXE_GeoSnap.cpp index fff7ed5..976608f 100644 --- a/EXE_GeoSnap.cpp +++ b/EXE_GeoSnap.cpp @@ -1302,6 +1302,21 @@ ExeTextGetContent( int nId, string& sText) return true ; } +//---------------------------------------------------------------------------- +bool +ExeTextGetFont( int nId, string& sFont) +{ + IGeomDB* pGeomDB = GetCurrGeomDB() ; + VERIFY_GEOMDB( pGeomDB, false) + // recupero il testo + const IExtText* pTxt = GetExtText( pGeomDB->GetGeoObj( nId)) ; + if ( pTxt == nullptr) + return false ; + // recupero il font + sFont = pTxt->GetFont() ; + return true ; +} + //------------------------------------------------------------------------------- // Geo Transforms //------------------------------------------------------------------------------- diff --git a/EgtExecutor.rc b/EgtExecutor.rc index c4b6b6c84aaaeb75e9bbfd992ab743e7a61e5c80..b964aa685765ae7513e72c4ad90cec4cea592e2d 100644 GIT binary patch delta 79 zcmexR`k{2gFE&Qw&A-`PnSqoe*K!sx?>N)s4T4pS#*-bnk~jAW*?>e(i-FY$N+HxV MD8kglDNT|90Go*$jQ{`u delta 79 zcmexR`k{2gFE&P_&A-`PnSqoe*K!sx?>N)s4T4pSMw1=6k~jAW*?>e(i-FY$N+HxV MD8kglDNT|90Gd4;g#Z8m diff --git a/LUA_GeoSnap.cpp b/LUA_GeoSnap.cpp index cf6a3ed..f97df92 100644 --- a/LUA_GeoSnap.cpp +++ b/LUA_GeoSnap.cpp @@ -938,6 +938,40 @@ LuaTextNormVersor( lua_State* L) return 1 ; } +//---------------------------------------------------------------------------- +static int +LuaTextContent( lua_State* L) +{ + // 1 parametro : Id + int nId ; + LuaCheckParam( L, 1, nId) + LuaClearStack( L) ; + // recupero il contenuto + string sText ; + if ( ExeTextGetContent( nId, sText)) + LuaSetParam( L, sText) ; + else + LuaSetParam( L) ; + return 1 ; +} + +//---------------------------------------------------------------------------- +static int +LuaTextFont( lua_State* L) +{ + // 1 parametro : Id + int nId ; + LuaCheckParam( L, 1, nId) + LuaClearStack( L) ; + // recupero il font + string sFont ; + if ( ExeTextGetFont( nId, sFont)) + LuaSetParam( L, sFont) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- bool LuaInstallGeoSnap( LuaMgr& luaMgr) @@ -989,5 +1023,7 @@ LuaInstallGeoSnap( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapPartCount", LuaVolZmapPartCount) ; bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapPartVolume", LuaVolZmapPartVolume) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTextNormVersor", LuaTextNormVersor) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtTextContent", LuaTextContent) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtTextFont", LuaTextFont) ; return bOk ; }