Egalware/EgtMachKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f80d776b79aba0579e1e599a3534f9b1f4ba1cb7' into feature/Svuotature

Browse Source
This commit is contained in:
Riccardo Elitropi
2025-06-05 07:45:39 +02:00
parent 1347f472bc f80d776b79
commit b156731e1e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WaterJetting.cpp
+7 -3
View File
@@ -2434,7 +2434,7 @@ WaterJetting::AddStandardWj( const ICurveComposite* pCompo, const Vector3d& vtTo
}
}
if ( ! bSlowFull) {
dAccLen = min( dFreeLen - EXTRA_ACC_LEN, ( bReduceFeed ? m_Params.m_dCornerSlowLen : INTANG_ROT_LEN)) ;
dAccLen = min( dFreeLen / 2 - EXTRA_ACC_LEN, ( bReduceFeed ? m_Params.m_dCornerSlowLen : INTANG_ROT_LEN)) ;
if ( m_Params.m_dSideAngle > 0) {
double dW = m_dElev * sin( m_Params.m_dSideAngle * DEGTORAD) ;
double dSlowLen = dW / tan( ( 180 - abs( dAng)) / 2 * DEGTORAD) ;
@@ -2458,6 +2458,8 @@ WaterJetting::AddStandardWj( const ICurveComposite* pCompo, const Vector3d& vtTo
double dCoeff = j / double( ACC_PNT_NUM) ;
double dU ; pCrvC->GetParamAtLength( dCoeff * dAccLen, dU) ;
PtrOwner<ICurve> pCrvT( pCrvC->Clone()) ;
if ( abs( dUprev - dU) < EPS_SMALL)
continue ;
if ( IsNull( pCrvT) || ! pCrvT->TrimStartEndAtParam( dUprev, dU))
return false ;
Vector3d vtTool = ( 1 - dCoeff) * vtTp + dCoeff * vtTn ;
@@ -2868,9 +2870,11 @@ WaterJetting::CalcAndSetToolCorrAuxDir( const ICurveComposite* pCompo, double dU
// verifico curva
if ( pCompo == nullptr)
return false ;
// se utensile centrato, direzione di correzione nulla
if ( m_Params.m_nWorkSide == WJET_WS_CENTER)
// se utensile centrato, direzione di correzione nulla e direzione utensile sempre Z+
if ( m_Params.m_nWorkSide == WJET_WS_CENTER) {
SetToolDir( Z_AX) ;
return true ;
}
// calcolo del versore fresa
Vector3d vtTool = CalcToolDir( pCompo, dU) ;
// calcolo del versore correzione