EgtMachKernel 1.6j2 :

- aggiunta prima versione del Simulator.
This commit is contained in:
Dario Sassi
2015-10-23 07:59:43 +00:00
parent 45e3e41eac
commit 2de785c6ce
21 changed files with 609 additions and 19 deletions
+24 -2
View File
@@ -22,7 +22,7 @@
using namespace std ;
//----------------------------------------------------------------------------
static int CAM_TOTPARAM = 7 ;
static int CAM_TOTPARAM = 9 ;
static std::string CAM_CORR = "Corr" ;
static std::string CAM_TDIR = "TDir" ;
static std::string CAM_CDIR = "CDir" ;
@@ -30,6 +30,8 @@ static std::string CAM_ADIR = "ADir" ;
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_AXVAL = "AxV" ;
//----------------------------------------------------------------------------
USEROBJ_REGISTER( "EMkCamData", CamData) ;
@@ -80,6 +82,8 @@ CamData::Dump( string& sOut, bool bMM, const char* szNewLine) const
sOut += CAM_PBAS + "=" + ToString( m_ptBase) + szNewLine ;
sOut += CAM_FEED + "=" + ToString( m_dFeed) + szNewLine ;
sOut += CAM_FLAG + "=" + ToString( m_nFlag) + szNewLine ;
sOut += CAM_AXSTS + "=" + ToString( m_nAxesStatus) + szNewLine ;
sOut += CAM_AXVAL + "=" + ToString( m_dMachAxes) + szNewLine ;
return true ;
}
@@ -121,6 +125,8 @@ CamData::Save( STRVECTOR& vString) const
vString[++k] = CAM_PBAS + "=" + ToString( m_ptBase) ;
vString[++k] = CAM_FEED + "=" + ToString( m_dFeed) ;
vString[++k] = CAM_FLAG + "=" + ToString( m_nFlag) ;
vString[++k] = CAM_AXSTS + "=" + ToString( m_nAxesStatus) ;
vString[++k] = CAM_AXVAL + "=" + ToString( m_dMachAxes) ;
}
catch( ...) {
return false ;
@@ -141,7 +147,9 @@ CamData::Load( const STRVECTOR& vString)
! GetVal( vString[++k], CAM_ADIR, m_vtAux) ||
! GetVal( vString[++k], CAM_PBAS, m_ptBase) ||
! GetVal( vString[++k], CAM_FEED, m_dFeed) ||
! GetVal( vString[++k], CAM_FLAG, m_nFlag))
! GetVal( vString[++k], CAM_FLAG, m_nFlag) ||
! GetVal( vString[++k], CAM_AXSTS, m_nAxesStatus) ||
! GetVal( vString[++k], CAM_AXVAL, m_dMachAxes))
return false ;
return true ;
}
@@ -379,6 +387,9 @@ CamData::CamData( void)
m_nCorre = 0 ;
m_dFeed = 0 ;
m_nFlag = 0 ;
m_nAxesStatus = AS_NONE ;
for ( auto& dAxVal : m_dMachAxes)
dAxVal = 0 ;
}
//----------------------------------------------------------------------------
@@ -433,6 +444,17 @@ CamData::SetFlag( int nFlag)
return true ;
}
//----------------------------------------------------------------------------
bool
CamData::SetAxes( int nStatus, const MachAxesVal& adAxVal)
{
if ( nStatus != AS_OK && nStatus != AS_ERR && nStatus != AS_OUTSTROKE)
return false ;
m_nAxesStatus = nStatus ;
m_dMachAxes = adAxVal ;
return true ;
}
//----------------------------------------------------------------------------
void
CamData::ResetObjGraphics( void)