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

EgtMachKernel 1.8c3 :

Browse Source 
- prima versione funzionante di lavorazione generica con script lua
- corretta funzione per Lua EmtAddArcMove
- aggiunta VerifyAngleOutstroke
- corretta assegnazione valore precedente ad asse indeterminato
- corretta assegnazione angoli tenendo conto dei precedenti durante lavorazione.
This commit is contained in:
Dario Sassi
2017-03-08 19:47:08 +00:00
parent 0b1fe4b106
commit 6fce5b366d
16 changed files with 163 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GenMachiningData.cpp
+14
View File
@@ -40,6 +40,7 @@ enum nGenMachiningKey {
KEY_PS,
KEY_S,
KEY_SCC,
KEY_SUBTYPE,
KEY_TNAME,
KEY_TUUID,
KEY_UUID,
@@ -60,6 +61,7 @@ static const std::array<std::string,KEY_ZZZ> sGenMachiningKey = {
"PS",
"S",
"SCC",
"SUB",
"TN",
"TU",
"UUID"} ;
@@ -110,6 +112,7 @@ GenMachiningData::CopyFrom( const MachiningData* pMdata)
m_bInvert = pGdata->m_bInvert ;
m_sDepth = pGdata->m_sDepth ;
m_dStartPos = pGdata->m_dStartPos ;
m_nSubType = pGdata->m_nSubType ;
m_sSysNotes = pGdata->m_sSysNotes ;
m_sUserNotes = pGdata->m_sUserNotes ;
return true ;
@@ -142,6 +145,7 @@ GenMachiningData::SameAs(const MachiningData* pMdata) const
m_bInvert == pGdata->m_bInvert &&
m_sDepth == pGdata->m_sDepth &&
abs( m_dStartPos - pGdata->m_dStartPos) < EPS_MACH_LEN_PAR &&
m_nSubType == pGdata->m_nSubType &&
m_sSysNotes == pGdata->m_sSysNotes &&
m_sUserNotes == pGdata->m_sUserNotes) ;
}
@@ -227,6 +231,9 @@ GenMachiningData::FromString( const string& sString, int& nKey)
case KEY_SCC :
bOk = ::FromString( sVal, m_nSolCh) ;
break ;
case KEY_SUBTYPE :
bOk = ::FromString( sVal, m_nSubType) ;
break ;
case KEY_TNAME :
m_sToolName = sVal ;
break ;
@@ -262,6 +269,7 @@ GenMachiningData::ToString( int nKey) const
case KEY_PS : return ( sGenMachiningKey[KEY_PS] + "=" + ::ToString( m_dStartPos)) ;
case KEY_S : return ( sGenMachiningKey[KEY_S] + "=" + ::ToString( m_dSpeed)) ;
case KEY_SCC : return ( sGenMachiningKey[KEY_SCC] + "=" + ::ToString( m_nSolCh)) ;
case KEY_SUBTYPE : return ( sGenMachiningKey[KEY_SUBTYPE] + "=" + ::ToString( m_nSubType)) ;
case KEY_TNAME : return ( sGenMachiningKey[KEY_TNAME] + "=" + m_sToolName) ;
case KEY_TUUID : return ( sGenMachiningKey[KEY_TUUID] + "=" + ::ToString( m_ToolUuid)) ;
case KEY_UUID : return ( sGenMachiningKey[KEY_UUID] + "=" + ::ToString( m_Uuid)) ;
@@ -330,6 +338,9 @@ GenMachiningData::SetParam( int nType, int nVal)
return false ;
m_nSolCh = nVal ;
return true ;
case MPA_SUBTYPE :
m_nSubType = nVal ;
return true ;
}
return false ;
}
@@ -431,6 +442,9 @@ GenMachiningData::GetParam( int nType, int& nVal) const
case MPA_SCC :
nVal = m_nSolCh ;
return true ;
case MPA_SUBTYPE :
nVal = m_nSubType ;
return true ;
}
nVal = 0 ;
return false ;