From 08ddbc9291f49db49c89176faaa55b92842b570a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 9 Dec 2025 08:13:01 +0100 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkProjectCurveSurf.h | 3 +++ EMkMachMgr.h | 2 ++ EXeExecutor.h | 8 ++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/EGkProjectCurveSurf.h b/EGkProjectCurveSurf.h index 3f9ab6d..703b213 100644 --- a/EGkProjectCurveSurf.h +++ b/EGkProjectCurveSurf.h @@ -42,6 +42,9 @@ struct Point5ax { typedef std::vector PNT5AXVECTOR ; // vettore di Punti 5assi //---------------------------------------------------------------------------- +// Proiezione di una curva su una o più superfici a distanza minima +EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, + double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; // Proiezione di una curva su una o più superfici lungo la direzione data EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const Vector3d& vtDir, double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 802b2eb..d2daf51 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -278,6 +278,8 @@ class __declspec( novtable) IMachMgr virtual bool IsMachiningEmpty( int nEmptyType = 0) const = 0 ; virtual bool GetMachiningStartPoint( Point3d& ptStart) const = 0 ; virtual bool GetMachiningEndPoint( Point3d& ptEnd) const = 0 ; + virtual bool GetMachiningStartAxes( bool bSkipClimb, DBLVECTOR& vAxVal) const = 0 ; + virtual bool GetMachiningEndAxes( bool bSkipRise, DBLVECTOR& vAxVal) const = 0 ; // CL Entities Interrogations virtual bool GetClEntMove( int nEntId, int& nMove) const = 0 ; virtual bool GetClEntFlag( int nEntId, int& nFlag, int& nFlag2) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 049fd06..d390b2d 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -663,8 +663,10 @@ EXE_EXPORT bool ExeCurveCompoSetTempProp( int nId, int nCrv, int nProp, int nPro EXE_EXPORT bool ExeCurveCompoSetTempParam( int nId, int nCrv, double dParam, int nParamInd = 0) ; EXE_EXPORT bool ExeChainCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType) ; EXE_EXPORT bool ExeReorderCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType) ; -EXE_EXPORT bool ExeProjectCurveOnSurf( int nCurveId, const INTVECTOR& vnSurfId, const Vector3d& vtProj, int nDestGrpId, - double dLinTol, double dMaxSegmLen, bool bDirFromProj, int nRefType) ; +EXE_EXPORT bool ExeProjectCurveOnSurf( int nCurveId, const INTVECTOR& vnSurfId, int nDestGrpId, + double dLinTol, double dMaxSegmLen) ; +EXE_EXPORT bool ExeProjectCurveOnSurfDir( int nCurveId, const INTVECTOR& vnSurfId, const Vector3d& vtProj, int nDestGrpId, + double dLinTol, double dMaxSegmLen, bool bDirFromProj, int nRefType) ; EXE_EXPORT bool ExeProjectCurveOnSurfExt( int nCurveId, const INTVECTOR& vnSurfId, int nGuideId, int nDestGrpId, double dLinTol, double dMaxSegmLen, bool bDirFromGuide) ; EXE_EXPORT int ExeCurveGetVoronoi( const INTVECTOR& vIds, int nDestGrpId, int nBound, int* pnCount) ; @@ -1273,6 +1275,8 @@ EXE_EXPORT bool ExeGetMachiningSkippedGeometry( SELVECTOR& vIds) ; EXE_EXPORT bool ExeIsMachiningEmpty( int nEmptyType) ; EXE_EXPORT bool ExeGetMachiningStartPoint( Point3d& ptStart) ; EXE_EXPORT bool ExeGetMachiningEndPoint( Point3d& ptEnd) ; +EXE_EXPORT bool ExeGetMachiningStartAxes( bool bSkipClimb, DBLVECTOR& vAxVal) ; +EXE_EXPORT bool ExeGetMachiningEndAxes( bool bSkipRise, DBLVECTOR& vAxVal) ; EXE_EXPORT bool ExeApplyAllMachinings( bool bRecalc, bool bStopOnFirstErr, std::string& sErrList) ; EXE_EXPORT bool ExeApplyAllMachiningsEx( bool bRecalc, bool bStopOnFirstErr, std::string& sErrList, std::string& sWarnList) ; EXE_EXPORT bool ExeUpdateAllMachinings( bool bStopOnFirstErr, std::string& sErrList) ;