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 24a9104..00f8b0d 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ