EgtMachKernel 3.1c4 :

- in Drilling in doppio aggiunto flag 105 per movimenti in parallelo.

Drilling.cpp

@@ -3574,7 +3574,7 @@ Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId, double dMHO
          return false ;
    }
   // parametri per foro in doppio
-   bool bDouble = ( GetDoubleType( m_Params.m_sUserNotes) != 0)  ;
+   bool bDouble = ( GetDoubleType( m_Params.m_sUserNotes) != 0) ;
    double dDoubleLastStep = GetDoubleLastStep() ;
    bool dDoubleParallel = false ;
    if ( bDouble) {
@@ -3594,7 +3594,7 @@ Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId, double dMHO
             case 2 : vtNorm = Y_AX ; break ;
             case 3 : vtNorm = Z_AX ; break ;
             }
-            dDoubleParallel = ( vtNorm.IsValid() && hole.vtDir * vtNorm > cos( 1. * DEGTORAD)) ;
+            dDoubleParallel = ( vtNorm.IsValid() && abs( hole.vtDir * vtNorm) > cos( 1. * DEGTORAD)) ;
          }
       }
    }
@@ -3649,6 +3649,7 @@ Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId, double dMHO
          if ( bHoleEnd)
             ptP3 -= hole.vtDir * dAddLen ;
          if ( dDoubleParallel  &&  i == nStep) {
+            SetFlag( 105) ;         // movimento in doppio parallelo
             if ( AddLinearMove( ptP3, bSplitArcs, MCH_CL_DBP) == GDB_ID_NULL)
                return false ;
          }
@@ -3680,6 +3681,7 @@ Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId, double dMHO
          if ( bHoleEnd)
             ptP4 -= hole.vtDir * dAddLen ;
          if ( dDoubleParallel  &&  i == nStep) {
+            SetFlag( 105) ;         // movimento in doppio parallelo
             if ( AddLinearMove( ptP4, bSplitArcs, MCH_CL_DBP) == GDB_ID_NULL)
                return false ;
          }
@@ -3710,6 +3712,7 @@ Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId, double dMHO
          if ( bHoleEnd)
             ptP5 -= hole.vtDir * dAddLen ;
          if ( dDoubleParallel  &&  i == nStep) {
+            SetFlag( 105) ;         // movimento in doppio parallelo
             if ( AddLinearMove( ptP5, bSplitArcs, MCH_CL_DBP) == GDB_ID_NULL)
                return false ;
          }
@@ -3724,8 +3727,8 @@ Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId, double dMHO
 
   // 6 -> ritorno all'approccio del foro
    SetFeed( GetEndFeed()) ;
-   SetFlag( 104) ;            // risalita sopra il foro
    if ( dDoubleParallel) {
+      SetFlag( 105) ;         // movimento in doppio parallelo
      // aggiungo risalita aggiuntiva per lavorazione in doppio pari a due volte il LastStep
       Point3d ptEnd ; GetCurrPos( ptEnd) ;
       if ( AddLinearMove( ptEnd + min( 2. * dLastStep, dCurrLen) * hole.vtDir, bSplitArcs, MCH_CL_DBP) == GDB_ID_NULL)
@@ -3735,6 +3738,7 @@ Drilling::DoPeckDrilling( const Hole& hole, SelData Id, int nPathId, double dMHO
       if ( AddLinearMove( ptEnd - dLastStep * hole.vtDir, bSplitArcs, MCH_CL_DBP) == GDB_ID_NULL)
          return false ;
    }
+   SetFlag( 104) ;            // risalita sopra il foro
    if ( AddLinearMove( ptP1, bSplitArcs) == GDB_ID_NULL)
       return false ;