From 543afd4c7a5924dc248fee2b91665c00283de7a8 Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 24 Oct 2021 18:10:31 +0200 Subject: [PATCH] EgtMachKernel 2.3j6 : - adattamenti per modifiche a GeomKernel. --- EgtMachKernel.rc | Bin 11782 -> 11782 bytes Pocketing.cpp | 8 ++++---- SawFinishing.cpp | 2 +- SawRoughing.cpp | 2 +- SurfFinishing.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 373ae003cd3b6ddc4e56095e2d0c4da3325ba294..289246400aec55917217800a6a1891771a120e89 100644 GIT binary patch delta 97 zcmZpRX^YwLhmFx}^ItYwW=6Bgj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHR2d*z delta 97 zcmZpRX^YwLhmFy6^ItYwW=7M=j>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHQiUK= diff --git a/Pocketing.cpp b/Pocketing.cpp index c794e12..7409a2e 100644 --- a/Pocketing.cpp +++ b/Pocketing.cpp @@ -1713,7 +1713,7 @@ Pocketing::CalcRegionElevation( const ICurveComposite* pCompo, const Vector3d& v // calcolo la classificazione della curva rispetto al contorno IntersCurveCurve intCC( *pLine, *pCompoL) ; CRVCVECTOR ccClass ; - if ( intCC.GetCurveClassification( 0, ccClass)) { + if ( intCC.GetCurveClassification( 0, EPS_SMALL, ccClass)) { // determino gli intervalli di curva interni Intervals inOk ; for ( auto& ccOne : ccClass) { @@ -2291,7 +2291,7 @@ Pocketing::CalcZigZag( const ICurveComposite* pOffs, // calcolo la classificazione della curva rispetto al contorno esterno offsettato IntersCurveCurve intCC( *pLine, *pOffs) ; CRVCVECTOR ccClass ; - if ( ! intCC.GetCurveClassification( 0, ccClass)) { + if ( ! intCC.GetCurveClassification( 0, EPS_SMALL, ccClass)) { m_pMchMgr->SetLastError( 2413, "Error in Pocketing : Toolpath not computable") ; return false ; } @@ -2651,7 +2651,7 @@ Pocketing::AddOneWay( const ICurveComposite* pCompo, const Vector3d& vtTool, con // calcolo la classificazione della curva rispetto al contorno esterno offsettato IntersCurveCurve intCC( *pLine, *pOffs2) ; CRVCVECTOR ccClass ; - if ( ! intCC.GetCurveClassification( 0, ccClass)) { + if ( ! intCC.GetCurveClassification( 0, EPS_SMALL, ccClass)) { m_pMchMgr->SetLastError( 2413, "Error in Pocketing : Toolpath not computable") ; return false ; } @@ -3313,7 +3313,7 @@ Pocketing::CalcBoundedLink( const Point3d& ptStart, const Point3d& ptEnd, const // classifico la curva di collegamento rispetto a quella di contenimento CRVCVECTOR ccClass ; IntersCurveCurve intCC( *LineLoc, *CrvOutLoc) ; - intCC.GetCurveClassification( 0, ccClass) ; + intCC.GetCurveClassification( 0, EPS_SMALL, ccClass) ; // se nessuno o un solo tratto e interno, la retta è il collegamento if ( ccClass.empty() || ( ccClass.size() == 1 && ccClass[0].nClass == CRVC_IN)) { pCrvLink->AddCurve( Release( pLine)) ; diff --git a/SawFinishing.cpp b/SawFinishing.cpp index 70ab75f..67c0a58 100644 --- a/SawFinishing.cpp +++ b/SawFinishing.cpp @@ -1767,7 +1767,7 @@ SawFinishing::TrimSection( ICurve* pCrv) // calcolo la classificazione della curva rispetto alla regione CRVCVECTOR ccClass ; - if ( ! pSfr->GetCurveClassification( *pCrv, ccClass)) + if ( ! pSfr->GetCurveClassification( *pCrv, EPS_SMALL, ccClass)) return false ; // determino l'intervallo di curva da conservare diff --git a/SawRoughing.cpp b/SawRoughing.cpp index f96a0ed..1b6aa2e 100644 --- a/SawRoughing.cpp +++ b/SawRoughing.cpp @@ -1452,7 +1452,7 @@ SawRoughing::TrimSection( ICurve* pCrv) // calcolo la classificazione della curva rispetto alla regione CRVCVECTOR ccClass ; - if ( ! pSfr->GetCurveClassification( *pCrv, ccClass)) + if ( ! pSfr->GetCurveClassification( *pCrv, EPS_SMALL, ccClass)) return false ; // determino l'intervallo di curva da conservare diff --git a/SurfFinishing.cpp b/SurfFinishing.cpp index b187f9f..58c287f 100644 --- a/SurfFinishing.cpp +++ b/SurfFinishing.cpp @@ -1492,7 +1492,7 @@ SurfFinishing::CalcZigZag( const ICurveComposite* pOffs, // calcolo la classificazione della curva rispetto al contorno esterno offsettato IntersCurveCurve intCC( *pLine, *pOffs) ; CRVCVECTOR ccClass ; - if ( ! intCC.GetCurveClassification( 0, ccClass)) { + if ( ! intCC.GetCurveClassification( 0, EPS_SMALL, ccClass)) { m_pMchMgr->SetLastError( 3110, "Error in SurfFinishing : Toolpath not computable") ; return false ; }