From 966a4ff0c19e0c5cc83f4b01a62fc53b6b4d38df Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 2 Nov 2022 15:10:03 +0100 Subject: [PATCH] Include : - cambio sottoversione mensile per librerie - aggiornamento prototipi. --- EGkStmFromCurves.h | 5 +++++ EXeConst.h | 7 +++++++ EXeExecutor.h | 2 ++ EgtKeyCodes.h | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/EGkStmFromCurves.h b/EGkStmFromCurves.h index 20394be..b5bfb8f 100644 --- a/EGkStmFromCurves.h +++ b/EGkStmFromCurves.h @@ -24,6 +24,9 @@ #define EGK_EXPORT __declspec( dllimport) #endif +//---------------------------------------------------------------------------- +enum RS_CAP { RSCAP_NONE = 0, RSCAP_FLAT = 1, RSCAP_ROUND = 2, RSCAP_BEVEL = 3} ; + //---------------------------------------------------------------------------- EGK_EXPORT ISurfTriMesh* GetSurfTriMeshByFlatContour( const ICurve* pCurve, double dLinTol = 10 * EPS_SMALL) ; EGK_EXPORT ISurfTriMesh* GetSurfTriMeshByRegion( const CICURVEPVECTOR& vpCurve, double dLinTol = 10 * EPS_SMALL) ; @@ -35,6 +38,8 @@ EGK_EXPORT ISurfTriMesh* GetSurfTriMeshByRevolve( const ICurve* pCurve, const Po const Vector3d& vtAx, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ; EGK_EXPORT ISurfTriMesh* GetSurfTriMeshByScrewing( const ICurve* pCurve, const Point3d& ptAx, const Vector3d& vtAx, double dAngRotDeg, double dMove, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ; +EGK_EXPORT ISurfTriMesh* GetSurfTriMeshRectSwept( double dDimH, double dDimV, double dBevelH, double dBevelV, + const ICurve* pGuide, int nCapType, double dLinTol) ; EGK_EXPORT ISurfTriMesh* GetSurfTriMeshSwept( const ICurve* pSect, const ICurve* pGuide, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ; EGK_EXPORT ISurfTriMesh* GetSurfTriMeshRuled( const Point3d& ptP, const ICurve* pCurve, double dLinTol = 10 * EPS_SMALL) ; EGK_EXPORT ISurfTriMesh* GetSurfTriMeshRuled( const ICurve* pCurve1, const ICurve* pCurve2, int nType, double dLinTol = 10 * EPS_SMALL) ; diff --git a/EXeConst.h b/EXeConst.h index 88568e6..446021e 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -85,6 +85,13 @@ enum CrvRegClass { CRC_NULL = 0, CRC_ON = 3, CRC_INTERS = 4} ; +//----------------- Costanti tipo estremi di superficie swept con sezione rettangolare ---------- +enum RSCapType { RSCT_NONE = 0, // come RSCAP_NONE + RSCT_FLAT = 1, // come RSCAP_FLAT + RSCT_ROUND = 2, // come RSCAP_ROUND + RSCT_BEVEL = 3} ; // come RSCAP_BEVEL + + //----------------- Costanti flag import CNC ----------------------------------- enum EicFlag { EIC_FLAG_NONE = 0, // come EImCncFlag::EICFLAG_NONE EIC_FLAG_CHAIN = 1, // come EImCncFlag::EICFLAG_CHAIN diff --git a/EXeExecutor.h b/EXeExecutor.h index 0758b08..b65cff3 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -329,6 +329,8 @@ EXE_EXPORT int ExeCreateSurfTmByRevolve( int nParentId, int nCrvId, EXE_EXPORT int ExeCreateSurfTmByScrewing( int nParentId, int nCrvId, const Point3d& ptAx, const Vector3d& vtAx, double dAngRotDeg, double dMove, bool bCapEnds, double dLinTol, int nRefType) ; +EXE_EXPORT int ExeCreateSurfTmRectSwept( int nParentId, double dDimH, double dDimV, double dBevelH, double dBevelV, + int nGuideId, int nCapType, double dLinTol) ; EXE_EXPORT int ExeCreateSurfTmSwept( int nParentId, int nSectId, int nGuideId, bool bCapEnds, double dLinTol) ; EXE_EXPORT int ExeCreateSurfTmRuled( int nParentId, int nPtOrCrvId1, int nPtOrCrvId2, int nType, double dLinTol) ; EXE_EXPORT int ExeCreateSurfTmByTriangles( int nParentId, const INTVECTOR& vIds, bool bErase) ; diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index 2245c30..39f4440 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -23,7 +23,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2410 ; +const int KEY_BASELIB_VER = 2411 ; const int KEY_BASELIB_LEV = 1 ; //----------------------------------------------------------------------------