diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 5d940a3..f86d77d 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/SurfFinishing.cpp b/SurfFinishing.cpp index 2c69d9c..153c117 100644 --- a/SurfFinishing.cpp +++ b/SurfFinishing.cpp @@ -1329,19 +1329,19 @@ SurfFinishing::ProcessCrvCompo( int nPathId, int nPvId, int nClId) m_TParams.m_dCornRad + GetOffsR()) ; } else { - double dDelta ; + double dDeltaRad ; double dSideAngRad = m_TParams.m_dSideAng * DEGTORAD ; if ( m_TParams.m_dSideAng > 0) { if ( m_TParams.m_dCornRad < EPS_SMALL) - dDelta = 2 * m_TParams.m_dMaxMat * tan( dSideAngRad) ; + dDeltaRad = m_TParams.m_dMaxMat * tan( dSideAngRad) ; else - dDelta = 2 * ( m_TParams.m_dCornRad * cos( dSideAngRad) + - ( m_TParams.m_dMaxMat + m_TParams.m_dCornRad * ( sin( dSideAngRad) - 1)) * tan( dSideAngRad)) ; + dDeltaRad = m_TParams.m_dCornRad * cos( dSideAngRad) + + ( m_TParams.m_dMaxMat + m_TParams.m_dCornRad * ( sin( dSideAngRad) - 1)) * tan( dSideAngRad) ; } else { - dDelta = 2 * tan( dSideAngRad) * m_TParams.m_dMaxMat ; + dDeltaRad = tan( dSideAngRad) * m_TParams.m_dMaxMat ; } - double dStemRad = m_TParams.m_dDiam / 2 + dDelta ; + double dStemRad = m_TParams.m_dDiam / 2 + dDeltaRad ; double dTipRad = m_TParams.m_dDiam / 2 ; pCAvTlStm->SetAdvTool( m_TParams.m_dLen + GetOffsR(), dStemRad + GetOffsR(), @@ -1513,19 +1513,19 @@ SurfFinishing::ProcessSfr( int nPathId, int nPvId, int nClId) m_TParams.m_dCornRad + GetOffsR()) ; } else { - double dDelta ; + double dDeltaRad ; double dSideAngRad = m_TParams.m_dSideAng * DEGTORAD ; if ( m_TParams.m_dSideAng > 0) { if ( m_TParams.m_dCornRad < EPS_SMALL) - dDelta = 2 * m_TParams.m_dMaxMat * tan( dSideAngRad) ; + dDeltaRad = m_TParams.m_dMaxMat * tan( dSideAngRad) ; else - dDelta = 2 * ( m_TParams.m_dCornRad * cos( dSideAngRad) + - ( m_TParams.m_dMaxMat + m_TParams.m_dCornRad * ( sin( dSideAngRad) - 1)) * tan( dSideAngRad)) ; + dDeltaRad = m_TParams.m_dCornRad * cos( dSideAngRad) + + ( m_TParams.m_dMaxMat + m_TParams.m_dCornRad * ( sin( dSideAngRad) - 1)) * tan( dSideAngRad) ; } else { - dDelta = 2 * tan( dSideAngRad) * m_TParams.m_dMaxMat ; + dDeltaRad = tan( dSideAngRad) * m_TParams.m_dMaxMat ; } - double dStemRad = m_TParams.m_dDiam / 2 + dDelta ; + double dStemRad = m_TParams.m_dDiam / 2 + dDeltaRad ; double dTipRad = m_TParams.m_dDiam / 2 ; pCAvTlStm->SetAdvTool( m_TParams.m_dLen + GetOffsR(), dStemRad + GetOffsR(), @@ -4126,10 +4126,10 @@ SurfFinishing::AddProjection( ICAvToolSurfTm* pCAvTlStm, const SURFLOCALVECTOR& // eseguo il test del percorso if ( ! pCAvTlStm->TestPath( PL.GetUPointList(), vtToolL, vtToolL, m_Params.m_dApprox)) return false ; - // riporto la polyline nel frame globale - PL.ToGlob( frSurf) ; // traslo della lunghezza utensile PL.Translate( - vtToolL * m_TParams.m_dLen) ; + // riporto la polyline nel frame globale + PL.ToGlob( frSurf) ; // elimino i punti allineati PL.RemoveAlignedPoints( 0.8 * m_Params.m_dApprox) ; // recupero la curva composita dalla PolyLine