From 5333f6415e7f619ae4402d74fc08cd724c3fc7ed Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 24 Oct 2021 18:07:57 +0200 Subject: [PATCH] EgtExecutor 2.3j2 : - adattamenti per modifiche libreria GeomKernel. --- EXE_GdbGetCurve.cpp | 2 +- EXE_GdbGetSurf.cpp | 2 +- EXE_GdbModifyCurve.cpp | 4 ++-- EXE_NstCreateFlatParts.cpp | 6 +++--- EXE_NstPartNesting.cpp | 2 +- EgtExecutor.rc | Bin 16184 -> 16184 bytes 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EXE_GdbGetCurve.cpp b/EXE_GdbGetCurve.cpp index 19ede39..5e32ad8 100644 --- a/EXE_GdbGetCurve.cpp +++ b/EXE_GdbGetCurve.cpp @@ -372,7 +372,7 @@ ExeCurveWithRegionClassify( int nCurveId, int nRegionId) } // classifico la curva rispetto alla regione CRVCVECTOR vcClass ; - if ( ! pSfr->GetCurveClassification( *pCrvL, vcClass)) + if ( ! pSfr->GetCurveClassification( *pCrvL, EPS_SMALL, vcClass)) return CRC_NULL ; int nRes = CRC_NULL ; for ( auto& cClass : vcClass) { diff --git a/EXE_GdbGetSurf.cpp b/EXE_GdbGetSurf.cpp index a3f3d49..82fecf6 100644 --- a/EXE_GdbGetSurf.cpp +++ b/EXE_GdbGetSurf.cpp @@ -146,7 +146,7 @@ ExeSurfFrTestExternal( int nId1, int nId2, double dMinDist) return false ; IntersCurveCurve ccInt( *pCrv1, *pCrv2L) ; CRVCVECTOR vcClass ; - if ( ! ccInt.GetCurveClassification( 1, vcClass) || vcClass.empty()) + if ( ! ccInt.GetCurveClassification( 1, EPS_SMALL, vcClass) || vcClass.empty()) return false ; for ( auto& cClass : vcClass) { if ( cClass.nClass == CRVC_IN || cClass.nClass == CRVC_NULL) diff --git a/EXE_GdbModifyCurve.cpp b/EXE_GdbModifyCurve.cpp index 028c41d..a0e3769 100644 --- a/EXE_GdbModifyCurve.cpp +++ b/EXE_GdbModifyCurve.cpp @@ -747,7 +747,7 @@ MyTrimCurveWithRegion( int nCrvId, int nRegId, bool bInVsOut, bool bOn, int& nCo return GDB_ID_NULL ; // calcolo la classificazione della curva rispetto alla regione CRVCVECTOR ccClass ; - if ( ! pSFR->GetCurveClassification( *CrvLoc, ccClass)) + if ( ! pSFR->GetCurveClassification( *CrvLoc, EPS_SMALL, ccClass)) return GDB_ID_NULL ; // determino gli intervalli di curva da conservare Intervals inOk( 100 * EPS_PARAM) ; @@ -856,7 +856,7 @@ MyTrimFlatCurveWithBox( int nCrvId, const Frame3d& frBox, const Vector3d& vtDiag return false ; // calcolo la classificazione della curva rispetto alla regione CRVCVECTOR ccClass ; - if ( ! pSfr->GetCurveClassification( *pCrv, ccClass)) + if ( ! pSfr->GetCurveClassification( *pCrv, EPS_SMALL, ccClass)) return GDB_ID_NULL ; // determino gli intervalli di curva da conservare Intervals inOk ; diff --git a/EXE_NstCreateFlatParts.cpp b/EXE_NstCreateFlatParts.cpp index 314820f..2d25d6e 100644 --- a/EXE_NstCreateFlatParts.cpp +++ b/EXE_NstCreateFlatParts.cpp @@ -469,7 +469,7 @@ CreateFlatPartsByRegions( int nLay) // intersezione e classificazione CRVCVECTOR ccClass ; IntersCurveCurve intCC( *pCrv2, *pCrv) ; - if ( ! intCC.GetCurveClassification( 0, ccClass)) + if ( ! intCC.GetCurveClassification( 0, EPS_SMALL, ccClass)) continue ; // se completamente interna if ( ccClass.size() == 1 && ccClass[0].nClass == CRVC_IN) { @@ -506,7 +506,7 @@ CreateFlatPartsByRegions( int nLay) // intersezione e classificazione CRVCVECTOR ccClass ; IntersCurveCurve intCC( *pCrv2, *pCrv) ; - if ( ! intCC.GetCurveClassification( 0, ccClass)) + if ( ! intCC.GetCurveClassification( 0, EPS_SMALL, ccClass)) continue ; // conservo solo le parti interne for ( int k = 0 ; k < int( ccClass.size()) ; ++ k) { @@ -862,7 +862,7 @@ VerifyPrepareFlatParts( void) ICurve* pCrv = GetCurve( pGeomDB->GetGeoObj( vOpenIds[i])) ; // calcolo la classificazione della curva rispetto alla regione CRVCVECTOR ccClass ; - if ( ! pSfr->GetCurveClassification( *pCrv, ccClass)) + if ( ! pSfr->GetCurveClassification( *pCrv, EPS_SMALL, ccClass)) continue ; // conservo solo gli intervalli di curva interni Intervals inOk ; diff --git a/EXE_NstPartNesting.cpp b/EXE_NstPartNesting.cpp index dced2a4..665f527 100644 --- a/EXE_NstPartNesting.cpp +++ b/EXE_NstPartNesting.cpp @@ -649,7 +649,7 @@ TrimLine::TrimLineWithRegion( const ICurveLine* pLine, int nRegId, bool bOn, Int return false ; // calcolo la classificazione della curva rispetto alla regione CRVCVECTOR ccClass ; - if ( ! pSFR->GetCurveClassification( *pLocCrv, ccClass)) + if ( ! pSFR->GetCurveClassification( *pLocCrv, EPS_SMALL, ccClass)) return false ; // determino gli intervalli di curva esterni alla regione inOut.Reset() ; diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 6a5c5831c4bd4fd176a4518e4790922a0681515d..ffb61bf62766c7fbb273c8bd89a01c118333331c 100644 GIT binary patch delta 97 zcmdl{x1(;uA2vp#%@@V4Gflq2na5}}Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y| cF@rU@0x76sKgP|Iq`|@mV0Jo1HG5`Po delta 97 zcmdl{x1(;uA2vqA%@@V4Gflq2na5~2Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y| cF@rU@0x76sKgP|Iq`|@mV0JaGqDgXcg