diff --git a/Operation.cpp b/Operation.cpp index e21d641..4907b0a 100644 --- a/Operation.cpp +++ b/Operation.cpp @@ -4100,13 +4100,13 @@ Operation::AdjustOneStartEndMovement( int nClPathId, int nPrevClPathId, Operatio return false ; DBLVECTOR vAxPrevNoRise ; pPrevOp->GetFinalAxesValues( false, bPrevMain, vAxPrevNoRise) ; - double dDelta = ( ! bZHomeDown ? max( dSafeZ - vAxPrevNoRise[2], 0.) : min( dSafeZ - vAxPrevNoRise[2], 0.)) ; + double dDelta = ( ! bZHomeDown ? max( dSafeZ - vAxPrevNoRise[2], 0.) : min( dSafeZ - vAxPrevNoRise[2], 0.)) ; if ( ! pPrevOp->AddRise( vAxNew1, dDelta, GDB_ID_NULL, bPrevMain)) return false ; } else { - double dDelta = ( ! bZHomeDown ? max( dSafeZ - vAxPrev[2], 0.) : min( dSafeZ - vAxPrev[2], 0.)) ; - if ( ! pPrevOp->AddRise( vAxNew1, dDelta, nPrevClPathId, bPrevMain)) + double dDelta = ( ! bZHomeDown ? max( dSafeZ - vAxPrev[2], 0.) : min( dSafeZ - vAxPrev[2], 0.)) ; + if ( ! AddRise( vAxNew1, dDelta, nPrevClPathId, bPrevMain)) return false ; } // aggiungo posizione elevata prima dell'inizio del percorso corrente @@ -4177,7 +4177,7 @@ Operation::AdjustOneStartEndMovement( int nClPathId, int nPrevClPathId, Operatio // aggiungo risalita alla fine del precedente percorso DBLVECTOR vAxNew ; double dDelta = ( ! bZHomeDown ? max( vAxCurr[2] - vAxPrev[2], 0.) : min( vAxCurr[2] - vAxPrev[2], 0.)) ; - if ( ! pPrevOp->AddRise( vAxNew, dDelta, nPrevClPathId, bPrevMain)) + if ( ! AddRise( vAxNew, dDelta, nPrevClPathId, bPrevMain)) return false ; } }