Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtMachKernel :

Browse Source 
- piccola modifica.
This commit is contained in:
Dario Sassi
2017-12-02 18:40:06 +00:00
parent e488d3a334
commit 08bf398839
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Milling.cpp
+15 -3
View File
@@ -779,7 +779,7 @@ Milling::GetToolData( void) const
//----------------------------------------------------------------------------
bool
Milling::UpdateToolData( void)
Milling::UpdateToolData( bool* pbChanged)
{
// recupero il gestore DB utensili della macchina corrente
ToolsMgr* pTMgr = m_pMchMgr->GetCurrToolsMgr() ;
@@ -789,13 +789,25 @@ Milling::UpdateToolData( void)
const ToolData* pTdata = pTMgr->GetTool( m_Params.m_ToolUuid) ;
if ( pTdata == nullptr)
return false ;
// aggiorno i parametri
// verifico se sono diversi (ad esclusione del nome)
m_TParams.m_sName = pTdata->m_sName ;
bool bChanged = ! SameTool( m_TParams, *pTdata) ;
// aggiorno comunque i parametri
m_TParams = *pTdata ;
// eventuali segnalazioni
if ( ! EqualNoCase( m_Params.m_sToolName, m_TParams.m_sName)) {
string sLog = "Warning in Milling : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName +")" ;
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
}
if ( bChanged) {
string sLog = "Warning in Milling : tool data changed (" +
m_Params.m_sToolName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
}
// se definito parametro di ritorno, lo assegno
if ( pbChanged != nullptr)
*pbChanged = bChanged ;
return true ;
}