From 1b41407b0ad6aec5d384b008ad5053b7bb5feb28 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 28 Jan 2017 07:59:58 +0000
Subject: [PATCH] EgtExecutor 1.6x7 : - aggiunta Exe e Lua ImportSetup.

---
 EXE_MachMgr.cpp      |  34 ++++++++++++++++++++++------------
 EXE_NstMachining.cpp |   4 ++--
 EgtExecutor.rc       | Bin 11694 -> 11694 bytes
 LUA_MachMgr.cpp      |  18 ++++++++++++++++++
 4 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 4044a11..a255823 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -248,18 +248,6 @@ ExeGetCurrMachGroup( void)
    return pMachMgr->GetCurrMachGroup() ;
 }
 
-//-----------------------------------------------------------------------------
-//   Setup
-//-----------------------------------------------------------------------------
-int
-ExeGetCurrSetup( void)
-{
-   IMachMgr* pMachMgr = GetCurrMachMgr() ;
-   VERIFY_MACHMGR( pMachMgr, 0)
-  // recupero l'identificativo del gruppo di attrezzaggio della macchinata corrente
-   return pMachMgr->GetCurrSetup() ;
-}
-
 //-----------------------------------------------------------------------------
 //   Phases
 //-----------------------------------------------------------------------------
@@ -1225,6 +1213,28 @@ ExeTdbGetToolHolderDir( string& sTHolderDir)
    return pMachMgr->TdbGetToolHolderDir( sTHolderDir) ;
 }
 
+//-----------------------------------------------------------------------------
+//  Setup
+//-----------------------------------------------------------------------------
+int
+ExeGetCurrSetup( void)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, 0)
+  // recupero l'identificativo del gruppo di attrezzaggio della macchinata corrente
+   return pMachMgr->GetCurrSetup() ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeImportSetup( const string& sName)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // eseguo importazione
+   return pMachMgr->ImportSetup( sName) ;
+}
+
 //-----------------------------------------------------------------------------
 //  DB lavorazioni
 //-----------------------------------------------------------------------------
diff --git a/EXE_NstMachining.cpp b/EXE_NstMachining.cpp
index 0f66b45..8ad776b 100644
--- a/EXE_NstMachining.cpp
+++ b/EXE_NstMachining.cpp
@@ -240,9 +240,9 @@ ExeVerifyCutAsSplitting( int nMchId)
          nResult += CAR_LI_OK ;
    }
   // verifico se posso portare uscita al bordo grezzo
-   bool bLoToModif = ( nLoType != SAW_LO_EXT) ;
+   bool bLoToModif = ( nLoType != SAW_LO_EXT_CENT  &&  nLoType != SAW_LO_EXT_OUT) ;
    if ( bLoToModif) {
-      pGseCtx->m_pMachMgr->SetMachiningParam( MPA_LEADOUTTYPE, SAW_LO_EXT) ;
+      pGseCtx->m_pMachMgr->SetMachiningParam( MPA_LEADOUTTYPE, SAW_LO_EXT_CENT) ;
      // aggiorno preview
       pGseCtx->m_pMachMgr->MachiningPreview( true) ;
      // verifico interferenza
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 8f07ee69c6a8fa404a925337d2ff56ef39cf1c20..65fb0c9b45a1b9122c427e08d5915e4a109681a0 100644
GIT binary patch
delta 97
zcmZ1%y)JsgA2vqw%@@V4Gflq2na5~8Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0G^E>WB>pF

delta 105
zcmZ1%y)JsgA2vp_%@@V4Gflq2nKwB}L}GFQr`YBKt{N7g_(8eLOp^}?BE$`p+!!}6
e64qk|YjR~q(%{Fqd6G0(;-H)(Lc&0)jvD~(JR=+c

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 8f01750..9ec7a1c 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -1316,6 +1316,22 @@ LuaTdbSave( lua_State* L)
    return 1 ;
 }
 
+//-----------------------------------------------------------------------------
+//  Setup
+//-----------------------------------------------------------------------------
+static int
+LuaImportSetup( lua_State* L)
+{
+  // 1 o nessun parametro : [sName]
+   string sName ;
+   LuaGetParam( L, 1, sName) ;
+   LuaClearStack( L) ;
+  // eseguo importazione
+   bool bOk = ExeImportSetup( sName) ;
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 //    Machinings database
 //-------------------------------------------------------------------------------
@@ -3007,6 +3023,8 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolParam", LuaTdbGetCurrToolParam) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtTdbReload", LuaTdbReload) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSave", LuaTdbSave) ;
+   // Setup
+   bOk = bOk && luaMgr.RegisterFunction( "EgtImportSetup", LuaImportSetup) ;
    // Machinings database
    bOk = bOk && luaMgr.RegisterFunction( "EgtMdbGetMachiningNewName", LuaMdbGetMachiningNewName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtMdbAddMachining", LuaMdbAddMachining) ;