From 2cd3a3490174027ee0927aeb9d6ecc0453e4c640 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 18 Jul 2017 07:16:41 +0000
Subject: [PATCH] EgtExecutor 1.8g3 : - aggiunte a Exe e Lua funzioni
 GetLastMachGroup e GetPrevMachGroup.

---
 EXE_MachMgr.cpp |  20 ++++++++++++++++++++
 EgtExecutor.rc  | Bin 15088 -> 15088 bytes
 LUA_MachMgr.cpp |  40 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 8ea2411..a3ba8e4 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -162,6 +162,26 @@ ExeGetNextMachGroup( int nId)
    return pMachMgr->GetNextMachGroup( nId) ;
 }
 
+//-----------------------------------------------------------------------------
+int
+ExeGetLastMachGroup( void)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
+  // recupero l'ultima macchinata
+   return pMachMgr->GetLastMachGroup() ;
+}
+
+//-----------------------------------------------------------------------------
+int
+ExeGetPrevMachGroup( int nId)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL)
+  // recupero la precedente macchinata
+   return pMachMgr->GetPrevMachGroup( nId) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeGetMachGroupNewName( string& sName)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index b03762b7bdd78d97215bac191f779048ece2e919..0fabe346809fe96b98360238dedeb875a35b45f9 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_MachMgr.cpp b/LUA_MachMgr.cpp
index 5c200f7..381272f 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -139,6 +139,40 @@ LuaGetNextMachGroup( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaGetLastMachGroup( lua_State* L)
+{
+  // nessun parametro
+   LuaClearStack( L) ;
+  // recupero l'identificativo dell'ultima macchinata
+   int nId = ExeGetLastMachGroup() ; 
+  // restituisco il risultato
+   if ( nId != GDB_ID_NULL)
+      LuaSetParam( L, nId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaGetPrevMachGroup( lua_State* L)
+{
+  // 1 parametro : identificativo di una macchinata
+   int nId ;
+   LuaCheckParam( L, 1, nId)
+   LuaClearStack( L) ;
+  // recupero l'identificativo della precedente macchinata
+   int nNextId = ExeGetPrevMachGroup( nId) ; 
+  // restituisco il risultato
+   if ( nNextId != GDB_ID_NULL)
+      LuaSetParam( L, nNextId) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaGetMachGroupNewName( lua_State* L)
@@ -2916,12 +2950,12 @@ LuaVerifyOutstroke( lua_State* L)
    bool bOk = ExeVerifyOutstroke( dX, dY, dZ, dAngA, dAngB, nStat) ;
   // restituisco il risultato
    if ( bOk) {
-      LuaSetParam( L, bOk) ;
+      LuaSetParam( L, ( nStat == 0)) ;
       LuaSetParam( L, nStat) ;
       return 2 ;
    }
    else {
-      LuaSetParam( L, bOk) ;
+      LuaSetParam( L, false) ;
       return 1 ;
    }
 }
@@ -3260,6 +3294,8 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetMachGroupCount", LuaGetMachGroupCount) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetFirstMachGroup", LuaGetFirstMachGroup) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetNextMachGroup", LuaGetNextMachGroup) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetLastMachGroup", LuaGetLastMachGroup) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetPrevMachGroup", LuaGetPrevMachGroup) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetMachGroupNewName", LuaGetMachGroupNewName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddMachGroup", LuaAddMachGroup) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveMachGroup", LuaRemoveMachGroup) ;