Merge commit 'cfb2fea0bdd6627485111e68a57482098dc62c82' into feature/SvuotatureConIsole

Pocketing.cpp

@@ -678,14 +678,7 @@ Pocketing::Update( bool bPostApply)
    }
 
   // imposto eventuale asse bloccato da lavorazione
-   if ( ! m_Params.m_sBlockedAxis.empty()) {
-      string sAxis, sVal ;
-      Split( m_Params.m_sBlockedAxis, "=", true, sAxis, sVal) ;
-      double dVal = 0 ;
-      FromString( sVal, dVal) ;
-      m_pMchMgr->ClearRotAxisBlock() ;
-      m_pMchMgr->SetRotAxisBlock( sAxis, dVal) ;
-   }
+   SetBlockedRotAxis( m_Params.m_sBlockedAxis) ;
 
   // calcolo gli assi macchina
    string sHint = ExtractHint( m_Params.m_sUserNotes) ;
@@ -1790,8 +1783,8 @@ Pocketing::CalcRegionElevation( const ICurveComposite* pCompo, const Vector3d& v
 
      // calcolo la classificazione della curva rispetto al contorno
       IntersCurveCurve intCC( *pLine, *pCompoL) ;
-      CRVCVECTOR ccClass ;       
-      if ( intCC.GetCurveClassification( 0, ccClass)) {
+      CRVCVECTOR ccClass ;
+      if ( intCC.GetCurveClassification( 0, EPS_SMALL, ccClass)) {
         // determino gli intervalli di curva interni
          Intervals inOk ;
          for ( auto& ccOne : ccClass) {
@@ -2982,7 +2975,7 @@ Pocketing::AddSpiralIn( const ISurfFlatRegion* pSrf, const Vector3d& vtTool, con
                      dStElev = dStep ;
                   bool bUnderRaw = m_bAboveHead && ! m_bAggrBottom &&
                                    GetPointUnderRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(), m_TParams.m_dLen, false, dSafeZ, dStElev) ;
-                  if ( bUnderRaw)
+                  if ( bUnderRaw  ||  ( bOutStart  &&  ! m_bAboveHead))
                      dStElev = max( dStElev, dStep) ;
                   dStElev -= ( ptP1 - ptStart) * vtExtr ;