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 -7
View File
@@ -15,8 +15,8 @@
#include "stdafx.h"
#include "SawingData.h"
#include "MachiningDataFactory.h"
#include "MachiningConst.h"
#include "/EgtDev/Include/EmkToolConst.h"
#include "/EgtDev/Include/EGkGeoConst.h"
#include "/EgtDev/Include/EGnStringUtils.h"
#include <array>
#include <cassert>
@@ -140,17 +140,17 @@ SawingData::SameAs(const MachiningData* pMdata) const
m_nWorkSide == pSdata->m_nWorkSide &&
m_nHeadSide == pSdata->m_nHeadSide &&
m_sDepth == pSdata->m_sDepth &&
m_dStartPos == pSdata->m_dStartPos &&
m_dStep == pSdata->m_dStep &&
abs( m_dStartPos - pSdata->m_dStartPos) < EPS_MACH_LEN_PAR &&
abs( m_dStep - pSdata->m_dStep) < EPS_MACH_LEN_PAR &&
m_nStepType == pSdata->m_nStepType &&
m_dSideAngle == pSdata->m_dSideAngle &&
m_dStartAddLen == pSdata->m_dStartAddLen &&
m_dEndAddLen == pSdata->m_dEndAddLen &&
abs( m_dSideAngle - pSdata->m_dSideAngle) < EPS_MACH_ANG_PAR &&
abs( m_dStartAddLen - pSdata->m_dStartAddLen) < EPS_MACH_LEN_PAR &&
abs( m_dEndAddLen - pSdata->m_dEndAddLen) < EPS_MACH_LEN_PAR &&
m_nLeadInType == pSdata->m_nLeadInType &&
m_nExtLinkType == pSdata->m_nExtLinkType &&
m_nLeadOutType == pSdata->m_nLeadOutType &&
m_nCurveUse == pSdata->m_nCurveUse &&
m_dApprox == pSdata->m_dApprox) ;
abs( m_dApprox - pSdata->m_dApprox) < EPS_MACH_LEN_PAR) ;
}
//----------------------------------------------------------------------------