diff --git a/PocketingData.cpp b/PocketingData.cpp index f9ecabc..07fa189 100644 --- a/PocketingData.cpp +++ b/PocketingData.cpp @@ -115,7 +115,7 @@ PocketingData::Clone( void) const bool PocketingData::CopyFrom( const MachiningData* pMdata) { - // è inutile copiare se sorgente coincide con destinazione + // è inutile copiare se sorgente coincide con destinazione if ( pMdata == this) return true ; // la sorgente deve essere dello stesso tipo @@ -150,6 +150,8 @@ PocketingData::CopyFrom( const MachiningData* pMdata) m_dLiElev = pSdata->m_dLiElev ; m_nLeadOutType = pSdata->m_nLeadOutType ; m_dLoTang = pSdata->m_dLoTang ; + m_dEpicyclesDist = pSdata->m_dEpicyclesDist ; + m_dEpicyclesRad = pSdata->m_dEpicyclesRad ; m_sSysNotes = pSdata->m_sSysNotes ; m_sUserNotes = pSdata->m_sUserNotes ; return true ; @@ -194,6 +196,8 @@ PocketingData::SameAs(const MachiningData* pMdata) const abs( m_dLiElev - pSdata->m_dLiElev) < EPS_MACH_LEN_PAR && m_nLeadOutType == pSdata->m_nLeadOutType && abs( m_dLoTang - pSdata->m_dLoTang) < EPS_MACH_LEN_PAR && + abs( m_dEpicyclesDist - pSdata->m_dEpicyclesDist) < EPS_MACH_LEN_PAR && + abs( m_dEpicyclesRad - pSdata->m_dEpicyclesRad) < EPS_MACH_LEN_PAR && m_sSysNotes == pSdata->m_sSysNotes && m_sUserNotes == pSdata->m_sUserNotes) ; } @@ -202,7 +206,7 @@ PocketingData::SameAs(const MachiningData* pMdata) const int PocketingData::GetSize( void) const { - // in debug verifico validità ultimo campo + // in debug verifico validità ultimo campo assert( sPocketingKey[KEY_UUID] == "UUID") ; return KEY_ZZZ ; } @@ -534,6 +538,12 @@ PocketingData::SetParam( int nType, double dVal) case MPA_LOTANG : m_dLoTang = dVal ; return true ; + case MPA_EPICYCLESDIST : + m_dEpicyclesDist = dVal ; + return true ; + case MPA_EPICYCLESRAD : + m_dEpicyclesRad = dVal ; + return true ; } return false ; } @@ -669,6 +679,12 @@ PocketingData::GetParam( int nType, double& dVal) const case MPA_LOTANG : dVal = m_dLoTang ; return true ; + case MPA_EPICYCLESDIST : + dVal = m_dEpicyclesDist ; + return true ; + case MPA_EPICYCLESRAD : + dVal = m_dEpicyclesRad ; + return true ; } dVal = 0 ; return false ;