EgtMachKernel :

- modifiche a Sawing.
This commit is contained in:
Dario Sassi
2015-06-21 16:58:49 +00:00
parent b96b43e1ec
commit cbf728b458
11 changed files with 506 additions and 83 deletions
+34 -9
View File
@@ -23,29 +23,37 @@ using namespace std ;
//----------------------------------------------------------------------------
enum nSawingKey {
KEY_DH = 0,
KEY_APPR = 0,
KEY_CRV,
KEY_DH,
KEY_HS,
KEY_INV,
KEY_LETY,
KEY_LITY,
KEY_LOTY,
KEY_NAME,
KEY_SA,
KEY_TAF,
KEY_TNAME,
KEY_TUUID,
KEY_TY,
KEY_UUID,
KEY_WS,
KEY_ZZZ} ; // rappresenta il numero di elementi
static const std::array<std::string,KEY_ZZZ> sSawingKey = {
"APPR",
"CRV",
"DH",
"HS",
"INV",
"LETY",
"LITY",
"LOTY",
"NAME",
"SA",
"TAF",
"TN",
"TU",
"TY",
"UUID",
"WS"} ;
@@ -88,8 +96,15 @@ SawingData::FromString( const string& sString, int& nKey)
nKey = FindSawingKey( ToUpper( sKey)) ;
bool bOk = ( nKey >= 0) ;
switch ( nKey) {
case KEY_APPR :
bOk = ::FromString( sVal, m_dApprox) ;
break ;
case KEY_CRV :
bOk = ::FromString( sVal, m_nCurveUse) ;
break ;
case KEY_DH :
bOk = ::FromString( sVal, m_dDepth) ;
m_sDepth = sVal ;
bOk = ! m_sDepth.empty() ;
break ;
case KEY_HS :
bOk = ::FromString( sVal, m_nHeadSide) ;
@@ -97,6 +112,15 @@ SawingData::FromString( const string& sString, int& nKey)
case KEY_INV :
bOk = ::FromString( sVal, m_bInvert) ;
break ;
case KEY_LETY :
bOk = ::FromString( sVal, m_nExtLinkType) ;
break ;
case KEY_LITY :
bOk = ::FromString( sVal, m_nLeadInType) ;
break ;
case KEY_LOTY :
bOk = ::FromString( sVal, m_nLeadOutType) ;
break ;
case KEY_NAME :
m_sName = sVal ;
bOk = ! m_sName.empty() ;
@@ -114,9 +138,6 @@ SawingData::FromString( const string& sString, int& nKey)
case KEY_TUUID :
bOk = ::FromString( sVal, m_ToolUuid) ;
break ;
case KEY_TY :
bOk = ::FromString( sVal, m_nType) ;
break ;
case KEY_UUID :
bOk = ::FromString( sVal, m_Uuid) ;
break ;
@@ -135,15 +156,19 @@ string
SawingData::ToString( int nInd) const
{
switch ( nInd) {
case KEY_DH : return ( sSawingKey[KEY_DH] + "=" + ::ToString( m_dDepth)) ;
case KEY_APPR : return ( sSawingKey[KEY_APPR] + "=" + ::ToString( m_dApprox)) ;
case KEY_CRV : return ( sSawingKey[KEY_CRV] + "=" + ::ToString( m_nCurveUse)) ;
case KEY_DH : return ( sSawingKey[KEY_DH] + "=" + m_sDepth) ;
case KEY_HS : return ( sSawingKey[KEY_HS] + "=" + ::ToString( m_nHeadSide)) ;
case KEY_INV : return ( sSawingKey[KEY_INV] + "=" + ::ToString( m_bInvert)) ;
case KEY_LETY : return ( sSawingKey[KEY_LETY] + "=" + ::ToString( m_nExtLinkType)) ;
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_SA : return ( sSawingKey[KEY_SA] + "=" + ::ToString( m_dSideAngle)) ;
case KEY_TAF : return ( sSawingKey[KEY_TAF] + "=" + ::ToString( m_bToAndFro)) ;
case KEY_TNAME : return ( sSawingKey[KEY_TNAME] + "=" + m_sToolName) ;
case KEY_TUUID : return ( sSawingKey[KEY_TUUID] + "=" + ::ToString( m_ToolUuid)) ;
case KEY_TY : return ( sSawingKey[KEY_TY] + "=" + ::ToString( m_nType)) ;
case KEY_UUID : return ( sSawingKey[KEY_UUID] + "=" + ::ToString( m_Uuid)) ;
case KEY_WS : return ( sSawingKey[KEY_WS] + "=" + ::ToString( m_nWorkSide)) ;
default : return "" ;