EgtMachKernel 1.6k10 :
- sistemazioni varie in grezzi, lavorazioni, ....
This commit is contained in:
Dario Sassi
+53
-13
@@ -34,8 +34,10 @@ enum nSawingKey {
|
||||
KEY_LITY,
|
||||
KEY_LOTY,
|
||||
KEY_NAME,
|
||||
KEY_PS,
|
||||
KEY_SA,
|
||||
KEY_TAF,
|
||||
KEY_ST,
|
||||
KEY_STY,
|
||||
KEY_TNAME,
|
||||
KEY_TUUID,
|
||||
KEY_UUID,
|
||||
@@ -52,8 +54,10 @@ static const std::array<std::string,KEY_ZZZ> sSawingKey = {
|
||||
"LITY",
|
||||
"LOTY",
|
||||
"NAME",
|
||||
"PS",
|
||||
"SA",
|
||||
"TAF",
|
||||
"ST",
|
||||
"STY",
|
||||
"TN",
|
||||
"TU",
|
||||
"UUID",
|
||||
@@ -97,8 +101,10 @@ SawingData::CopyFrom( const MachiningData* pMdata)
|
||||
m_bInvert = pSdata->m_bInvert ;
|
||||
m_nWorkSide = pSdata->m_nWorkSide ;
|
||||
m_nHeadSide = pSdata->m_nHeadSide ;
|
||||
m_bToAndFrom = pSdata->m_bToAndFrom ;
|
||||
m_sDepth = pSdata->m_sDepth ;
|
||||
m_dStartPos = pSdata->m_dStartPos ;
|
||||
m_dStep = pSdata->m_dStep ;
|
||||
m_nStepType = pSdata->m_nStepType ;
|
||||
m_dSideAngle = pSdata->m_dSideAngle ;
|
||||
m_nLeadInType = pSdata->m_nLeadInType ;
|
||||
m_nExtLinkType = pSdata->m_nExtLinkType ;
|
||||
@@ -127,8 +133,10 @@ SawingData::SameAs(const MachiningData* pMdata) const
|
||||
m_bInvert == pSdata->m_bInvert &&
|
||||
m_nWorkSide == pSdata->m_nWorkSide &&
|
||||
m_nHeadSide == pSdata->m_nHeadSide &&
|
||||
m_bToAndFrom == pSdata->m_bToAndFrom &&
|
||||
m_sDepth == pSdata->m_sDepth &&
|
||||
m_dStartPos == pSdata->m_dStartPos &&
|
||||
m_dStep == pSdata->m_dStep &&
|
||||
m_nStepType == pSdata->m_nStepType &&
|
||||
m_dSideAngle == pSdata->m_dSideAngle &&
|
||||
m_nLeadInType == pSdata->m_nLeadInType &&
|
||||
m_nExtLinkType == pSdata->m_nExtLinkType &&
|
||||
@@ -203,11 +211,17 @@ SawingData::FromString( const string& sString, int& nKey)
|
||||
m_sName = sVal ;
|
||||
bOk = ! m_sName.empty() ;
|
||||
break ;
|
||||
case KEY_PS :
|
||||
bOk = ::FromString( sVal, m_dStartPos) ;
|
||||
break ;
|
||||
case KEY_SA :
|
||||
bOk = ::FromString( sVal, m_dSideAngle) ;
|
||||
break ;
|
||||
case KEY_TAF :
|
||||
bOk = ::FromString( sVal, m_bToAndFrom) ;
|
||||
case KEY_ST :
|
||||
bOk = ::FromString( sVal, m_dStep) ;
|
||||
break ;
|
||||
case KEY_STY :
|
||||
bOk = ::FromString( sVal, m_nStepType) ;
|
||||
break ;
|
||||
case KEY_TNAME :
|
||||
m_sToolName = sVal ;
|
||||
@@ -242,8 +256,10 @@ SawingData::ToString( int nInd) const
|
||||
case KEY_LITY : return ( sSawingKey[KEY_LITY] + "=" + ::ToString( m_nLeadInType)) ;
|
||||
case KEY_LOTY : return ( sSawingKey[KEY_LOTY] + "=" + ::ToString( m_nLeadOutType)) ;
|
||||
case KEY_NAME : return ( sSawingKey[KEY_NAME] + "=" + m_sName) ;
|
||||
case KEY_PS : return ( sSawingKey[KEY_PS] + "=" + ::ToString( m_dStartPos)) ;
|
||||
case KEY_SA : return ( sSawingKey[KEY_SA] + "=" + ::ToString( m_dSideAngle)) ;
|
||||
case KEY_TAF : return ( sSawingKey[KEY_TAF] + "=" + ::ToString( m_bToAndFrom)) ;
|
||||
case KEY_ST : return ( sSawingKey[KEY_ST] + "=" + ::ToString( m_dStep)) ;
|
||||
case KEY_STY : return ( sSawingKey[KEY_STY] + "=" + ::ToString( m_nStepType)) ;
|
||||
case KEY_TNAME : return ( sSawingKey[KEY_TNAME] + "=" + m_sToolName) ;
|
||||
case KEY_TUUID : return ( sSawingKey[KEY_TUUID] + "=" + ::ToString( m_ToolUuid)) ;
|
||||
case KEY_UUID : return ( sSawingKey[KEY_UUID] + "=" + ::ToString( m_Uuid)) ;
|
||||
@@ -266,6 +282,13 @@ SawingData::VerifyHeadSide( int nVal) const
|
||||
return ( nVal == SAW_HS_LEFT || nVal == SAW_HS_RIGHT) ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
bool
|
||||
SawingData::VerifyStepType( int nVal) const
|
||||
{
|
||||
return ( nVal == SAW_ST_ZIGZAG || nVal == SAW_ST_ONEWAY || nVal == SAW_ST_TOANDFROM) ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
bool
|
||||
SawingData::VerifyLeadInType( int nVal) const
|
||||
@@ -327,9 +350,6 @@ SawingData::SetParam( int nType, bool bVal)
|
||||
case MPA_INVERT :
|
||||
m_bInvert = bVal ;
|
||||
return true ;
|
||||
case MPA_TOANDFROM :
|
||||
m_bToAndFrom = bVal ;
|
||||
return true ;
|
||||
}
|
||||
return false ;
|
||||
}
|
||||
@@ -349,6 +369,11 @@ SawingData::SetParam( int nType, int nVal)
|
||||
return false ;
|
||||
m_nHeadSide = nVal ;
|
||||
return true ;
|
||||
case MPA_STEPTYPE :
|
||||
if ( ! VerifyStepType( nVal))
|
||||
return false ;
|
||||
m_nStepType = nVal ;
|
||||
return true ;
|
||||
case MPA_LEADINTYPE :
|
||||
if ( ! VerifyLeadInType( nVal))
|
||||
return false ;
|
||||
@@ -381,6 +406,12 @@ SawingData::SetParam( int nType, double dVal)
|
||||
case MPA_DEPTH :
|
||||
m_sDepth = ::ToString( dVal) ;
|
||||
return true ;
|
||||
case MPA_STARTPOS :
|
||||
m_dStartPos = dVal ;
|
||||
return true ;
|
||||
case MPA_STEP :
|
||||
m_dStep = dVal ;
|
||||
return true ;
|
||||
case MPA_SIDEANGLE :
|
||||
if ( ! VerifySideAngle( dVal))
|
||||
return false ;
|
||||
@@ -423,9 +454,6 @@ SawingData::GetParam( int nType, bool& bVal) const
|
||||
case MPA_INVERT :
|
||||
bVal = m_bInvert ;
|
||||
return true ;
|
||||
case MPA_TOANDFROM :
|
||||
bVal = m_bToAndFrom ;
|
||||
return true ;
|
||||
}
|
||||
return false ;
|
||||
}
|
||||
@@ -435,12 +463,18 @@ bool
|
||||
SawingData::GetParam( int nType, int& nVal) const
|
||||
{
|
||||
switch ( nType) {
|
||||
case MPA_TYPE :
|
||||
nVal = MT_SAWING ;
|
||||
return true ;
|
||||
case MPA_WORKSIDE :
|
||||
nVal = m_nWorkSide ;
|
||||
return true ;
|
||||
case MPA_HEADSIDE :
|
||||
nVal = m_nHeadSide ;
|
||||
return true ;
|
||||
case MPA_STEPTYPE :
|
||||
nVal = m_nStepType ;
|
||||
return true ;
|
||||
case MPA_LEADINTYPE :
|
||||
nVal = m_nLeadInType ;
|
||||
return true ;
|
||||
@@ -462,6 +496,12 @@ bool
|
||||
SawingData::GetParam( int nType, double& dVal) const
|
||||
{
|
||||
switch ( nType) {
|
||||
case MPA_STARTPOS :
|
||||
dVal = m_dStartPos ;
|
||||
return true ;
|
||||
case MPA_STEP :
|
||||
dVal = m_dStep ;
|
||||
return true ;
|
||||
case MPA_SIDEANGLE :
|
||||
dVal = m_dSideAngle ;
|
||||
return true ;
|
||||
|
||||
Reference in New Issue
Block a user