From c40a9a64c0911e3480bec90ec7a53e0b7aad1a60 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 28 May 2024 11:02:53 +0200 Subject: [PATCH 1/8] Include : - Aggiornamento prototipi. --- EGkSurfTriMesh.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index 41056b6..72323e2 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -124,9 +124,12 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool Repair( double dMaxEdgeLen = MAX_EDGE_LEN_STD) = 0 ; virtual bool GetAllTriaOverlapBox( const BBox3d& b3Box, INTVECTOR& vT) const = 0 ; virtual const BBox3d& GetAllTriaBox( void) const = 0 ; - virtual int GetPartCount( void) const = 0 ; + virtual int GetPartCount( void) const = 0 ; + virtual int GetShellCount( void) const = 0 ; virtual bool RemovePart( int nPart) = 0 ; + virtual bool RemoveShell( int nShell) = 0 ; virtual ISurfTriMesh* ClonePart( int nPart) const = 0 ; + virtual ISurfTriMesh* CloneShell( int nShell) const = 0 ; virtual bool SetTFlag( int nId, int nTFlag) = 0 ; virtual bool GetTFlag( int nId, int& nFlag) const = 0 ; virtual int GetMaxTFlag( void) const = 0 ; From ca4eb9f1664808a120fd076b66dbc7c1f5feee0f Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 25 Jun 2024 13:27:38 +0200 Subject: [PATCH 2/8] Include : - modifica prototipo funzione CalcPocketing. --- EGkCalcPocketing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EGkCalcPocketing.h b/EGkCalcPocketing.h index dd57d4e..8335277 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, ICRVCOMPOPOVECTOR& vCrv) ; + bool bSmooth, ISurfFlatRegion* pSfrLimit, ICRVCOMPOPOVECTOR& vCrv) ; EGK_EXPORT bool CalcZigZagInfill( const ISurfFlatRegion* pSfr, double dStep, bool bSmooth, bool bRemoveOverlapLink, ICRVCOMPOPOVECTOR& vCrvCompoRes) ; From 5644f837edaa6ca1c0820c7332b26e16d7cc7728 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 26 Jun 2024 08:41:10 +0200 Subject: [PATCH 3/8] Include : - aggiornamento prototipi. --- EGkSurfTriMesh.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index 72323e2..e1491f8 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -124,12 +124,15 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool Repair( double dMaxEdgeLen = MAX_EDGE_LEN_STD) = 0 ; virtual bool GetAllTriaOverlapBox( const BBox3d& b3Box, INTVECTOR& vT) const = 0 ; virtual const BBox3d& GetAllTriaBox( void) const = 0 ; - virtual int GetPartCount( void) const = 0 ; - virtual int GetShellCount( void) const = 0 ; - virtual bool RemovePart( int nPart) = 0 ; + virtual int GetShellCount( void) const = 0 ; + virtual bool GetShellArea( int nShell, double& dArea) const = 0 ; virtual bool RemoveShell( int nShell) = 0 ; - virtual ISurfTriMesh* ClonePart( int nPart) const = 0 ; virtual ISurfTriMesh* CloneShell( int nShell) const = 0 ; + virtual int GetPartCount( void) const = 0 ; + virtual bool GetPartArea( int nPart, double& dArea) const = 0 ; + virtual bool GetPartVolume( int nPart, double& dVolume) const = 0 ; + virtual bool RemovePart( int nPart) = 0 ; + virtual ISurfTriMesh* ClonePart( int nPart) const = 0 ; virtual bool SetTFlag( int nId, int nTFlag) = 0 ; virtual bool GetTFlag( int nId, int& nFlag) const = 0 ; virtual int GetMaxTFlag( void) const = 0 ; From b4ee9e2b42f3dfb125aea7dd7259c093d2cfff04 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 26 Jun 2024 17:38:10 +0200 Subject: [PATCH 4/8] Include : - aggiornamento prototipi. --- EInAPI.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EInAPI.h b/EInAPI.h index 1371172..ad01640 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -574,6 +574,9 @@ EIN_EXPORT BOOL __stdcall EgtCurveParamAtLength( int nId, double dLen, double* p EIN_EXPORT BOOL __stdcall EgtCurveLengthAtPoint( int nId, const double ptOn[3], double dExtend, double* pdLen) ; EIN_EXPORT BOOL __stdcall EgtCurveIsClosed( int nId) ; EIN_EXPORT BOOL __stdcall EgtCurveIsFlat( int nId, BOOL bUseExtrusion, double dToler, double vtN[3], double* pdDist) ; +EIN_EXPORT BOOL __stdcall EgtCurveIsACircle( int nId, double dToler, double ptC[3], double vtN[3], double* pdRad, BOOL* pbCCW) ; +EIN_EXPORT BOOL __stdcall EgtCurveIsARectangle( int nId, double dToler, double ptP[3], double vtL1[3], double vtL2[3]) ; +EIN_EXPORT BOOL __stdcall EgtCurveIsATrapezoid( int nId, double dToler, double ptP[3], double vtB1[3], double vtL1[3], double vtB2[3]) ; EIN_EXPORT BOOL __stdcall EgtCurveAreaXY( int nId, double* pdArea) ; EIN_EXPORT BOOL __stdcall EgtCurveArea( int nId, double vtN[3], double* pdDist, double* pdArea) ; EIN_EXPORT BOOL __stdcall EgtCurveNearestExtremityToPoint( int nId, const double ptP[3], BOOL* pbStart) ; From 4ede19d2ee44d9710c5da24b8efe1d7f79cc56de Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 27 Jun 2024 12:53:17 +0200 Subject: [PATCH 5/8] Include : - a Vector3d aggiunta funzione inline GetRotate. --- EGkVector3d.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/EGkVector3d.h b/EGkVector3d.h index 78157eb..5a350c0 100644 --- a/EGkVector3d.h +++ b/EGkVector3d.h @@ -441,6 +441,17 @@ AreOrthoExact( const Vector3d& vtV1, const Vector3d& vtV2) return ( abs( vtV1 * vtV2) < COS_ORTO_ANG_ZERO) ; } +//---------------------------------------------------------------------------- +//! Restituisce una copia ruotata del vettore passato +//---------------------------------------------------------------------------- +inline const Vector3d +GetRotate( const Vector3d& vtV, const Vector3d& vtAx, double dAngDeg) +{ + Vector3d vtW = vtV ; + vtW.Rotate( vtAx, dAngDeg) ; + return vtW ; +} + //---------------------------------------------------------------------------- //! Restituisce una copia in locale del vettore passato //---------------------------------------------------------------------------- From e148024db10684ccf2b8d2dc47780cdd72f145f1 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 29 Jun 2024 18:42:26 +0200 Subject: [PATCH 6/8] Include : - aggiornamento prototipi. --- EGkCAvToolSurfTm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EGkCAvToolSurfTm.h b/EGkCAvToolSurfTm.h index 176ea05..0a7a43f 100644 --- a/EGkCAvToolSurfTm.h +++ b/EGkCAvToolSurfTm.h @@ -38,7 +38,7 @@ class __declspec( novtable) ICAvToolSurfTm { virtual double GetToolRadius( void) const = 0 ; virtual double GetToolHeight( void) const = 0 ; virtual const ICurveComposite& GetToolOutline( bool bApprox = false) const = 0 ; - virtual bool TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, double& dTotDist) = 0 ; + virtual bool TestPosition( const Point3d& ptT, const Vector3d& vtDir, const Vector3d& vtMove, double& dTotDist) const = 0 ; virtual bool TestSeries( PNTUVECTOR& vPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dProgCoeff = 1) = 0 ; virtual bool TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d& vtMove, double dLinTol, double dProgCoeff = 1) = 0 ; } ; From 9a8be81fd609ae6a8fb80651b1fb75e486fc190e Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 1 Jul 2024 10:45:50 +0200 Subject: [PATCH 7/8] Include : - aggiornamento mensile codici protezione librerie. --- EgtKeyCodes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index c590fec..d21a5da 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -25,7 +25,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2606 ; +const int KEY_BASELIB_VER = 2607 ; const int KEY_BASELIB_LEV = 1 ; //---------------------------------------------------------------------------- From 77b84fdd175bd554f8d1a21ea20cfb20ec46f830 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 1 Jul 2024 12:45:27 +0200 Subject: [PATCH 8/8] Include : - aggiornamento prototipi. --- EXeExecutor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/EXeExecutor.h b/EXeExecutor.h index e42db12..4d750bd 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1084,6 +1084,7 @@ EXE_EXPORT bool ExeTdbGetCurrToolValInNotes( int nType, const std::string& sKey, EXE_EXPORT bool ExeTdbGetCurrToolMaxDepth( double& dMaxDepth) ; EXE_EXPORT bool ExeTdbGetCurrToolThDiam( double& dThDiam) ; EXE_EXPORT bool ExeTdbGetCurrToolThLength( double& dThLen) ; +EXE_EXPORT bool ExeTdbCurrToolIsStandardDraw( bool& bStandard) ; EXE_EXPORT int ExeTdbCurrToolDraw( int nGenCtx, int nToolCtx) ; EXE_EXPORT bool ExeTdbReload( void) ; EXE_EXPORT bool ExeTdbSave( void) ;