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

EgtMachKernel 1.8g5 :

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
MachineCalc.cpp
+7 -2
View File
@@ -1226,11 +1226,12 @@ Machine::VerifyAngleOutstroke( int nInd, double dAng) const
//----------------------------------------------------------------------------
bool
Machine::VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, int& nStat) const
Machine::VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, bool bClear, int& nStat) const
{
// default tutto ok
nStat = 0 ;
m_OutstrokeInfo.Clear() ;
if ( bClear)
m_OutstrokeInfo.Clear() ;
// verifica degli assi lineari
DBLVECTOR vLin( 3) ; vLin[0] = dX ; vLin[1] = dY ; vLin[2] = dZ ;
for ( size_t i = 0 ; i < m_vCalcLinAx.size() && i < vLin.size() ; ++ i) {
@@ -1277,6 +1278,10 @@ Machine::VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng
std::string
Machine::GetOutstrokeInfo( bool bMM) const
{
// se non c'è extracorsa, ritorno stringa vuota
if ( m_OutstrokeInfo.sAxName.empty())
return "" ;
// creo stringa con info opportune
if ( bMM || ! m_OutstrokeInfo.bLinear)
return m_OutstrokeInfo.sAxToken + "=" + ToString( m_OutstrokeInfo.dExtra, 1) + m_OutstrokeInfo.sAuxInfo ;
else