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

EgtMachKernel :

Browse Source 
- aggiunta gestione livello di debug in LOG*.
This commit is contained in:
Dario Sassi
2019-04-01 06:16:03 +00:00
parent 9cd9068b7b
commit e4613162c5
24 changed files with 120 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MachineCalc.cpp
+7 -7
View File
@@ -189,7 +189,7 @@ Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
Head* pHead = GetHead( nHeadId) ;
if ( pHead == nullptr) {
string sOut = "Missing head " + sHead + " for tool " + sTool ;
LOG_INFO( GetEMkLogger(), sOut.c_str())
LOG_ERROR( GetEMkLogger(), sOut.c_str())
return false ;
}
// recupero il gruppo dell'uscita
@@ -199,7 +199,7 @@ Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
Exit* pExit = GetExit( nExitId) ;
if ( pExit == nullptr) {
string sOut = "Missing exit " + ToString( nExit) + " on head " + sHead ;
LOG_INFO( GetEMkLogger(), sOut.c_str())
LOG_ERROR( GetEMkLogger(), sOut.c_str())
return false ;
}
// recupero i dati dell'utensile
@@ -215,7 +215,7 @@ Machine::SetCurrTool( const string& sTool, const string& sHead, int nExit)
// carico l'utensile (si sostituisce ad altro già presente sulla stessa uscita)
if ( ! LoadTool( sHead, nExit, sTool)) {
string sOut = "Missing tool " + sTool ;
LOG_INFO( GetEMkLogger(), sOut.c_str())
LOG_ERROR( GetEMkLogger(), sOut.c_str())
return false ;
}
nToolId = m_pGeomDB->GetFirstNameInGroup( nExitId, sTool) ;
@@ -413,7 +413,7 @@ Machine::CalculateKinematicChain( void)
else if ( m_vCalcLinAx[2].vtDir.IsXplus())
swap( m_vCalcLinAx[0], m_vCalcLinAx[2]) ;
else {
LOG_INFO( GetEMkLogger(), "Linear Axes not aligned with Global XYZ")
LOG_ERROR( GetEMkLogger(), "Linear Axes not aligned with Global XYZ")
return false ;
}
}
@@ -421,7 +421,7 @@ Machine::CalculateKinematicChain( void)
if ( m_vCalcLinAx[2].vtDir.IsYplus())
swap( m_vCalcLinAx[1], m_vCalcLinAx[2]) ;
else {
LOG_INFO( GetEMkLogger(), "Linear Axes not aligned with Global XYZ")
LOG_ERROR( GetEMkLogger(), "Linear Axes not aligned with Global XYZ")
return false ;
}
}
@@ -469,7 +469,7 @@ Machine::CalculateKinematicChain( void)
}
// altrimenti non ancora gestito, quindi errore
LOG_INFO( GetEMkLogger(), "Rotary Axes not manageable")
LOG_ERROR( GetEMkLogger(), "Rotary Axes not manageable")
return false ;
}
@@ -611,7 +611,7 @@ Machine::SetSolCh( int nScc, bool bExact)
// recupero i dati della testa
Head* pHead = GetHead( m_nCalcHeadId) ;
if ( pHead == nullptr) {
LOG_INFO( GetEMkLogger(), "Missing head in SetSolCh")
LOG_ERROR( GetEMkLogger(), "Missing head in SetSolCh")
return false ;
}
// assegno il criterio definito nella testa (standard)