From 9a37f9033a3fa2283f88442f4b85d5928f7b61df Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 23 Apr 2025 12:16:38 +0200 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkProjectCurveSurf.h | 16 ++++++++-------- EXeExecutor.h | 43 ++++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/EGkProjectCurveSurf.h b/EGkProjectCurveSurf.h index b12ae50..3f9ab6d 100644 --- a/EGkProjectCurveSurf.h +++ b/EGkProjectCurveSurf.h @@ -42,15 +42,15 @@ struct Point5ax { typedef std::vector PNT5AXVECTOR ; // vettore di Punti 5assi //---------------------------------------------------------------------------- -// Proiezione di una curva su una superficie TriMesh lungo la direzione data. -EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const Vector3d& vtDir, +// 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) ; -// Proiezione di una curva su una superficie TriMesh in direzione del punto -EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const IGeoPoint3d& gpRef, +// Proiezione di una curva su una o più superfici in direzione del punto +EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const IGeoPoint3d& gpRef, double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; -// Proiezione di una curva su una superficie TriMesh in direzione della curva -EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const ICurve& crRef, +// Proiezione di una curva su una o più superfici in direzione della curva +EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const ICurve& crRef, double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; -// Proiezione di una curva su una superficie TriMesh in direzione della superficie -EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const ISurf& sfSurf, const ISurf& sfRef, +// Proiezione di una curva su una o più superfici in direzione della superficie +EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const ISurf& sfRef, double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index b6c02ef..a3e3a1e 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -213,6 +213,26 @@ EXE_EXPORT bool ExeSpCalculate( int nType) ; EXE_EXPORT bool ExeSpGetOrder( INTVECTOR& vOrder) ; EXE_EXPORT bool ExeSpGetMinLength( double& dMinLen) ; +// Machining Order Optimization +EXE_EXPORT bool ExeOptMachInit( void) ; +EXE_EXPORT bool ExeOptMachTerminate( void) ; +EXE_EXPORT bool ExeOptMachAddTool( int nId, + double dTCX, double dTCY, double dTCZ, double dTCA, double dTCB, double dTCC, + bool bX, bool bY, bool bZ, bool bA, bool bB, bool bC, + double dTLoad, double dTUnL) ; +EXE_EXPORT bool ExeOptMachAddMachining( int nId, int nToolId, int nGroup, + double dX_Start, double dY_Start, double dZ_Start, + double dA_Start, double dB_Start, double dC_Start, + double dX_End, double dY_End, double dZ_End, + double dA_End, double dB_End, double dC_End) ; +EXE_EXPORT bool ExeOptMachSetFirstMachining( int nId) ; +EXE_EXPORT bool ExeOptMachSetLastMachining( int nId) ; +EXE_EXPORT bool ExeOptMachSetFeeds( double dFeedL, double dFeedA) ; +EXE_EXPORT bool ExeOptMachAddDependence( int nIdPrec, int nIdNext) ; +EXE_EXPORT bool ExeOptMachAddSuggestedDependence( int nIdPrec, int nIdNext) ; +EXE_EXPORT bool ExeOptMachSetAllGroupDependencesAsMandatory( bool bAllMandatory) ; +EXE_EXPORT bool ExeOptMachGetResult( INTVECTOR& vIds) ; + // GeomDB Create EXE_EXPORT int ExeCreateGroup( int nParentId, const Frame3d& frFrame, int nRefType) ; EXE_EXPORT int ExeCreateGeoPoint( int nParentId, const Point3d& ptP, int nRefType) ; @@ -637,9 +657,9 @@ 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, int nSurfTmId, const Vector3d& vtProj, int nDestGrpId, +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 ExeProjectCurveOnSurfExt( int nCurveId, int nSurfTmId, int nGuideId, int nDestGrpId, +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) ; EXE_EXPORT int ExeCurveGetMedialAxis( const INTVECTOR& vIds, int nDestGrpId, int nSide, int* pnCount) ; @@ -994,25 +1014,6 @@ EXE_EXPORT bool ExeAutoNestPrintResults( const std::string& sHtmlFile) ; EXE_EXPORT bool ExeAutoNestGetResults( int& nNestedParts, int& nParts, int& nSheets, int& nNestings, double& dTotFillRatio) ; EXE_EXPORT bool ExeAutoNestGetOneResult( int nInd, int& nType, int& nId, int& nFlag, double& dX, double& dY, double& dAngRot) ; -// Machining Order Optimization -EXE_EXPORT bool ExeOptMachInit( void) ; -EXE_EXPORT bool ExeOptMachTerminate( void) ; -EXE_EXPORT bool ExeOptMachAddTool( int nId, double dTCX, double dTCY, double dTCZ, double dTCA, - double dTCB, double dTCC, bool bX, bool bY, bool bZ, bool bA, - bool bB, bool bC, double dTLoad, double dTUnL) ; -EXE_EXPORT bool ExeOptMachAddMachining( int nId, int nToolId, int nGroup, - double dX_Start, double dY_Start, double dZ_Start, - double dA_Start, double dB_Start, double dC_Start, - double dX_End, double dY_End, double dZ_End, - double dA_End, double dB_End, double dC_End) ; -EXE_EXPORT bool ExeOptMachSetFirstMachining( int nId) ; -EXE_EXPORT bool ExeOptMachSetLastMachining( int nId) ; -EXE_EXPORT bool ExeOptMachSetFeeds( double dFeedL, double dFeedA) ; -EXE_EXPORT bool ExeOptMachAddDependence( int nIdPrec, int nIdSucc) ; -EXE_EXPORT bool ExeOptMachAddSuggestedDependence( int nIdPrec, int nIdSucc) ; -EXE_EXPORT bool ExeOptMachSetAllGroupDependencesAsMandatory( bool bAllMandatory) ; -EXE_EXPORT bool ExeOptMachGetResult( INTVECTOR& vIds) ; - // Collision Avoidance Tool SurfaceTriMesh EXE_EXPORT bool ExeCAvSetStdTool( double dToolLen, double dToolDiam, double dToolCornR) ; EXE_EXPORT bool ExeCAvSetAdvTool( double dToolLen, double dToolDiam, double dTipLen, double dTipDiam, double dToolCornR) ;