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

EgtMachKernel :

Browse Source 
- completata gestione warnings.
This commit is contained in:
Dario Sassi
2019-06-26 17:21:01 +00:00
parent 3260704202
commit 632c59422c
5 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disposition.cpp
+5 -3
View File
@@ -37,6 +37,8 @@ using namespace std ;
// 2008 = "Error in Disposition : outstroke xxx"
// 2009 = "Error in Disposition : link movements not calculable"
// 2010 = "Error in Disposition : link outstroke xxx"
// 2051 = "Table Ref1 changed : (xyz) -> (XYZ)"
// 2052 = "Warning in Disposition : No shifts"
//----------------------------------------------------------------------------
static std::string DIS_TABLE = "Tab" ;
@@ -330,8 +332,8 @@ Disposition::SetTable( const string& sTable)
return false ;
if ( ! m_sTabName.empty() && EqualNoCase( m_sTabName, sTable) &&
! AreSamePointApprox( ptPrevRef1, m_ptRef1)) {
string sOut = "Table Ref1 changed : (" + ToString( ptPrevRef1) + ") -> (" + ToString( m_ptRef1) +")" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
string sInfo = "Table Ref1 changed : (" + ToString( ptPrevRef1) + ") -> (" + ToString( m_ptRef1) +")" ;
m_pMchMgr->SetWarning( 2051, sInfo) ;
}
// salvo il nome e dichiaro tavola verificata
m_sTabName = sTable ;
@@ -1370,7 +1372,7 @@ Disposition::SpecialUpdate( void)
// se disposizione vuota, esco
if ( m_nShifts <= 0) {
if ( m_nShifts < 0)
LOG_WARN( GetEMkLogger(), "Warning in Disposition : No shifts")
m_pMchMgr->SetWarning( 2052, "Warning in Disposition : No shifts") ;
return true ;
}
// calcolo assi macchina
GenMachining.cpp
+13 -9
View File
@@ -39,6 +39,10 @@ using namespace std ;
// 2806 = "Error in GenMachining : link movements not calculable"
// 2807 = "Error in GenMachining : link outstroke xx"
// 2808 = "Error in GenMachining : post apply not calculable"
// 2851 = "Warning in GenMachining : Skipped entity (xx)"
// 2852 = "Warning in GenMachining : No machinable path"
// 2853 = "Warning in GenMachining : Tool name changed (xx)"
// 2854 = "Warning in GenMachining : Tool data changed (xx)"
//------------------------------ Constants -----------------------------------
static const string EMC_VAR = "EMC" ; // tabella variabili locali per calcolo
@@ -402,8 +406,8 @@ GenMachining::SetGeometry( const SELVECTOR& vIds)
// test sull'entità
int nSubs ;
if ( ! VerifyGeometry( Id, nSubs, nType)) {
string sOut = "Entity " + ToString( Id) + " skipped by GenMachining" ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
string sInfo = "Warning in GenMachining : Skipped entity " + ToString( Id) ;
m_pMchMgr->SetWarning( 2851, sInfo) ;
continue ;
}
// posso aggiungere alla lista
@@ -620,7 +624,7 @@ GenMachining::Update( bool bPostApply)
// se lavorazione vuota, esco
if ( m_nMills == 0) {
LOG_WARN( GetEMkLogger(), "Warning in GenMachining : No machinable path")
m_pMchMgr->SetWarning( 2852, "Warning in GenMachining : No machinable path") ;
return true ;
}
@@ -801,15 +805,15 @@ GenMachining::UpdateToolData( bool* pbChanged)
m_TParams = *pTdata ;
// eventuali segnalazioni
if ( ! EqualNoCase( m_Params.m_sToolName, m_TParams.m_sName)) {
string sLog = "Warning in GenMachining : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
LOG_WARN( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in GenMachining : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
m_pMchMgr->SetWarning( 2853, sInfo) ;
m_Params.m_sToolName = m_TParams.m_sName ;
}
if ( bChanged) {
string sLog = "Warning in GenMachining : tool data changed (" +
m_Params.m_sToolName + ")" ;
LOG_WARN( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in GenMachining : tool data changed (" +
m_Params.m_sToolName + ")" ;
m_pMchMgr->SetWarning( 2854, sInfo) ;
}
// se definito parametro di ritorno, lo assegno
if ( pbChanged != nullptr)
SawFinishing.cpp
+13 -9
View File
@@ -51,6 +51,10 @@ using namespace std ;
// 2713 = "Error in SawFinishing : link movements not calculable"
// 2714 = "Error in SawFinishing : link outstroke xx"
// 2715 = "Error in SawFinishing : post apply not calculable"
// 2751 = "Warning in SawFinishing : Skipped entity (xx)"
// 2752 = "Warning in SawFinishing : No machinable path"
// 2753 = "Warning in SawFinishing : Tool name changed (xx)"
// 2754 = "Warning in SawFinishing : Tool data changed (xx)"
//----------------------------------------------------------------------------
const std::string MCH_SECTION = "Sect" ;
@@ -452,8 +456,8 @@ SawFinishing::SetGeometry( const SELVECTOR& vIds)
// test sull'entità
int nSubs ;
if ( ! VerifyGeometry( Id, nSubs)) {
string sOut = "Entity " + ToString( Id) + " skipped by SawFinishing" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
string sInfo = "Warning in SawFinishing : Skipped entity " + ToString( Id) ;
m_pMchMgr->SetWarning( 2751, sInfo) ;
continue ;
}
// posso aggiungere alla lista
@@ -591,7 +595,7 @@ SawFinishing::Update( bool bPostApply)
// se lavorazione vuota, esco
if ( m_nCuts == 0) {
LOG_WARN( GetEMkLogger(), "Warning in SawFinishing : No machinable path")
m_pMchMgr->SetWarning( 2752, "Warning in SawFinishing : No machinable path") ;
return true ;
}
@@ -790,15 +794,15 @@ SawFinishing::UpdateToolData( bool* pbChanged)
m_TParams = *pTdata ;
// eventuali segnalazioni
if ( ! EqualNoCase( m_Params.m_sToolName, m_TParams.m_sName)) {
string sLog = "Warning in SawFinishing : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in SawFinishing : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
m_pMchMgr->SetWarning( 2753, sInfo) ;
m_Params.m_sToolName = m_TParams.m_sName ;
}
if ( bChanged) {
string sLog = "Warning in SawFinishing : tool data changed (" +
m_Params.m_sToolName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in SawFinishing : tool data changed (" +
m_Params.m_sToolName + ")" ;
m_pMchMgr->SetWarning( 2754, sInfo) ;
}
// se definito parametro di ritorno, lo assegno
if ( pbChanged != nullptr)
SawRoughing.cpp
+13 -9
View File
@@ -51,6 +51,10 @@ using namespace std ;
// 2613 = "Error in SawRoughing : link movements not calculable"
// 2614 = "Error in SawRoughing : link outstroke xxx"
// 2615 = "Error in SawRoughing : post apply not calculable"
// 2651 = "Warning in SawRoughing : Skipped entity (xx)"
// 2652 = "Warning in SawRoughing : No machinable path"
// 2653 = "Warning in SawRoughing : Tool name changed (xx)"
// 2654 = "Warning in SawRoughing : Tool data changed (xx)"
//----------------------------------------------------------------------------
const std::string MCH_SECTION = "Sect" ;
@@ -435,8 +439,8 @@ SawRoughing::SetGeometry( const SELVECTOR& vIds)
// test sull'entità
int nSubs ;
if ( ! VerifyGeometry( Id, nSubs)) {
string sOut = "Entity " + ToString( Id) + " skipped by SawRoughing" ;
LOG_WARN( GetEMkLogger(), sOut.c_str()) ;
string sInfo = "Warning in SawRoughing : Skipped entity " + ToString( Id) ;
m_pMchMgr->SetWarning( 2651, sInfo) ;
continue ;
}
// posso aggiungere alla lista
@@ -555,7 +559,7 @@ SawRoughing::Update( bool bPostApply)
// se lavorazione vuota, esco
if ( m_nCuts == 0) {
LOG_WARN( GetEMkLogger(), "Warning in SawRoughing : No machinable path")
m_pMchMgr->SetWarning( 2652, "Warning in SawRoughing : No machinable path") ;
return true ;
}
@@ -748,15 +752,15 @@ SawRoughing::UpdateToolData( bool* pbChanged)
m_TParams = *pTdata ;
// eventuali segnalazioni
if ( ! EqualNoCase( m_Params.m_sToolName, m_TParams.m_sName)) {
string sLog = "Warning in SawRoughing : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in SawRoughing : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
m_pMchMgr->SetWarning( 2653, sInfo) ;
m_Params.m_sToolName = m_TParams.m_sName ;
}
if ( bChanged) {
string sLog = "Warning in SawRoughing : tool data changed (" +
m_Params.m_sToolName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in SawRoughing : tool data changed (" +
m_Params.m_sToolName + ")" ;
m_pMchMgr->SetWarning( 2654, sInfo) ;
}
// se definito parametro di ritorno, lo assegno
if ( pbChanged != nullptr)
SurfFinishing.cpp
+16 -12
View File
@@ -57,8 +57,12 @@ using namespace std ;
// 3116 = "Error in SurfFinishing : axes values not calculable"
// 3117 = "Error in SurfFinishing : outstroke xx"
// 3118 = "Error in SurfFinishing : link movements not calculable"
// 3119 = "Error in SurfFinishing : link outstroke xx"
// 3119 = "Error in SurfFinishing : link outstroke"
// 3120 = "Error in SurfFinishing : post apply not calculable"
// 3151 = "Warning in SurfFinishing : Skipped entity (xx)"
// 3152 = "Warning in SurfFinishing : No machinable path"
// 3153 = "Warning in SurfFinishing : Tool name changed (xx)"
// 3154 = "Warning in SurfFinishing : Tool data changed (xx)"
//----------------------------------------------------------------------------
USEROBJ_REGISTER( GetOperationClass( OPER_SURFFINISHING), SurfFinishing) ;
@@ -450,8 +454,8 @@ SurfFinishing::SetGeometry( const SELVECTOR& vIds)
// test sull'entità
int nSubs ;
if ( ! VerifyGeometry( Id, nSubs)) {
string sOut = "Entity " + ToString( Id) + " skipped by SurfFinishing" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
string sInfo = "Warning in SurfFinishing : Skipped entity " + ToString( Id) ;
m_pMchMgr->SetWarning( 3151, sInfo) ;
continue ;
}
// posso aggiungere alla lista
@@ -584,7 +588,7 @@ SurfFinishing::Update( bool bPostApply)
// se lavorazione vuota, esco
if ( m_nPaths == 0) {
LOG_WARN( GetEMkLogger(), "Warning in SurfFinishing : No machinable path")
m_pMchMgr->SetWarning( 3152, "Warning in SurfFinishing : No machinable path") ;
return true ;
}
@@ -789,15 +793,15 @@ SurfFinishing::UpdateToolData( bool* pbChanged)
m_TParams = *pTdata ;
// eventuali segnalazioni
if ( ! EqualNoCase( m_Params.m_sToolName, m_TParams.m_sName)) {
string sLog = "Warning in SurfFinishing : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in SurfFinishing : tool name changed (" +
m_Params.m_sToolName + "->" + m_TParams.m_sName + ")" ;
m_pMchMgr->SetWarning( 3153, sInfo) ;
m_Params.m_sToolName = m_TParams.m_sName ;
}
if ( bChanged) {
string sLog = "Warning in SurfFinishing : tool data changed (" +
m_Params.m_sToolName + ")" ;
LOG_INFO( GetEMkLogger(), sLog.c_str()) ;
string sInfo = "Warning in SurfFinishing : tool data changed (" +
m_Params.m_sToolName + ")" ;
m_pMchMgr->SetWarning( 3154, sInfo) ;
}
// se definito parametro di ritorno, lo assegno
if ( pbChanged != nullptr)
@@ -928,8 +932,8 @@ SurfFinishing::Chain( int nGrpDestId)
// prendo le curve
ICURVEPLIST lstPC ;
if ( ! GetCurves( Id, lstPC)) {
string sOut = "Entity " + ToString( Id) + " skipped by Pocketing" ;
LOG_INFO( GetEMkLogger(), sOut.c_str()) ;
string sInfo = "Warning in SurfFinishing : Skipped entity " + ToString( Id) ;
m_pMchMgr->SetWarning( 3151, sInfo) ;
}
for ( auto pCrv : lstPC) {
vpCrvs.emplace_back( pCrv) ;