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

EgtMachKernel 2.3b5 :

Browse Source 
- aggiunto Flag2 a CamData per secondo flag dei movimenti
- nei movimenti Genera e Simula ora definito EMT.FLAG2
- in Simula possibilità di visualizzare quote assi principali anche se disabilitati come movimento EMT.ShowAxes.
This commit is contained in:
Dario Sassi
2021-02-25 14:45:25 +00:00
parent eddf28b0c4
commit cb77d0c2aa
12 changed files with 115 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CamData.cpp
+24 -1
View File
@@ -51,7 +51,9 @@ static int CAM_PARAM_V6 = 21 ;
static string CAM_INDEX = "Idx" ;
static int CAM_PARAM_V7 = 22 ;
static string CAM_ORIGFEED = "OrFeed" ;
static int CAM_TOTPARAM =CAM_PARAM_V7 ;
static int CAM_PARAM_V8 = 23 ;
static string CAM_FLAG2 = "Flg2" ;
static int CAM_TOTPARAM =CAM_PARAM_V8 ;
//----------------------------------------------------------------------------
@@ -88,6 +90,7 @@ CamData::Clone( void) const
pCam->m_dFeed = m_dFeed ;
pCam->m_dOrigFeed = m_dOrigFeed ;
pCam->m_nFlag = m_nFlag ;
pCam->m_nFlag2 = m_nFlag2 ;
pCam->m_nIndex = m_nIndex ;
pCam->m_nAxesStatus = m_nAxesStatus ;
pCam->m_nAxesMask = m_nAxesMask ;
@@ -125,6 +128,7 @@ CamData::Dump( string& sOut, bool bMM, const char* szNewLine) const
if ( m_dOrigFeed >= 0)
sOut += CAM_ORIGFEED + "=" + ToString( m_dOrigFeed) + szNewLine ;
sOut += CAM_FLAG + "=" + ToString( m_nFlag) + szNewLine ;
sOut += CAM_FLAG2 + "=" + ToString( m_nFlag2) + szNewLine ;
sOut += CAM_INDEX + "=" + ToString( m_nIndex) + szNewLine ;
sOut += CAM_AXSTS + "=" + ToString( m_nAxesStatus) + szNewLine ;
sOut += CAM_AXMSK + "=" + ToString( m_nAxesMask) + szNewLine ;
@@ -197,6 +201,8 @@ CamData::Save( int nBaseId, STRVECTOR& vString) const
vString[++k] = CAM_INDEX + "=" + ToString( m_nIndex) ;
// parametri aggiunti V7
vString[++k] = CAM_ORIGFEED + "=" + ToString( m_dOrigFeed) ;
// parametri aggiunti V8
vString[++k] = CAM_FLAG2 + "=" + ToString( m_nFlag2) ;
}
catch( ...) {
return false ;
@@ -281,6 +287,14 @@ CamData::Load( const STRVECTOR& vString, int nBaseGdbId)
else {
m_dOrigFeed = -1 ;
}
// parametri aggiunti V8
if ( int( vString.size()) >= CAM_PARAM_V8) {
if ( ! GetVal( vString[++k], CAM_FLAG2, m_nFlag2))
return false ;
}
else {
m_nFlag2 = 0 ;
}
return true ;
}
@@ -537,6 +551,7 @@ CamData::CamData( void)
m_dFeed = 0 ;
m_dOrigFeed = -1 ;
m_nFlag = 0 ;
m_nFlag2 = 0 ;
m_nIndex = 0 ;
m_nAxesStatus = AS_NONE ;
m_nAxesMask = 0x00 ;
@@ -650,6 +665,14 @@ CamData::SetFlag( int nFlag)
return true ;
}
//----------------------------------------------------------------------------
bool
CamData::SetFlag2( int nFlag2)
{
m_nFlag2 = nFlag2 ;
return true ;
}
//----------------------------------------------------------------------------
bool
CamData::SetIndex( int nIndex)