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
+17 -17
View File
@@ -15,8 +15,8 @@
#include "stdafx.h"
#include "MillingData.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>
@@ -163,26 +163,26 @@ MillingData::SameAs(const MachiningData* pMdata) const
m_bInvert == pSdata->m_bInvert &&
m_nWorkSide == pSdata->m_nWorkSide &&
m_sDepth == pSdata->m_sDepth &&
m_dStartPos == pSdata->m_dStartPos &&
m_dOverlap == pSdata->m_dOverlap &&
m_dStep == pSdata->m_dStep &&
abs( m_dStartPos - pSdata->m_dStartPos) < EPS_MACH_LEN_PAR &&
abs( m_dOverlap - pSdata->m_dOverlap) < EPS_MACH_LEN_PAR &&
abs( m_dStep - pSdata->m_dStep) < EPS_MACH_LEN_PAR &&
m_nStepType == pSdata->m_nStepType &&
m_dSideAngle == pSdata->m_dSideAngle &&
abs( m_dSideAngle - pSdata->m_dSideAngle) < EPS_MACH_ANG_PAR &&
m_bLeaveTab == pSdata->m_bLeaveTab &&
m_dTabLen == pSdata->m_dTabLen &&
m_dTabDist == pSdata->m_dTabDist &&
m_dTabHeight == pSdata->m_dTabHeight &&
m_dTabAngle == pSdata->m_dTabAngle &&
abs( m_dTabLen - pSdata->m_dTabLen) < EPS_MACH_LEN_PAR &&
abs( m_dTabDist - pSdata->m_dTabDist) < EPS_MACH_LEN_PAR &&
abs( m_dTabHeight - pSdata->m_dTabHeight) < EPS_MACH_LEN_PAR &&
abs( m_dTabAngle - pSdata->m_dTabAngle) < EPS_MACH_ANG_PAR &&
m_nLeadInType == pSdata->m_nLeadInType &&
m_dLiTang == pSdata->m_dLiTang &&
m_dLiPerp == pSdata->m_dLiPerp &&
m_dLiElev == pSdata->m_dLiElev &&
m_dLiCompLen == pSdata->m_dLiCompLen &&
abs( m_dLiTang - pSdata->m_dLiTang) < EPS_MACH_LEN_PAR &&
abs( m_dLiPerp - pSdata->m_dLiPerp) < EPS_MACH_LEN_PAR &&
abs( m_dLiElev - pSdata->m_dLiElev) < EPS_MACH_LEN_PAR &&
abs( m_dLiCompLen - pSdata->m_dLiCompLen) < EPS_MACH_LEN_PAR &&
m_nLeadOutType == pSdata->m_nLeadOutType &&
m_dLoTang == pSdata->m_dLoTang &&
m_dLoPerp == pSdata->m_dLoPerp &&
m_dLoElev == pSdata->m_dLoElev &&
m_dLoCompLen == pSdata->m_dLoCompLen) ;
abs( m_dLoTang - pSdata->m_dLoTang) < EPS_MACH_LEN_PAR &&
abs( m_dLoPerp - pSdata->m_dLoPerp) < EPS_MACH_LEN_PAR &&
abs( m_dLoElev - pSdata->m_dLoElev) < EPS_MACH_LEN_PAR &&
abs( m_dLoCompLen - pSdata->m_dLoCompLen) < EPS_MACH_LEN_PAR) ;
}
//----------------------------------------------------------------------------