EgtMachKernel 1.6k10 :

- sistemazioni varie in grezzi, lavorazioni, ....
This commit is contained in:
Dario Sassi
2015-12-07 08:03:39 +00:00
parent 5eb5cb387f
commit 42e1a696a1
33 changed files with 1354 additions and 277 deletions
+19 -1
View File
@@ -22,7 +22,7 @@
using namespace std ;
//----------------------------------------------------------------------------
static int CAM_TOTPARAM = 9 ;
static int CAM_TOTPARAM = 10 ;
static std::string CAM_CORR = "Corr" ;
static std::string CAM_TDIR = "TDir" ;
static std::string CAM_CDIR = "CDir" ;
@@ -31,6 +31,7 @@ static std::string CAM_PBAS = "PBas" ;
static std::string CAM_FEED = "Feed" ;
static std::string CAM_FLAG = "Flg" ;
static std::string CAM_AXSTS = "AxS" ;
static std::string CAM_AXMSK = "AxM" ;
static std::string CAM_AXVAL = "AxV" ;
//----------------------------------------------------------------------------
@@ -58,8 +59,12 @@ CamData::Clone( void) const
pCam->m_vtTool = m_vtTool ;
pCam->m_vtCorr = m_vtCorr ;
pCam->m_vtAux = m_vtAux ;
pCam->m_ptBase = m_ptBase ;
pCam->m_dFeed = m_dFeed ;
pCam->m_nFlag = m_nFlag ;
pCam->m_nAxesStatus = m_nAxesStatus ;
pCam->m_nAxesMask = m_nAxesMask ;
pCam->m_vMachAxes = m_vMachAxes ;
}
catch( ...) {
delete pCam ;
@@ -83,6 +88,7 @@ CamData::Dump( string& sOut, bool bMM, const char* szNewLine) const
sOut += CAM_FEED + "=" + ToString( m_dFeed) + szNewLine ;
sOut += CAM_FLAG + "=" + ToString( m_nFlag) + szNewLine ;
sOut += CAM_AXSTS + "=" + ToString( m_nAxesStatus) + szNewLine ;
sOut += CAM_AXMSK + "=" + ToString( m_nAxesMask) + szNewLine ;
sOut += CAM_AXVAL + "=" + ToString( m_vMachAxes) + szNewLine ;
return true ;
@@ -126,6 +132,7 @@ CamData::Save( STRVECTOR& vString) const
vString[++k] = CAM_FEED + "=" + ToString( m_dFeed) ;
vString[++k] = CAM_FLAG + "=" + ToString( m_nFlag) ;
vString[++k] = CAM_AXSTS + "=" + ToString( m_nAxesStatus) ;
vString[++k] = CAM_AXMSK + "=" + ToString( m_nAxesMask) ;
vString[++k] = CAM_AXVAL + "=" + ToString( m_vMachAxes) ;
}
catch( ...) {
@@ -149,6 +156,7 @@ CamData::Load( const STRVECTOR& vString)
! GetVal( vString[++k], CAM_FEED, m_dFeed) ||
! GetVal( vString[++k], CAM_FLAG, m_nFlag) ||
! GetVal( vString[++k], CAM_AXSTS, m_nAxesStatus) ||
! GetVal( vString[++k], CAM_AXMSK, m_nAxesMask) ||
! GetVal( vString[++k], CAM_AXVAL, m_vMachAxes))
return false ;
return true ;
@@ -388,6 +396,7 @@ CamData::CamData( void)
m_dFeed = 0 ;
m_nFlag = 0 ;
m_nAxesStatus = AS_NONE ;
m_nAxesMask = 0x00 ;
m_vMachAxes.reserve( 8) ;
}
@@ -451,6 +460,15 @@ CamData::SetAxes( int nStatus, const DBLVECTOR& vAxVal)
return false ;
m_nAxesStatus = nStatus ;
m_vMachAxes = vAxVal ;
m_nAxesMask = ( 1 << vAxVal.size()) - 1 ;
return true ;
}
//----------------------------------------------------------------------------
bool
CamData::ChangeAxesMask( int nMask)
{
m_nAxesMask = ( nMask & (( 1 << m_vMachAxes.size()) - 1)) ;
return true ;
}