From 821085c04d5fe7ce6cfc60f122cdc7c82b5c08af Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 6 Feb 2017 10:16:20 +0000
Subject: [PATCH] EgtExecutor 1.8b2 : - aggiunta funzione Exe e Lua
 GetDefaultSetupName ;

---
 EXE_MachMgr.cpp |  12 +++++++++++-
 EgtExecutor.rc  | Bin 15088 -> 15088 bytes
 LUA_MachMgr.cpp |  17 +++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 61e062e..83db3bd 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -1242,11 +1242,21 @@ int
 ExeGetCurrSetup( void)
 {
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
-   VERIFY_MACHMGR( pMachMgr, 0)
+   VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
   // recupero l'identificativo del gruppo di attrezzaggio della macchinata corrente
    return pMachMgr->GetCurrSetup() ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetDefaultSetupName( string& sName)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // recupero il nome dell'attrezzaggio di default
+   return pMachMgr->GetDefaultSetupName( sName) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeImportSetup( const string& sName)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index ac18c27476d61d5f2b8e00ba3e22658716815d91..a48b8423db813e095036496d7ec38a555c825e79 100644
GIT binary patch
delta 79
zcmexR`k{2gFE&P_&A-`PnSqoe*K!sx?>N)s4T4pSMw1=6k~jAW*?>e(i-FY$N+HxV
MD8kglDNT|90Gd4;g#Z8m

delta 79
zcmexR`k{2gFE&QQ&A-`PnSqoe*K!sx?>N)s4T4pShLat+k~jAW*?>e(i-FY$N+HxV
MD8kglDNT|90GRO`eE<Le

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index b6f8bf0..569ad30 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -1335,6 +1335,22 @@ LuaTdbSave( lua_State* L)
 
 //-----------------------------------------------------------------------------
 //  Setup
+//-----------------------------------------------------------------------------
+static int
+LuaGetDefaultSetupName( lua_State* L)
+{
+  // nessun parametro
+   LuaClearStack( L) ;
+  // recupero il nome dell'attrezzaggio di default
+   string sName ;
+   bool bOk = ExeGetDefaultSetupName( sName) ;
+   if ( bOk)
+      LuaSetParam( L, sName) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-----------------------------------------------------------------------------
 static int
 LuaImportSetup( lua_State* L)
@@ -3063,6 +3079,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtTdbReload", LuaTdbReload) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSave", LuaTdbSave) ;
    // Setup
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetDefaultSetupName", LuaGetDefaultSetupName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtImportSetup", LuaImportSetup) ;
    // Machinings database
    bOk = bOk && luaMgr.RegisterFunction( "EgtMdbGetMachiningNewName", LuaMdbGetMachiningNewName) ;