From 985ab07916b07cd6bc9c0220380c918de6adbb44 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 2 Jan 2019 18:45:41 +0000 Subject: [PATCH] EgtExecutor : - modifiche per CAvTool. --- EXE_CAvTool.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/EXE_CAvTool.cpp b/EXE_CAvTool.cpp index 6970005..68aa6d4 100644 --- a/EXE_CAvTool.cpp +++ b/EXE_CAvTool.cpp @@ -121,9 +121,8 @@ ExeCAvToolPosStm( const Point3d& ptP, const Vector3d& vtAx, int nSurfTmId, const Vector3d vtMoveL = GetVectorLocal( pGeomDB, vtMove, nRefType, frSurf) ; // imposto dati s_pCAvTlStm->SetSurfTm( *pStm) ; - s_pCAvTlStm->SetMoveDir( vtMoveL) ; double dMove ; - if ( ! s_pCAvTlStm->TestPosition( ptPL, vtAxL, dMove)) + if ( ! s_pCAvTlStm->TestPosition( ptPL, vtAxL, vtMoveL, dMove)) return -1 ; return dMove ; } @@ -170,9 +169,8 @@ ExeCAvToolPathStm( int nCrvId, const Vector3d& vtAx, int nSurfTmId, const Vector Vector3d vtMoveL = GetVectorLocal( pGeomDB, vtMove, nRefType, frSurf) ; // imposto dati s_pCAvTlStm->SetSurfTm( *pStm) ; - s_pCAvTlStm->SetMoveDir( vtMoveL) ; // eseguo CAv - if ( ! s_pCAvTlStm->TestPath( PL.GetUPointList(), vtAxL, dLinTol)) + if ( ! s_pCAvTlStm->TestPath( PL.GetUPointList(), vtAxL, vtMoveL, dLinTol)) return false ; // riporto la polilinea nel riferimento della curva PL.LocToLoc( frSurf, frCrv) ;