From 9044de754ad46eb7f1f7e7e5a475a3c0de7c9ff9 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 3 Apr 2021 17:57:34 +0000 Subject: [PATCH] Include : - modifica prototipi. --- EGkCurveComposite.h | 7 +++++-- EInAPI.h | 2 ++ EXeExecutor.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index 3447694..524f530 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2013 +// EgalTech 2013-2021 //---------------------------------------------------------------------------- -// File : EgkCurveComposite.h Data : 22.11.13 Versione : 1.3a1 +// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3d1 // Contenuto : Dichiarazione della interfaccia ICurveComposite. // // @@ -48,11 +48,14 @@ class __declspec( novtable) ICurveComposite : public ICurve virtual bool AddJoint( double dU) = 0 ; virtual bool ModifyJoint( int nU, const Point3d& ptNewJoint) = 0 ; virtual bool RemoveJoint( int nU) = 0 ; + virtual bool ModifyCurveToArc( int nCrv, const Point3d& ptMid) = 0 ; + virtual bool ModifyCurveToLine( int nCrv) = 0 ; virtual bool ArcsToBezierCurves( void) = 0 ; virtual bool ArcsBezierCurvesToArcsPerpExtr( double dLinTol, double dAngTolDeg) = 0 ; virtual bool MergeCurves( double dLinTol, double dAngTolDeg, bool bStartEnd = true, bool bNeedSameProp = false) = 0 ; virtual bool RemoveUndercutOnY( double dLinTol, double dAngTolDeg) = 0 ; virtual bool IsAPoint( void) const = 0 ; + virtual bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const = 0 ; virtual bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const = 0 ; virtual bool SetCurveTempProp( int nCrv, int nProp) = 0 ; virtual bool GetCurveTempProp( int nCrv, int& nProp) const = 0 ; diff --git a/EInAPI.h b/EInAPI.h index 1846bc2..2cdff53 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -472,6 +472,8 @@ EIN_EXPORT BOOL __stdcall EgtModifyCircle3P( int nId, const double ptP1[3], cons EIN_EXPORT BOOL __stdcall EgtModifyArcRadius( int nId, double dRad) ; EIN_EXPORT BOOL __stdcall EgtModifyArcC2P( int nId, const double ptEnd[3], int nRefType) ; EIN_EXPORT BOOL __stdcall EgtModifyArc3P( int nId, const double ptMid[3], int nRefType) ; +EIN_EXPORT BOOL __stdcall EgtModifyArcByFlip( int nId) ; +EIN_EXPORT BOOL __stdcall EgtModifyArcToExplementary( int nId) ; EIN_EXPORT BOOL __stdcall EgtCloseCurveCompo( int nId) ; EIN_EXPORT BOOL __stdcall EgtAddCurveCompoCurve( int nId, int nAddCrvId, BOOL bEraseOrig) ; EIN_EXPORT BOOL __stdcall EgtAddCurveCompoLine( int nId, const double ptP[3], int nRefType) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 5e42cd1..d73e59b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -523,6 +523,8 @@ EXE_EXPORT bool ExeAddCurveCompoJoint( int nId, double dU) ; EXE_EXPORT bool ExeModifyCurveCompoJoint( int nId, int nU, const Point3d& ptP, int nRefType) ; EXE_EXPORT int ExeGetCurveCompoJointCount( int nId) ; EXE_EXPORT bool ExeRemoveCurveCompoJoint( int nId, int nU) ; +EXE_EXPORT bool ExeModifyCurveCompoCurveToArc( int nId, int nCrv, const Point3d& ptMid, int nRefType) ; +EXE_EXPORT bool ExeModifyCurveCompoCurveToLine( int nId, int nCrv) ; EXE_EXPORT int ExeExplodeCurveCompo( int nId, int* pnCount) ; EXE_EXPORT bool ExeMergeCurvesInCurveCompo( int nId, double dLinTol, bool bStartEnd) ; EXE_EXPORT bool ExeRemoveCurveCompoUndercutOnY( int nId, double dLinTol) ;