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

EgtMachKernel 1.6j5 :

Browse Source 
- aggiunta gestione versione del DB utensili
- aggiunti 3 parametri agli utensili (coolant, maxAbsorption, minfeed).
This commit is contained in:
Dario Sassi
2015-10-31 19:12:17 +00:00
parent 8482af09c6
commit 05b5c993ac
5 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ToolData.cpp
+40 -2
View File
@@ -25,7 +25,9 @@ using namespace std ;
//----------------------------------------------------------------------------
enum nToolKey {
TK_COR = 0,
TK_ABSMAX = 0,
TK_COOLANT,
TK_COR,
TK_CRAD,
TK_D,
TK_DRAW,
@@ -33,6 +35,7 @@ enum nToolKey {
TK_EXI,
TK_F,
TK_FE,
TK_FM,
TK_FS,
TK_FT,
TK_HEA,
@@ -54,6 +57,8 @@ enum nToolKey {
TK_ZZZ} ; // rappresenta il numero di elementi
static const std::array<std::string,TK_ZZZ> sToolKey = {
"ABSMAX",
"COOLANT",
"COR",
"CRAD",
"D",
@@ -62,6 +67,7 @@ static const std::array<std::string,TK_ZZZ> sToolKey = {
"EXI",
"F",
"FE",
"FM",
"FS",
"FT",
"HEA",
@@ -83,7 +89,7 @@ static const std::array<std::string,TK_ZZZ> sToolKey = {
//----------------------------------------------------------------------------
int
ToolData::GetSize( void) const
ToolData::GetSize( void)
{
// in debug verifico validità ultimo campo
assert( sToolKey[TK_UUID] == "UUID") ;
@@ -111,6 +117,12 @@ ToolData::FromString( const string& sString, int& nKey)
nKey = FindToolKey( ToUpper( sKey)) ;
bool bOk = ( nKey >= 0) ;
switch ( nKey) {
case TK_ABSMAX :
bOk = ::FromString( sVal, m_dMaxAbsorption) ;
break ;
case TK_COOLANT :
bOk = ::FromString( sVal, m_nCoolant) ;
break ;
case TK_COR :
bOk = ::FromString( sVal, m_nCorr) ;
break ;
@@ -135,6 +147,9 @@ ToolData::FromString( const string& sString, int& nKey)
case TK_FE :
bOk = ::FromString( sVal, m_dEndFeed) ;
break ;
case TK_FM :
bOk = ::FromString( sVal, m_dMinFeed) ;
break ;
case TK_FS :
bOk = ::FromString( sVal, m_dStartFeed) ;
break ;
@@ -202,6 +217,8 @@ string
ToolData::ToString( int nInd) const
{
switch ( nInd) {
case TK_ABSMAX : return ( sToolKey[TK_ABSMAX] + "=" + ::ToString( m_dMaxAbsorption)) ;
case TK_COOLANT : return ( sToolKey[TK_COOLANT] + "=" + ::ToString( m_nCoolant)) ;
case TK_COR : return ( sToolKey[TK_COR] + "=" + ::ToString( m_nCorr)) ;
case TK_CRAD : return ( sToolKey[TK_CRAD] + "=" + ::ToString( m_dCornRad)) ;
case TK_D : return ( sToolKey[TK_D] + "=" + ::ToString( m_dDiam)) ;
@@ -210,6 +227,7 @@ ToolData::ToString( int nInd) const
case TK_EXI : return ( sToolKey[TK_EXI] + "=" + ::ToString( m_nExit)) ;
case TK_F : return ( sToolKey[TK_F] + "=" + ::ToString( m_dFeed)) ;
case TK_FE : return ( sToolKey[TK_FE] + "=" + ::ToString( m_dEndFeed)) ;
case TK_FM : return ( sToolKey[TK_FM] + "=" + ::ToString( m_dMinFeed)) ;
case TK_FS : return ( sToolKey[TK_FS] + "=" + ::ToString( m_dStartFeed)) ;
case TK_FT : return ( sToolKey[TK_FT] + "=" + ::ToString( m_dTipFeed)) ;
case TK_HEA : return ( sToolKey[TK_HEA] + "=" + m_sHead) ;
@@ -255,6 +273,9 @@ ToolData::SetParam( int nType, int nVal)
return false ;
m_nType = nVal ;
return true ;
case TPA_COOLANT :
m_nCoolant = nVal ;
return true ;
}
return false ;
}
@@ -301,6 +322,8 @@ ToolData::SetParam( int nType, double dVal)
m_dOffsR = dVal ;
return true ;
case TPA_SPEED :
if ( ! VerifySpeed( dVal))
return false ;
m_dSpeed = dVal ;
return true ;
case TPA_SIDEANG :
@@ -312,6 +335,12 @@ ToolData::SetParam( int nType, double dVal)
case TPA_THICK :
m_dThick = dVal ;
return true ;
case TPA_MAXABSORPTION :
m_dMaxAbsorption = dVal ;
return true ;
case TPA_MINFEED :
m_dMinFeed = dVal ;
return true ;
}
return false ;
}
@@ -359,6 +388,9 @@ ToolData::GetParam( int nType, int& nVal) const
case TPA_TYPE :
nVal = m_nType ;
return true ;
case TPA_COOLANT :
nVal = m_nCoolant ;
return true ;
}
return false ;
}
@@ -416,6 +448,12 @@ ToolData::GetParam( int nType, double& dVal) const
case TPA_THICK :
dVal = m_dThick ;
return true ;
case TPA_MAXABSORPTION :
dVal = m_dMaxAbsorption ;
return true ;
case TPA_MINFEED :
dVal = m_dMinFeed ;
return true ;
}
return false ;
}