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

EgtMachKernel 2.1j4 :

Browse Source 
- modifiche e migliorie a WaterJetting
- aggiunte funzioni in interfaccia per conoscere i dati delle entità CamData
- aggiunto a Camdata Index e gestito anche in Postproc.
This commit is contained in:
Dario Sassi
2019-10-16 06:38:12 +00:00
parent 378678b149
commit 5c5e445524
17 changed files with 408 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CamData.cpp
+24 -1
View File
@@ -47,7 +47,9 @@ static int CAM_PARAM_V4 = 19 ;
static std::string CAM_NDLT = "NDlt" ;
static int CAM_PARAM_V5 = 20 ;
static std::string CAM_BDIR = "BDir" ;
static int CAM_TOTPARAM =CAM_PARAM_V5 ;
static int CAM_PARAM_V6 = 21 ;
static std::string CAM_INDEX = "Idx" ;
static int CAM_TOTPARAM =CAM_PARAM_V6 ;
//----------------------------------------------------------------------------
USEROBJ_REGISTER( "EMkCamData", CamData) ;
@@ -82,6 +84,7 @@ CamData::Clone( void) const
pCam->m_dDeltaN = m_dDeltaN ;
pCam->m_dFeed = m_dFeed ;
pCam->m_nFlag = m_nFlag ;
pCam->m_nIndex = m_nIndex ;
pCam->m_nAxesStatus = m_nAxesStatus ;
pCam->m_nAxesMask = m_nAxesMask ;
pCam->m_vMachAxes = m_vMachAxes ;
@@ -116,6 +119,7 @@ CamData::Dump( string& sOut, bool bMM, const char* szNewLine) const
sOut += CAM_NDIR + "=" + ToString( m_vtN) + szNewLine ;
sOut += CAM_FEED + "=" + ToString( m_dFeed) + szNewLine ;
sOut += CAM_FLAG + "=" + ToString( m_nFlag) + szNewLine ;
sOut += CAM_INDEX + "=" + ToString( m_nIndex) + szNewLine ;
sOut += CAM_AXSTS + "=" + ToString( m_nAxesStatus) + szNewLine ;
sOut += CAM_AXMSK + "=" + ToString( m_nAxesMask) + szNewLine ;
sOut += CAM_AXVAL + "=" + ToString( m_vMachAxes) + szNewLine ;
@@ -183,6 +187,8 @@ CamData::Save( int nBaseId, STRVECTOR& vString) const
vString[++k] = CAM_NDLT + "=" + ToString( m_dDeltaN) ;
// parametri aggiunti V5
vString[++k] = CAM_BDIR + "=" + ToString( m_vtBackAux) ;
// parametri aggiunti V6
vString[++k] = CAM_INDEX + "=" + ToString( m_nIndex) ;
}
catch( ...) {
return false ;
@@ -251,6 +257,14 @@ CamData::Load( const STRVECTOR& vString, int nBaseGdbId)
else {
m_vtBackAux = V_NULL ;
}
// parametri aggiunti V6
if ( int( vString.size()) >= CAM_PARAM_V6) {
if ( ! GetVal( vString[++k], CAM_INDEX, m_nIndex))
return false ;
}
else {
m_vtBackAux = V_NULL ;
}
return true ;
}
@@ -506,6 +520,7 @@ CamData::CamData( void)
m_dDeltaN = 0 ;
m_dFeed = 0 ;
m_nFlag = 0 ;
m_nIndex = 0 ;
m_nAxesStatus = AS_NONE ;
m_nAxesMask = 0x00 ;
m_vMachAxes.reserve( 8) ;
@@ -610,6 +625,14 @@ CamData::SetFlag( int nFlag)
return true ;
}
//----------------------------------------------------------------------------
bool
CamData::SetIndex( int nIndex)
{
m_nIndex = nIndex ;
return true ;
}
//----------------------------------------------------------------------------
bool
CamData::SetAxes( int nStatus, const DBLVECTOR& vAxVal)