EgtInterface 1.6e1 :

- migliorata EgtErase per registrazione lua
- migliorata segnalazione stato avvio di EgtMachMgr.
This commit is contained in:
Dario Sassi
2015-05-04 07:33:16 +00:00
parent 758245f4fc
commit e7ee6d9255
3 changed files with 13 additions and 10 deletions
+5 -5
View File
@@ -451,11 +451,6 @@ EgtErase( const INTVECTOR& vIds)
nId = (( vIds[i] != GDB_ID_SEL) ? GDB_ID_NULL : pGeomDB->GetFirstSelectedObj()) ;
}
}
// se cancellato pezzo corrente o layer corrente
if ( bErasedCurrPart)
EgtResetCurrPartLayer() ;
else if ( bErasedCurrLayer)
EgtSetCurrPartLayer( nCurrPartId, EgtGetFirstLayer( nCurrPartId, true)) ;
EgtSetModified() ;
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -463,6 +458,11 @@ EgtErase( const INTVECTOR& vIds)
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
// se cancellato pezzo corrente o layer corrente (va qui perchè salva altro comando che è successivo)
if ( bErasedCurrPart)
EgtResetCurrPartLayer() ;
else if ( bErasedCurrLayer)
EgtSetCurrPartLayer( nCurrPartId, EgtGetFirstLayer( nCurrPartId, true)) ;
// restituisco risultato
return bOk ;
}
+8 -5
View File
@@ -26,20 +26,23 @@ using namespace std ;
//-----------------------------------------------------------------------------
BOOL
__stdcall EgtInitMachMgr( void)
__stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir)
{
GseContext* pGseCtx = GetCurrGseContext() ;
VERIFY_CTX( pGseCtx, FALSE)
// inizializzazione gestore lavorazioni
PtrOwner<IMachMgr> pMachMgr( MyCreateMachMgr()) ;
VERIFY_NULL( Get( pMachMgr), "Error in CreateMachMgr", FALSE)
pMachMgr->Init( pGseCtx->m_pGeomDB) ;
string sMachinesDir = wstrztoA( wsMachinesDir) ;
bool bOk = pMachMgr->Init( pGseCtx->m_pGeomDB, sMachinesDir) ;
// assegno il gestore al contesto
pGseCtx->m_pMachMgr = Release( pMachMgr) ;
pGseCtx->m_pMachMgr = ( bOk ? Release( pMachMgr) : nullptr) ;
// log avvio Machining Manager
string sLog = "MachMgr started " ;
string sLog = "MachMgr " ;
sLog += ( bOk ? " started" : " error") ;
sLog += " (" + sMachinesDir + ")" ;
LOG_INFO( GetLogger(), sLog.c_str())
return TRUE ;
return ( bOk ? TRUE : FALSE) ;
}
//-----------------------------------------------------------------------------
BIN
View File
Binary file not shown.