From 3c26cd87cb151ebb5fa580855eb4a6b53063881e Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Thu, 13 Mar 2025 12:30:59 +0100 Subject: [PATCH 1/6] Include : - aggiunto parametro a funzione CalcPocketing. --- EGkCalcPocketing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EGkCalcPocketing.h b/EGkCalcPocketing.h index 043e66d..6dcb17e 100644 --- a/EGkCalcPocketing.h +++ b/EGkCalcPocketing.h @@ -26,7 +26,7 @@ //----------------------------------------------------------------------------- EGK_EXPORT bool CalcPocketing( const ISurfFlatRegion* pSfr, double dRad, double dRadOffs, double dStep, - double dAngle, int nType, bool bSmooth, bool bInvert, bool bAvoidOpt, + double dAngle, double dOpenMinSafe, int nType, bool bSmooth, bool bInvert, bool bAvoidOpt, bool bAllowZigZagOneWayBorders, bool bCalcFeed, const Point3d& ptEndPrec, const ISurfFlatRegion* pSfrLimit, bool bAllOffs, ICRVCOMPOPOVECTOR& vCrv) ; EGK_EXPORT bool CalcZigZagInfill( const ISurfFlatRegion* pSfr, double dStep, bool bSmooth, bool bRemoveOverlapLink, From 8bac9f6885c105249541c4bb43ae501fba942e93 Mon Sep 17 00:00:00 2001 From: SaraP Date: Thu, 13 Mar 2025 15:21:53 +0100 Subject: [PATCH 2/6] Include : - aggiunto prototipo. --- EXeExecutor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/EXeExecutor.h b/EXeExecutor.h index 30444b1..5bd59ce 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -540,6 +540,7 @@ EXE_EXPORT bool ExeSetTextureFrame( int nId, const Frame3d& frTxrRef, int nRefTy EXE_EXPORT bool ExeRemoveTextureData( int nId) ; EXE_EXPORT bool ExeGetTextureName( int nId, std::string& sTxrName) ; EXE_EXPORT bool ExeGetTextureFrame( int nId, int nRefId, Frame3d& frTxrRef) ; +EXE_EXPORT bool ExeSetStipple( int nId, int nFactor, int nPattern) ; // GeomDb Obj Selection EXE_EXPORT bool ExeSetObjFilterForSelect( bool bZerodim, bool bCurve, bool bSurf, bool bVolume, bool bExtra) ; From f5724206d577fe4a7022904fbe659212c2b48e92 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 22 Mar 2025 18:09:03 +0100 Subject: [PATCH 3/6] Include : - aggiornamento prototipi. --- EInAPI.h | 1 + 1 file changed, 1 insertion(+) diff --git a/EInAPI.h b/EInAPI.h index 65a97ad..1b6a7b7 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -449,6 +449,7 @@ EIN_EXPORT BOOL __stdcall EgtGetInfoBBox( int nId, const wchar_t* wsKey, double ptMin[3], double ptMax[3]) ; EIN_EXPORT BOOL __stdcall EgtGetInfoFrame( int nId, const wchar_t* wsKey, double ptOrig[3], double vtX[3], double vtY[3], double vtZ[3]) ; +EIN_EXPORT BOOL __stdcall EgtGetAllInfo( int nId, wchar_t*& wsInfos) ; EIN_EXPORT BOOL __stdcall EgtExistsInfo( int nId, const wchar_t* wsKey) ; EIN_EXPORT BOOL __stdcall EgtRemoveInfo( int nId, const wchar_t* wsKey) ; EIN_EXPORT BOOL __stdcall EgtSetTextureName( int nId, const wchar_t* wsTxrName) ; From cf6b8e757209594153077a2e74d45fc52013de55 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 26 Mar 2025 11:24:48 +0100 Subject: [PATCH 4/6] Include : - aggiornamento prototipi. --- EGkProjectCurveSurf.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/EGkProjectCurveSurf.h b/EGkProjectCurveSurf.h index eabe957..b12ae50 100644 --- a/EGkProjectCurveSurf.h +++ b/EGkProjectCurveSurf.h @@ -29,30 +29,28 @@ // Definizione di Punto 5assi e sue raccolte struct Point5ax { Point3d ptP ; - Vector3d vtDir ; + Vector3d vtDir1 ; Vector3d vtDir2 ; double dPar ; int nFlag ; - Point5ax( void) : ptP(), vtDir(), vtDir2(), dPar(), nFlag() {} ; + Point5ax( void) : ptP(), vtDir1(), vtDir2(), dPar(), nFlag() {} ; Point5ax( const Point3d& ptBase, const Vector3d& vtTool, double dU, int nData) - : ptP( ptBase), vtDir( vtTool), vtDir2(), dPar( dU), nFlag( nData) {} ; + : ptP( ptBase), vtDir1( vtTool), vtDir2(), dPar( dU), nFlag( nData) {} ; Point5ax( const Point3d& ptBase, const Vector3d& vtTool, const Vector3d& vtTool2, double dU, int nData) - : ptP( ptBase), vtDir( vtTool), vtDir2( vtTool2), dPar( dU), nFlag( nData) {} ; + : ptP( ptBase), vtDir1( vtTool), vtDir2( vtTool2), dPar( dU), nFlag( nData) {} ; } ; typedef std::vector PNT5AXVECTOR ; // vettore di Punti 5assi //---------------------------------------------------------------------------- // Proiezione di una curva su una superficie TriMesh lungo la direzione data. EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const Vector3d& vtDir, - double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; + double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; // Proiezione di una curva su una superficie TriMesh in direzione del punto EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const IGeoPoint3d& gpRef, - double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; + double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; // Proiezione di una curva su una superficie TriMesh in direzione della curva EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const ICurve& crRef, - double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; + double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; // Proiezione di una curva su una superficie TriMesh in direzione della superficie EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const ISurf& sfRef, - double dLinTol, double dMaxSegmLen, PNT5AXVECTOR& vPt5ax) ; -// Eliminazione punti proiettati in eccesso -EGK_EXPORT bool RemovePointsInExcess( PNT5AXVECTOR& vMyPt5ax, double dLinTol, double dMaxSegmLen, bool bTestDir = true) ; + double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; From df125db2ae2b6c0f7aec45cf7bc26007caed0cf9 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Thu, 27 Mar 2025 08:53:41 +0100 Subject: [PATCH 5/6] - aggiunte funzioni per le copie di pezzi di curve. --- EXeExecutor.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EXeExecutor.h b/EXeExecutor.h index 5bd59ce..3cfc09a 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -752,6 +752,8 @@ EXE_EXPORT bool ExeCurveCompoNormVersor( int nId, int nSimpCrv, int nRefId, Vect EXE_EXPORT bool ExeCurveCompoGetTempProp( int nId, INTVECTOR& vProp, int nPropInd) ; EXE_EXPORT bool ExeCurveCompoGetTempParam( int nId, DBLVECTOR& vParam, int nParamInd) ; EXE_EXPORT int ExeShowCurveBezierControlPoints( int nCrvId, int nDestGrpId, int* pnCount) ; +EXE_EXPORT int ExeCopyCompoSubCurve( int nCrvId, int nSubCrvToCopy, int nDestGrpId) ; +EXE_EXPORT int ExeCopyParamRange( int nCrvId, double dUStart, double dUEnd, int nDestGrpId) ; // GeomDb Surf Get EXE_EXPORT bool ExeSurfArea( int nId, double& dArea) ; From 865e6e70909ad80a1837da6759a4e557a47c9686 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Thu, 27 Mar 2025 10:22:20 +0100 Subject: [PATCH 6/6] - aggiunti prototipi per copie di pezzi di curve. --- EInAPI.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EInAPI.h b/EInAPI.h index 1b6a7b7..03c7fb0 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -596,6 +596,8 @@ EIN_EXPORT BOOL __stdcall EgtArcAngCenter( int nId, double* pdAngDeg) ; EIN_EXPORT BOOL __stdcall EgtArcDeltaN( int nId, double* pdDeltaN) ; EIN_EXPORT BOOL __stdcall EgtArcNormVersor( int nId, int nRefId, double vtNorm[3]) ; EIN_EXPORT BOOL __stdcall EgtCurveCompoCenter( int nId, int nSimpCrv, int nRefId, double ptCen[3]) ; +EIN_EXPORT BOOL __stdcall EgtCopyCompoSubCurve( int nId, int nSubCrvToCopy, int nParentId) ; +EIN_EXPORT BOOL __stdcall EgtCopyParamRange( int nId, double dUStart, double dUEnd, int nParentId) ; // GeomDb Surf Get EIN_EXPORT BOOL __stdcall EgtSurfArea( int nId, double* pdArea) ;