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
Drilling.cpp
+11 -11
View File
@@ -532,7 +532,7 @@ Drilling::Apply( bool bRecalc, bool bPostApply)
if ( ! bRecalc && ! bToolChanged &&
( m_nStatus == MCH_ST_OK || ( ! bPostApply && m_nStatus == MCH_ST_NO_POSTAPPL))) {
m_nDrillings = nCurrDrillings ;
LOG_INFO( GetEMkLogger(), "Drilling apply skipped : status already ok") ;
LOG_DBG_INFO( GetEMkLogger(), "Drilling apply skipped : status already ok") ;
return true ;
}
m_nStatus = MCH_ST_TO_VERIFY ;
@@ -589,7 +589,7 @@ Drilling::Update( bool bPostApply)
// se lavorazione vuota, esco
if ( m_nDrillings == 0) {
LOG_INFO( GetEMkLogger(), "Warning in Drilling : No machinable hole")
LOG_WARN( GetEMkLogger(), "Warning in Drilling : No machinable hole")
return true ;
}
@@ -716,7 +716,7 @@ Drilling::Chain( int nGrpDestId)
// ne verifico la validità
if ( IsNull( vpCrvs.back())) {
string sOut = "Entity " + ToString( Id) + " skipped by Drilling" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
vpCrvs.back().Reset() ;
}
}
@@ -942,14 +942,14 @@ Drilling::GenerateHolePv( int nInd, const SelData& nCircId, const string& sPName
if ( ! GetHoleData( nCircId, hole) || ! VerifyDiameter( hole.dDiam, m_TParams.m_dDiam, dDiamTol)) {
m_pGeomDB->Erase( nPathId) ;
string sOut = "Entity " + ToString( nCircId) + " skipped by Drilling" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
return true ;
}
// limito lunghezza foro a massima lavorazione della punta
if ( hole.dLen > m_TParams.m_dMaxMat + EPS_SMALL) {
hole.dLen = m_TParams.m_dMaxMat ;
string sOut = "Drill bit too short for Hole " + ToString( nCircId) ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
}
// inserisco circonferenza che rappresenta il foro
PtrOwner<ICurveArc> pCrvArc( CreateCurveArc()) ;
@@ -986,7 +986,7 @@ Drilling::GenerateHoleCl( int nInd, const SelData& nCircId, const string& sPName
if ( ! GetHoleData( nCircId, hole) || ! VerifyDiameter( hole.dDiam, m_TParams.m_dDiam, dDiamTol)) {
m_pGeomDB->Erase( nPathId) ;
string sOut = "Entity " + ToString( nCircId) + " skipped by Drilling" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
return true ;
}
// se richiesta inversione e foro passante, provvedo
@@ -1003,7 +1003,7 @@ Drilling::GenerateHoleCl( int nInd, const SelData& nCircId, const string& sPName
hole.dLen = m_TParams.m_dMaxMat ;
hole.bBlind = true ;
string sOut = "Drill bit too short for Hole " + ToString( nCircId) ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
}
// verifiche per foro verso il basso
m_bAggrBottom = false ;
@@ -1026,7 +1026,7 @@ Drilling::GenerateHoleCl( int nInd, const SelData& nCircId, const string& sPName
else {
m_pGeomDB->Erase( nPathId) ;
string sOut = "Hole " + ToString( nCircId) + " skipped by Standard Drilling" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
}
}
else {
@@ -1037,7 +1037,7 @@ Drilling::GenerateHoleCl( int nInd, const SelData& nCircId, const string& sPName
else {
m_pGeomDB->Erase( nPathId) ;
string sOut = "Hole " + ToString( nCircId) + " skipped by Peck Drilling" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
}
}
@@ -1273,13 +1273,13 @@ Drilling::UpdateToolData( bool* pbChanged)
if ( ! EqualNoCase( m_Params.m_sToolName, m_TParams.m_sName)) {
string sLog = "Warning in Drilling : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
LOG_WARN( GetEMkLogger(), sLog.c_str()) ;
m_Params.m_sToolName = m_TParams.m_sName ;
}
if ( bChanged) {
string sLog = "Warning in Drilling : tool data changed (" +
m_Params.m_sToolName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
LOG_WARN( GetEMkLogger(), sLog.c_str()) ;
}
// se definito parametro di ritorno, lo assegno
if ( pbChanged != nullptr)