EgtMachKernel 1.8g5 :

- migliorata segnalazione extra corse.
This commit is contained in:
Dario Sassi
2017-07-21 13:01:52 +00:00
parent 6a06ca7290
commit d7c7547cd3
18 changed files with 253 additions and 162 deletions
+15 -5
View File
@@ -35,8 +35,10 @@ using namespace std ;
// 2802 = "Error in GenMachining : missing Script (xxx)"
// 2803 = "Error in GenMachining : Error in xxx (nnn)"
// 2804 = "Error in GenMachining : axes values not calculable"
// 2805 = "Error in GenMachining : link movements not calculable"
// 2806 = "Error in GenMachining : post apply not calculable"
// 2805 = "Error in GenMachining : outstroke xx"
// 2806 = "Error in GenMachining : link movements not calculable"
// 2807 = "Error in GenMachining : link outstroke xx"
// 2808 = "Error in GenMachining : post apply not calculable"
//------------------------------ Constants -----------------------------------
static const string EMC_VAR = "EMC" ; // tabella variabili locali per calcolo
@@ -569,7 +571,11 @@ GenMachining::Update( void)
if ( ! m_Params.m_sInitAngs.empty())
sHint = m_Params.m_sInitAngs ;
if ( ! CalculateAxesValues( sHint)) {
m_pMchMgr->SetLastError( 2804, "Error in GenMachining : axes values not calculable") ;
string sInfo = m_pMchMgr->GetOutstrokeInfo() ;
if ( sInfo.empty())
m_pMchMgr->SetLastError( 2804, "Error in GenMachining : axes values not calculable") ;
else
m_pMchMgr->SetLastError( 2805, "Error in GenMachining : outstroke ") ;
return false ;
}
@@ -577,13 +583,17 @@ GenMachining::Update( void)
bool bVpl = true ;
FromString( ExtractInfo( m_Params.m_sUserNotes, "Vpl:"), bVpl) ;
if ( ! AdjustStartEndMovements( bVpl)) {
m_pMchMgr->SetLastError( 2805, "Error in GenMachining : link movements not calculable") ;
string sInfo = m_pMchMgr->GetOutstrokeInfo() ;
if ( sInfo.empty())
m_pMchMgr->SetLastError( 2806, "Error in GenMachining : link movements not calculable") ;
else
m_pMchMgr->SetLastError( 2807, "Error in GenMachining : link outstroke ") ;
return false ;
}
// esecuzione eventuali personalizzazioni
if ( ! PostApply()) {
m_pMchMgr->SetLastError( 2806, "Error in GenMachining : post apply not calculable") ;
m_pMchMgr->SetLastError( 2808, "Error in GenMachining : post apply not calculable") ;
return false ;
}