From 501839aaf260a19b4629e9ed41e24831dfd14a5c Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 27 Jun 2017 13:51:54 +0000
Subject: [PATCH] EgtExecutor 1.8f5 : - modifiche per stato visualizzazione
 macchina durante ExeApplyAllMachinings e ExeUpdateAllMachinings.

---
 EXE_MachMgr.cpp |  23 +++++++++++++++++++++++
 EgtExecutor.rc  | Bin 15088 -> 15088 bytes
 2 files changed, 23 insertions(+)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 28dcd7a..638a884 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -21,6 +21,7 @@
 #include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EGkStringUtils3d.h"
 #include "/EgtDev/Include/EMkOperationConst.h"
+#include "/EgtDev/Include/EMkSimuGenConst.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
 
@@ -2278,6 +2279,9 @@ ExeApplyAllMachinings( bool bStopOnFirstErr, string& sErrList)
    sErrList.clear() ;
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
    VERIFY_MACHMGR( pMachMgr, false)
+  // Recupero stato corrente di visualizzazione della macchina
+   int nCurrLook = pMachMgr->GetMachineLook() ;
+   pMachMgr->SetMachineLook( MCH_LOOK_ALL) ;
   // Recupero fase corrente e lavorazione corrente della macchinata corrente
    int nCurrPhase = pMachMgr->GetCurrPhase() ;
    int nCurrMach = pMachMgr->GetCurrMachining() ;
@@ -2313,6 +2317,14 @@ ExeApplyAllMachinings( bool bStopOnFirstErr, string& sErrList)
       pMachMgr->SetCurrMachining( nCurrMach) ;
    else
       pMachMgr->ResetCurrMachining() ;
+  // Ripristino stato visualizzazione macchina
+   pMachMgr->SetMachineLook( nCurrLook) ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtApplyAllMachinings(" + string( bStopOnFirstErr ? "true" : "false") + ")" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
    return bOk ;
 }
 
@@ -2323,6 +2335,9 @@ ExeUpdateAllMachinings( bool bStopOnFirstErr, string& sErrList)
    sErrList.clear() ;
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
    VERIFY_MACHMGR( pMachMgr, false)
+  // Recupero stato corrente di visualizzazione della macchina
+   int nCurrLook = pMachMgr->GetMachineLook() ;
+   pMachMgr->SetMachineLook( MCH_LOOK_ALL) ;
   // Recupero fase corrente e lavorazione corrente della macchinata corrente
    int nCurrPhase = pMachMgr->GetCurrPhase() ;
    int nCurrMach = pMachMgr->GetCurrMachining() ;
@@ -2358,6 +2373,14 @@ ExeUpdateAllMachinings( bool bStopOnFirstErr, string& sErrList)
       pMachMgr->SetCurrMachining( nCurrMach) ;
    else
       pMachMgr->ResetCurrMachining() ;
+  // Ripristino stato visualizzazione macchina
+   pMachMgr->SetMachineLook( nCurrLook) ;
+  // se richiesto, salvo il comando Lua equivalente
+   if ( IsCmdLog()) {
+      string sLua = "EgtUpdateAllMachinings(" + string( bStopOnFirstErr ? "true" : "false") + ")" +
+                    " -- Ok=" + ToString( bOk) ;
+      LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
+   }
    return bOk ;
 }
 
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 24a91046d58f7195b4151e4d271c7210d25adbbd..00f8b0d77f2a565c7dbc4883ff0f97d34811508f 100644
GIT binary patch
delta 79
zcmexR`k{2gFE&Qg&A-`PnSqoe*K!sx?>N)s4T4pSrjs4Hk~jAW*?>e(i-FY$N+HxV
MD8kglDNT|90G=Tmod5s;

delta 79
zcmexR`k{2gFE&P#&A-`PnSqoe*K!sx?>N)s4T4pSCX*exk~jAW*?>e(i-FY$N+HxV
MD8kglDNT|90G!nul>h($