From fe25f6e00914a1dab7d4e7fe71d4cd6178c746d0 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Tue, 16 Jul 2024 11:23:35 +0200 Subject: [PATCH 1/3] Include : - aggiornamento prototipi. --- EXeExecutor.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EXeExecutor.h b/EXeExecutor.h index e0d05d9..8ec317b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -384,6 +384,7 @@ EXE_EXPORT int ExeCreateSurfBzByScrewing( int nParentId, int nCrvId, EXE_EXPORT int ExeCreateSurfBzByRevolve( int nParentId, int nCrvId, const Point3d& ptAx, const Vector3d& vtAx, bool bCapEnds, double dLinTol, int nRefType) ; +EXE_EXPORT int ExeCreateSurfBzByPointCurve( int nParentId, int nCrvId, const Point3d& ptAx, bool bCapEnds, double dLinTol, int nRefType) ; EXE_EXPORT int ExeCreateSurfBzRuled( int nParentId, int nCrvId1, int nCrvId2, int nRuledType, double dLinTol) ; // GeomDB Create Volume @@ -739,7 +740,7 @@ EXE_EXPORT bool ExeCurveCompoAngCenter( int nId, int nSimpCrv, double& dAngCen) EXE_EXPORT bool ExeCurveCompoNormVersor( int nId, int nSimpCrv, int nRefId, Vector3d& vtNorm) ; 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* pnCount) ; +EXE_EXPORT int ExeShowCurveBezierControlPoints( int nCrvId, int nDestGrpId, int* pnCount) ; // GeomDb Surf Get EXE_EXPORT bool ExeSurfArea( int nId, double& dArea) ; @@ -799,7 +800,7 @@ EXE_EXPORT bool ExeSurfBezierGetInfo( int nSurfId, int& nDegU, int& nDegV, int& EXE_EXPORT int ExeSurfBezierGetControlCurveU( int nSurfId, int nIndV, int nDestGrpId) ; EXE_EXPORT int ExeSurfBezierGetControlCurveV( int nSurfId, int nIndU, int nDestGrpId) ; EXE_EXPORT int ExeExtractSurfBezierLoops( int nId, int nDestGrpId, int* pnCount) ; -EXE_EXPORT int ExeShowSurfBezierControlPoints( int nSrfId, int* pnCount) ; +EXE_EXPORT int ExeShowSurfBezierControlPoints( int nSrfId, int nDestGrpId, int* pnCount) ; // GeomDb Volume Get EXE_EXPORT bool ExeVolZmapVolume( int nId, double& dVol) ; From b691854993c6b3222e31f04ceb6f9677dd7da169 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Tue, 16 Jul 2024 17:10:30 +0200 Subject: [PATCH 2/3] Include : - aggiornamento prototipi. --- EXeExecutor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXeExecutor.h b/EXeExecutor.h index 8ec317b..9a244ad 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -376,7 +376,7 @@ EXE_EXPORT int ExeCreateBezierSphere( int nParentId, const Point3d& ptCenter, d EXE_EXPORT int ExeCreateSurfBezierTria2D( int nParentId, int nSurfBzId, int nTextHeight, bool bShowTrim, int* pnCount) ; EXE_EXPORT int ExeCreateSurfBzByFlatContour( int nParentId, int nCrvId, double dLinTol) ; EXE_EXPORT int ExeCreateSurfBzByRegion( int nParentId, const INTVECTOR& vCrvId, double dLinTol) ; -EXE_EXPORT int ExeCreateSurfBzByExtrusion( int nParentId, const INTVECTOR& vCrvIds, const Vector3d& vtExtr, +EXE_EXPORT int ExeCreateSurfBzByExtrusion( int nParentId, const INTVECTOR& vCrvIds, const Vector3d& vtExtr, bool bCapEnds, double dLinTol, int nRefType) ; EXE_EXPORT int ExeCreateSurfBzByScrewing( int nParentId, int nCrvId, const Point3d& ptAx, const Vector3d& vtAx, From d026cc2db7b48705dee22e83c1dd3f87390d81e5 Mon Sep 17 00:00:00 2001 From: SaraP Date: Wed, 17 Jul 2024 14:22:23 +0200 Subject: [PATCH 3/3] Include : - aggiunto nuovo parametro per lavorazione WaterJet. --- EMkMachiningConst.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 37d2d78..8ebcd65 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -409,7 +409,8 @@ enum { WJET_EC_NONE = 0, WJET_EC_LOOP = 2} ; // Comportamento su angolo interno enum { WJET_IC_NONE = 0, - WJET_IC_SLOW = 1} ; + WJET_IC_SLOW = 1, + WJET_IC_SLOW_FULL = 2} ; // Tipo di attacco enum { WJET_LI_NONE = 0, WJET_LI_LINEAR = 1,