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

EgtMachKernel :

Browse Source 
- in taglio di lama aggiunta feed per passata di ritorno.
This commit is contained in:
Dario Sassi
2018-05-28 13:20:33 +00:00
parent a51f7119c9
commit b5833ab37c
6 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SawingData.cpp
+15 -1
View File
@@ -33,6 +33,7 @@ enum nSawingKey {
KEY_DH,
KEY_EAL,
KEY_F,
KEY_FB,
KEY_FE,
KEY_FS,
KEY_FT,
@@ -72,6 +73,7 @@ static const std::array<std::string,KEY_ZZZ> sSawingKey = {
"DH",
"EAL",
"F",
"FB",
"FE",
"FS",
"FT",
@@ -145,6 +147,7 @@ SawingData::CopyFrom( const MachiningData* pMdata)
m_dEndFeed = pSdata->m_dEndFeed ;
m_dStartFeed = pSdata->m_dStartFeed ;
m_dTipFeed = pSdata->m_dTipFeed ;
m_dBackFeed = pSdata->m_dBackFeed ;
m_dOffsL = pSdata->m_dOffsL ;
m_dOffsR = pSdata->m_dOffsR ;
m_bInvert = pSdata->m_bInvert ;
@@ -196,6 +199,7 @@ SawingData::SameAs(const MachiningData* pMdata) const
AreSameLenValue( m_dEndFeed, pSdata->m_dEndFeed) &&
AreSameLenValue( m_dStartFeed, pSdata->m_dStartFeed) &&
AreSameLenValue( m_dTipFeed, pSdata->m_dTipFeed) &&
AreSameLenValue( m_dBackFeed, pSdata->m_dBackFeed) &&
AreSameLenValue( m_dOffsL, pSdata->m_dOffsL) &&
AreSameLenValue( m_dOffsR, pSdata->m_dOffsR) &&
m_bInvert == pSdata->m_bInvert &&
@@ -281,6 +285,9 @@ SawingData::FromString( const string& sString, int& nKey)
case KEY_F :
bOk = ::FromString( sVal, m_dFeed) ;
break ;
case KEY_FB :
bOk = ::FromString( sVal, m_dBackFeed) ;
break ;
case KEY_FE :
bOk = ::FromString( sVal, m_dEndFeed) ;
break ;
@@ -388,6 +395,7 @@ SawingData::ToString( int nInd) const
case KEY_DH : return ( sSawingKey[KEY_DH] + "=" + m_sDepth) ;
case KEY_EAL : return ( sSawingKey[KEY_EAL] + "=" + ::ToString( m_dEndAddLen)) ;
case KEY_F : return ( sSawingKey[KEY_F] + "=" + ::ToString( m_dFeed)) ;
case KEY_FB : return ( sSawingKey[KEY_FB] + "=" + ::ToString( m_dBackFeed)) ;
case KEY_FE : return ( sSawingKey[KEY_FE] + "=" + ::ToString( m_dEndFeed)) ;
case KEY_FS : return ( sSawingKey[KEY_FS] + "=" + ::ToString( m_dStartFeed)) ;
case KEY_FT : return ( sSawingKey[KEY_FT] + "=" + ::ToString( m_dTipFeed)) ;
@@ -426,7 +434,7 @@ bool
SawingData::IsOptional( int nKey) const
{
return ( nKey == KEY_AB || nKey == KEY_AI ||
nKey == KEY_F || nKey == KEY_FE || nKey == KEY_FS || nKey == KEY_FT ||
nKey == KEY_F || nKey == KEY_FB || nKey == KEY_FE || nKey == KEY_FS || nKey == KEY_FT ||
nKey == KEY_NNS || nKey == KEY_NNU || nKey == KEY_OL || nKey == KEY_OR ||
nKey == KEY_S || nKey == KEY_SCC || nKey == KEY_STB || nKey == KEY_STEA || nKey == KEY_STIA ||
nKey == KEY_STSA || nKey == KEY_STSAB) ;
@@ -605,6 +613,9 @@ SawingData::SetParam( int nType, double dVal)
case MPA_TIPFEED :
m_dTipFeed = dVal ;
return true ;
case MPA_BACKFEED :
m_dBackFeed = dVal ;
return true ;
case MPA_OFFSL :
m_dOffsL = dVal ;
return true ;
@@ -766,6 +777,9 @@ SawingData::GetParam( int nType, double& dVal) const
case MPA_TIPFEED :
dVal = m_dTipFeed ;
return true ;
case MPA_BACKFEED :
dVal = m_dBackFeed ;
return true ;
case MPA_OFFSL :
dVal = m_dOffsL ;
return true ;