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
MachMgrMachines.cpp
+7 -9
View File
@@ -615,18 +615,18 @@ MachMgr::VerifyAngleOutstroke( int nInd, double dAng) const
//----------------------------------------------------------------------------
bool
MachMgr::VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat)
MachMgr::VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) const
{
DBLVECTOR vAng(2) ; vAng[0] = dAngA ; vAng[1] = dAngB ;
return VerifyOutstroke( dX, dY, dZ, vAng, nStat) ;
return VerifyOutstroke( dX, dY, dZ, vAng, true, nStat) ;
}
//----------------------------------------------------------------------------
bool
MachMgr::VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, int& nStat)
MachMgr::VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, bool bClear, int& nStat) const
{
Machine* pMch = GetCurrMachine() ;
return ( ( pMch != nullptr) ? pMch->VerifyOutstroke( dX, dY, dZ, vAng, nStat) : false) ;
return ( ( pMch != nullptr) ? pMch->VerifyOutstroke( dX, dY, dZ, vAng, bClear, nStat) : false) ;
}
//----------------------------------------------------------------------------
@@ -634,10 +634,8 @@ std::string
MachMgr::GetOutstrokeInfo( bool bMM) const
{
Machine* pMch = GetCurrMachine() ;
if ( pMch == nullptr) {
static string sNull = "" ;
return sNull ;
}
if ( pMch == nullptr)
return "" ;
return pMch->GetOutstrokeInfo( bMM) ;
}
@@ -651,7 +649,7 @@ MachMgr::SetMachineLook( int nFlag)
//----------------------------------------------------------------------------
int
MachMgr::GetMachineLook( void)
MachMgr::GetMachineLook( void) const
{
Machine* pMch = GetCurrMachine() ;
if ( pMch == nullptr)