From 3269e6df7eb5a4ff8219ebbc0c5263d0c06d7750 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 29 Apr 2019 11:14:26 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkStmFromCurves.h | 3 ++- EMkMachiningGeoConst.h | 2 ++ EXeExecutor.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/EGkStmFromCurves.h b/EGkStmFromCurves.h index d5520be..9ebd28e 100644 --- a/EGkStmFromCurves.h +++ b/EGkStmFromCurves.h @@ -35,5 +35,6 @@ 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, double dLinTol = 10 * EPS_SMALL) ; -EGK_EXPORT ISurfTriMesh* GetSurfTriMeshRuled( const Point3d& ptP, const ICurve* pCurve, 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, double dLinTol = 10 * EPS_SMALL) ; diff --git a/EMkMachiningGeoConst.h b/EMkMachiningGeoConst.h index 60ac956..ad5ae8d 100644 --- a/EMkMachiningGeoConst.h +++ b/EMkMachiningGeoConst.h @@ -20,6 +20,8 @@ static std::string KEY_PHASE = "PH" ; // Chiave per elenco identificativi di selezione static std::string KEY_IDS = "IDS" ; +// Chiave per flag cornice diritta +static std::string KEY_STRAIGHT = "STR" ; // Chiave per conteggio elementi geometrici di lavorazione static std::string KEY_NUM = "NUM" ; // Chiave per stato di aggiornamento di lavorazione diff --git a/EXeExecutor.h b/EXeExecutor.h index c86b9d4..f7cc92b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -271,6 +271,7 @@ 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, double dLinTol, int nRefType) ; +EXE_EXPORT int ExeCreateSurfTmSwept( int nParentId, int nSectId, int nGuideId, bool bCapEnds, double dLinTol) ; EXE_EXPORT int ExeCreateSurfTmRuled( int nParentId, int nPtOrCrvId1, int nPtOrCrvId2, double dLinTol) ; EXE_EXPORT int ExeCreateSurfTmByTriangles( int nParentId, const INTVECTOR& vIds, bool bErase) ; EXE_EXPORT int ExeCreateSurfTmBySewing( int nParentId, const INTVECTOR& vIds, bool bErase) ;