From 98dc896a0154b6c30b8a5b446cc415d7cfb762cc Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 31 May 2018 06:47:28 +0000
Subject: [PATCH] EgtExecutor 1.9e5 : - aggiunta funzione Exe e Lua estimate.

---
 EXE_MachMgr.cpp |  12 +++++++++++-
 EgtExecutor.rc  | Bin 16146 -> 16146 bytes
 LUA_MachMgr.cpp |  22 ++++++++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index a61f446..aa719d4 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -2564,7 +2564,7 @@ ExeSimStop( void)
 }
 
 //-----------------------------------------------------------------------------
-//    Generazione
+//    Generazione e Stima T&L
 //-----------------------------------------------------------------------------
 bool
 ExeGenerate( const string& sCncFile, const string& sInfo)
@@ -2575,6 +2575,16 @@ ExeGenerate( const string& sCncFile, const string& sInfo)
    return pMachMgr->Generate( sCncFile, sInfo) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeEstimate( const string& sEstFile, const string& sInfo)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // eseguo la stima di tempi e lunghezze di lavoro della macchinata corrente
+   return pMachMgr->Estimate( sEstFile, sInfo) ;
+}
+
 //-----------------------------------------------------------------------------
 // Machine Calc
 //-----------------------------------------------------------------------------
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index f4a04dc30878daf4af6671b6a6d515b303df180e..a56bcf896862f87cc77e06f1fc1a9ae8332bdfe1 100644
GIT binary patch
delta 79
zcmbPKH>qyJFE&Qg&A-`PnSqoe*K!sx?>N)s4T4pSrjs4Hk~jAW*?>e(i-FY$N+HxV
MD8kglDQ%Gf0BVaH82|tP

delta 79
zcmbPKH>qyJFE&P#&A-`PnSqoe*K!sx?>N)s4T4pSCX*exk~jAW*?>e(i-FY$N+HxV
MD8kglDQ%Gf0BJuP5dZ)H

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 9ffabeb..bab9c8a 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -2715,7 +2715,7 @@ LuaSimStop( lua_State* L)
 }
 
 //-------------------------------------------------------------------------------
-//    Generation
+//    Generation & T&L estimation
 //-------------------------------------------------------------------------------
 static int
 LuaGenerate( lua_State* L)
@@ -2733,6 +2733,23 @@ LuaGenerate( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaEstimate( lua_State* L)
+{
+  // 1 o 2 parametro : sEstFile [, sInfo]
+   string sEstFile ;
+   LuaCheckParam( L, 1, sEstFile)
+   string sInfo ;
+   LuaGetParam( L, 2, sInfo) ;
+   LuaClearStack( L) ;
+  // eseguo la stima dei tempi e delle lunghezze di lavorazione
+   bool bOk = ExeEstimate( sEstFile, sInfo) ;
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 //    Machine Calc
 //-------------------------------------------------------------------------------
@@ -3482,8 +3499,9 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtSimGetMoveInfo", LuaSimGetMoveInfo) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSimSetStep", LuaSimSetStep) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSimStop", LuaSimStop) ;
-   // Generation
+   // Generation & T&L estimation
    bOk = bOk && luaMgr.RegisterFunction( "EgtGenerate", LuaGenerate) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtEstimate", LuaEstimate) ;
    // Machine
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetBaseId", LuaGetBaseId) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableId", LuaGetTableId) ;