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

EgtMachKernel :

Browse Source 
- migliorie varie alla lavorazione di finitura superfici.
This commit is contained in:
Dario Sassi
2019-06-08 07:46:55 +00:00
parent 6419871675
commit 62e2e8aae8
4 changed files with 165 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SurfFinishingData.cpp
+15 -1
View File
@@ -46,6 +46,7 @@ enum nSurfFinishingKey {
KEY_NNS,
KEY_NNU,
KEY_OR,
KEY_OVL,
KEY_PS,
KEY_S,
KEY_SA,
@@ -78,6 +79,7 @@ static const std::array<std::string,KEY_ZZZ> sSurfFinishingKey = {
"NNS",
"NNU",
"OR",
"OVL",
"PS",
"S",
"SA",
@@ -135,6 +137,7 @@ SurfFinishingData::CopyFrom( const MachiningData* pMdata)
m_bInvert = pSdata->m_bInvert ;
m_sDepth = pSdata->m_sDepth ;
m_dStartPos = pSdata->m_dStartPos ;
m_dOverlap = pSdata->m_dOverlap ;
m_dSideStep = pSdata->m_dSideStep ;
m_nSubType = pSdata->m_nSubType ;
m_dSideAngle = pSdata->m_dSideAngle ;
@@ -179,6 +182,7 @@ SurfFinishingData::SameAs(const MachiningData* pMdata) const
m_bInvert == pSdata->m_bInvert &&
m_sDepth == pSdata->m_sDepth &&
abs( m_dStartPos - pSdata->m_dStartPos) < EPS_MACH_LEN_PAR &&
abs( m_dOverlap - pSdata->m_dOverlap) < EPS_MACH_LEN_PAR &&
abs( m_dSideStep - pSdata->m_dSideStep) < EPS_MACH_LEN_PAR &&
m_nSubType == pSdata->m_nSubType &&
abs( m_dSideAngle - pSdata->m_dSideAngle) < EPS_MACH_ANG_PAR &&
@@ -293,6 +297,9 @@ SurfFinishingData::FromString( const string& sString, int& nKey)
case KEY_OR :
bOk = ::FromString( sVal, m_dOffsR) ;
break ;
case KEY_OVL :
bOk = ::FromString( sVal, m_dOverlap) ;
break ;
case KEY_PS :
bOk = ::FromString( sVal, m_dStartPos) ;
break ;
@@ -352,6 +359,7 @@ SurfFinishingData::ToString( int nInd) const
case KEY_NNS : return ( sSurfFinishingKey[KEY_NNS] + "=" + m_sSysNotes) ;
case KEY_NNU : return ( sSurfFinishingKey[KEY_NNU] + "=" + m_sUserNotes) ;
case KEY_OR : return ( sSurfFinishingKey[KEY_OR] + "=" + ::ToString( m_dOffsR)) ;
case KEY_OVL : return ( sSurfFinishingKey[KEY_OVL] + "=" + ::ToString( m_dOverlap)) ;
case KEY_PS : return ( sSurfFinishingKey[KEY_PS] + "=" + ::ToString( m_dStartPos)) ;
case KEY_S : return ( sSurfFinishingKey[KEY_S] + "=" + ::ToString( m_dSpeed)) ;
case KEY_SA : return ( sSurfFinishingKey[KEY_SA] + "=" + ::ToString( m_dSideAngle)) ;
@@ -369,7 +377,7 @@ SurfFinishingData::ToString( int nInd) const
bool
SurfFinishingData::IsOptional( int nKey) const
{
return ( nKey == KEY_AB || nKey == KEY_AI) ;
return ( nKey == KEY_AB || nKey == KEY_AI || nKey == KEY_OVL) ;
}
//----------------------------------------------------------------------------
@@ -509,6 +517,9 @@ SurfFinishingData::SetParam( int nType, double dVal)
case MPA_STARTPOS :
m_dStartPos = dVal ;
return true ;
case MPA_OVERL :
m_dOverlap = dVal ;
return true ;
case MPA_SIDESTEP :
m_dSideStep = dVal ;
return true ;
@@ -644,6 +655,9 @@ SurfFinishingData::GetParam( int nType, double& dVal) const
case MPA_STARTPOS :
dVal = m_dStartPos ;
return true ;
case MPA_OVERL :
dVal = m_dOverlap ;
return true ;
case MPA_SIDESTEP :
dVal = m_dSideStep ;
return true ;