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

EgtMachKernel :

Browse Source 
- in svuotature gestione SpiralIn e SpiralOut ottimizzate per cerchi
- in svuotatura aggiunti attacchi zigzag e elica e uscita Glide
- in contornatura miglioramenti vari.
This commit is contained in:
Dario Sassi
2017-02-20 18:28:57 +00:00
parent 11df3f63f6
commit 2d0ea787fa
17 changed files with 825 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PocketingData.cpp
+16 -2
View File
@@ -32,6 +32,7 @@ enum nPocketingKey {
KEY_FS,
KEY_FT,
KEY_INV,
KEY_LIEL,
KEY_LITG,
KEY_LITY,
KEY_LOTG,
@@ -60,6 +61,7 @@ static const std::array<std::string,KEY_ZZZ> sPocketingKey = {
"FS",
"FT",
"INV",
"LIEL",
"LITG",
"LITY",
"LOTG",
@@ -132,6 +134,7 @@ PocketingData::CopyFrom( const MachiningData* pMdata)
m_dSideAngle = pSdata->m_dSideAngle ;
m_nLeadInType = pSdata->m_nLeadInType ;
m_dLiTang = pSdata->m_dLiTang ;
m_dLiElev = pSdata->m_dLiElev ;
m_nLeadOutType = pSdata->m_nLeadOutType ;
m_dLoTang = pSdata->m_dLoTang ;
m_sSysNotes = pSdata->m_sSysNotes ;
@@ -172,6 +175,7 @@ PocketingData::SameAs(const MachiningData* pMdata) const
abs( m_dSideAngle - pSdata->m_dSideAngle) < EPS_MACH_ANG_PAR &&
m_nLeadInType == pSdata->m_nLeadInType &&
abs( m_dLiTang - pSdata->m_dLiTang) < EPS_MACH_LEN_PAR &&
abs( m_dLiElev - pSdata->m_dLiElev) < EPS_MACH_LEN_PAR &&
m_nLeadOutType == pSdata->m_nLeadOutType &&
abs( m_dLoTang - pSdata->m_dLoTang) < EPS_MACH_LEN_PAR &&
m_sSysNotes == pSdata->m_sSysNotes &&
@@ -234,6 +238,9 @@ PocketingData::FromString( const string& sString, int& nKey)
case KEY_INV :
bOk = ::FromString( sVal, m_bInvert) ;
break ;
case KEY_LIEL :
bOk = ::FromString( sVal, m_dLiElev) ;
break ;
case KEY_LITG :
bOk = ::FromString( sVal, m_dLiTang) ;
break ;
@@ -310,6 +317,7 @@ PocketingData::ToString( int nInd) const
case KEY_FS : return ( sPocketingKey[KEY_FS] + "=" + ::ToString( m_dStartFeed)) ;
case KEY_FT : return ( sPocketingKey[KEY_FT] + "=" + ::ToString( m_dTipFeed)) ;
case KEY_INV : return ( sPocketingKey[KEY_INV] + "=" + ::ToString( m_bInvert)) ;
case KEY_LIEL : return ( sPocketingKey[KEY_LIEL] + "=" + ::ToString( m_dLiElev)) ;
case KEY_LITG : return ( sPocketingKey[KEY_LITG] + "=" + ::ToString( m_dLiTang)) ;
case KEY_LITY : return ( sPocketingKey[KEY_LITY] + "=" + ::ToString( m_nLeadInType)) ;
case KEY_LOTG : return ( sPocketingKey[KEY_LOTG] + "=" + ::ToString( m_dLoTang)) ;
@@ -337,7 +345,7 @@ PocketingData::ToString( int nInd) const
bool
PocketingData::IsOptional( int nKey) const
{
return false ;
return ( nKey == KEY_LIEL) ;
}
//----------------------------------------------------------------------------
@@ -367,7 +375,7 @@ PocketingData::VerifyLeadInType( int nVal) const
bool
PocketingData::VerifyLeadOutType( int nVal) const
{
return ( nVal == POCKET_LO_NONE || nVal == MILL_LO_GLIDE) ;
return ( nVal == POCKET_LO_NONE || nVal == POCKET_LO_GLIDE) ;
}
//----------------------------------------------------------------------------
@@ -479,6 +487,9 @@ PocketingData::SetParam( int nType, double dVal)
case MPA_LITANG :
m_dLiTang = dVal ;
return true ;
case MPA_LIELEV :
m_dLiElev = dVal ;
return true ;
case MPA_LOTANG :
m_dLoTang = dVal ;
return true ;
@@ -602,6 +613,9 @@ PocketingData::GetParam( int nType, double& dVal) const
case MPA_LITANG :
dVal = m_dLiTang ;
return true ;
case MPA_LIELEV :
dVal = m_dLiElev ;
return true ;
case MPA_LOTANG :
dVal = m_dLoTang ;
return true ;