EgtMachKernel :

- modifiche per rinviare caricamento macchina e DB utensili e lavorazioni a quando servono.
This commit is contained in:
Dario Sassi
2016-09-15 08:21:11 +00:00
parent a2f39ab432
commit ea319d1fa9
6 changed files with 78 additions and 46 deletions
+14 -10
View File
@@ -69,17 +69,21 @@ MachMgr::Clear( void)
delete m_pSimul ;
m_pSimul = nullptr ;
}
// pulisco le macchine
while ( ! m_vMachines.empty()) {
if ( m_vMachines.back().pMsMgr != nullptr)
delete m_vMachines.back().pMsMgr ;
if ( m_vMachines.back().pTsMgr != nullptr)
delete m_vMachines.back().pTsMgr ;
if ( m_vMachines.back().pMachine != nullptr)
delete m_vMachines.back().pMachine ;
m_vMachines.pop_back() ;
// pulisco le macchine (ma ne lascio intatto l'elencazione con il nome)
for ( size_t i = 0 ; i < m_vMachines.size() ; ++ i) {
if ( m_vMachines[i].pMsMgr != nullptr) {
delete m_vMachines[i].pMsMgr ;
m_vMachines[i].pMsMgr = nullptr ;
}
if ( m_vMachines[i].pTsMgr != nullptr) {
delete m_vMachines[i].pTsMgr ;
m_vMachines[i].pTsMgr = nullptr ;
}
if ( m_vMachines[i].pMachine != nullptr) {
delete m_vMachines[i].pMachine ;
m_vMachines[i].pMachine = nullptr ;
}
}
m_nCurrMch = - 1 ;
}
//----------------------------------------------------------------------------