EgtMachKernel :

- migliorato confronto tra utensili e tra lavorazioni.
This commit is contained in:
Dario Sassi
2016-01-19 18:00:02 +00:00
parent 5737467fec
commit be5bfb7d4b
5 changed files with 61 additions and 48 deletions
+7 -6
View File
@@ -15,6 +15,7 @@
#include "stdafx.h"
#include "DrillingData.h"
#include "MachiningDataFactory.h"
#include "MachiningConst.h"
#include "/EgtDev/Include/EmkToolConst.h"
#include "/EgtDev/Include/EGnStringUtils.h"
#include <array>
@@ -116,12 +117,12 @@ DrillingData::SameAs(const MachiningData* pMdata) const
m_sToolName == pDdata->m_sToolName &&
m_bInvert == pDdata->m_bInvert &&
m_sDepth == pDdata->m_sDepth &&
m_dStartPos == pDdata->m_dStartPos &&
m_dStartSlowLen == pDdata->m_dStartSlowLen &&
m_dEndSlowLen == pDdata->m_dEndSlowLen &&
m_dThroughAddLen == pDdata->m_dThroughAddLen &&
m_dStep == pDdata->m_dStep &&
m_dReturnPos == pDdata->m_dReturnPos) ;
abs( m_dStartPos - pDdata->m_dStartPos) < EPS_MACH_LEN_PAR &&
abs( m_dStartSlowLen - pDdata->m_dStartSlowLen) < EPS_MACH_LEN_PAR &&
abs( m_dEndSlowLen - pDdata->m_dEndSlowLen) < EPS_MACH_LEN_PAR &&
abs( m_dThroughAddLen - pDdata->m_dThroughAddLen) < EPS_MACH_LEN_PAR &&
abs( m_dStep - pDdata->m_dStep) < EPS_MACH_LEN_PAR &&
abs( m_dReturnPos - pDdata->m_dReturnPos) < EPS_MACH_LEN_PAR) ;
}
//----------------------------------------------------------------------------