EgtMachKernel 1.6n3 :

- prima versione della gestione delle fasi di lavorazione.
This commit is contained in:
Dario Sassi
2016-02-11 10:20:54 +00:00
parent 63f3492566
commit a8c34397be
30 changed files with 488 additions and 133 deletions
+15 -5
View File
@@ -27,6 +27,7 @@ using namespace std ;
//----------------------------------------------------------------------------
static std::string DIS_TABLE = "Tab" ;
static std::string DIS_PHASE = "Ph" ;
static std::string DIS_REF1 = "Ref1" ;
static std::string DIS_AREA1 = "Area1" ;
static std::string DIS_FXD_TOT = "FxT" ;
@@ -80,6 +81,7 @@ Disposition::Dump( string& sOut, bool bMM, const char* szNewLine) const
{
sOut += GetClassName() + "[mm]" + szNewLine ;
sOut += "Tab=" + m_sTabName + ( m_bTabOk ? " (ok)" : " (to verify)") + szNewLine ;
sOut += "Phase=" + ToString( m_nPhase) + szNewLine ;
sOut += "Ref1=(" + ToString( m_ptRef1, 3) + ")" + szNewLine ;
sOut += "Area1=(" + ToString( m_b3Area1, 3) + ")" + szNewLine ;
for ( const auto& FixData : m_vFixData) {
@@ -118,17 +120,20 @@ Disposition::Save( STRVECTOR& vString) const
int nFxdLines = 1 + 3 * nFxdTot ;
int nMvdTot = int( m_vMvrData.size()) ;
int nMvdLines = 1 + 4 * nMvdTot ;
vString.insert( vString.begin(), 3 + nFxdLines + nMvdLines, "") ;
// nome
vString.insert( vString.begin(), 4 + nFxdLines + nMvdLines, "") ;
// Nome
if ( ! SetVal( DIS_TABLE, m_sTabName, vString[++k]))
return false ;
// Fase
if ( ! SetVal( DIS_PHASE, m_nPhase, vString[++k]))
return false ;
// Primo riferimento
if ( ! SetVal( DIS_REF1, m_ptRef1, vString[++k]))
return false ;
// Prima area
if ( ! SetVal( DIS_AREA1, m_b3Area1, vString[++k]))
return false ;
// dati sottopezzi
// Dati sottopezzi
if ( ! SetVal( DIS_FXD_TOT, nFxdTot, vString[++k]))
return false ;
for ( const auto& FixData : m_vFixData) {
@@ -137,7 +142,7 @@ Disposition::Save( STRVECTOR& vString) const
! SetVal( DIS_FXD_ANG, FixData.dAng, vString[++k]))
return false ;
}
// dati posizionamento grezzi
// Dati posizionamento grezzi
if ( ! SetVal( DIS_MVD_TOT, nMvdTot, vString[++k]))
return false ;
for ( const auto& MvrData : m_vMvrData) {
@@ -159,9 +164,13 @@ Disposition::Load( const STRVECTOR& vString)
if ( vString.size() < 5)
return false ;
int k = - 1 ;
// nome
// nome della tavola
m_bTabOk = false ;
if ( ! GetVal( vString[++k], DIS_TABLE, m_sTabName))
return false ;
// fase opzionale
if ( ! GetVal( vString[++k], DIS_PHASE, m_nPhase))
-- k ;
// primo riferimento
if ( ! GetVal( vString[++k], DIS_REF1, m_ptRef1))
return false ;
@@ -231,6 +240,7 @@ Disposition::Disposition( void)
m_pGeomDB = nullptr ;
m_pMchMgr = nullptr ;
m_bTabOk = false ;
m_nPhase = 1 ;
}
//----------------------------------------------------------------------------