diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index d266acd..73bec79 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/Mortising.cpp b/Mortising.cpp index 98b9a89..1b231a8 100644 --- a/Mortising.cpp +++ b/Mortising.cpp @@ -1481,6 +1481,9 @@ Mortising::GenerateMortisingCl( const ICurveComposite* pCompo, const Vector3d& v Point3d ptLi = ptStart + vtTool * dDelta ; bool bUnderStart = GetPointUnderRaw( ptLi, vtTool, 0, GetRadiusForStartEndElevation(), m_TParams.m_dLen, false, dSafeZ, dStartElev) ; + // altrimenti ridetermino elevazione su inizio percorso di lavoro + if ( ! bUnderStart) + GetElevation( m_nPhase, ptLi, vtTool, GetRadiusForStartEndElevation(), vtTool, dStartElev) ; // 1 -> punto approccio SetFlag( 1) ; @@ -1562,6 +1565,9 @@ Mortising::GenerateMortisingCl( const ICurveComposite* pCompo, const Vector3d& v Point3d ptLo = ptLast + vtTool * dDelta ; bool bUnderEnd = GetPointUnderRaw( ptLo, vtTool, 0, GetRadiusForStartEndElevation(), m_TParams.m_dLen, false, dSafeZ, dEndElev) ; + // altrimenti ridetermino elevazione su fine percorso di lavoro + if ( ! bUnderEnd) + GetElevation( m_nPhase, ptLo, vtTool, GetRadiusForStartEndElevation(), vtTool, dEndElev) ; // 6 -> ritorno all'approccio SetFeed( GetEndFeed()) ;