From 94de4a72aeb118ac4fb3d45bbf2a67a9775dc6b4 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Thu, 29 Apr 2021 08:55:07 +0200
Subject: [PATCH] =?UTF-8?q?EgtMachKernel=202.3d5=20:=20-=20step=20minimo?=
 =?UTF-8?q?=20simulazione=20con=20verifica=20collisioni=20portato=20da=201?=
 =?UTF-8?q?0=20a=2020=20mm=20-=20in=20svuotature=20aggiunta=20possibilit?=
 =?UTF-8?q?=C3=A0=20di=20disabilitare=20tutti=20i=20lati=20aperti=20con=20?=
 =?UTF-8?q?Open=3D0=20nelle=20note=20della=20lavorazione.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgtMachKernel.rc | Bin 11774 -> 11774 bytes
 Pocketing.cpp    |  15 ++++++++++++---
 Simulator.cpp    |   2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index b3bf09238fa9dd3fad97d0d408157736a03207c7..7f6a56fa5d1cf18d3af9be02553bd61eaa8b0258 100644
GIT binary patch
delta 97
zcmewt{V#gMFE&Qg&A-`fnHfzdKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUO4BcK2P

delta 97
zcmewt{V#gMFE&P#&A-`fnHfzcKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4
NK<#LXK~l;gTmUI`BbWdH

diff --git a/Pocketing.cpp b/Pocketing.cpp
index 107d454..d38f1f7 100644
--- a/Pocketing.cpp
+++ b/Pocketing.cpp
@@ -1386,11 +1386,20 @@ Pocketing::ProcessPath( int nPathId, int nPvId, int nClId)
       return false ;
    ICurveComposite* pCompo = GetCurveComposite( m_pGeomDB->GetGeoObj( nCopyId)) ;
 
-  // aggiorno flag per lati aperti
+  // annullo i flag di tratto aperto
+   for ( int i = 0 ; i < int( pCompo->GetCurveCount()) ; ++ i)
+      pCompo->SetCurveTempProp( i, 0) ;
+
+  // verifico se vanno gestiti i lati aperti
    bool bSomeOpen = m_pGeomDB->ExistsInfo( nCrvId, KEY_OPEN) ;
    if ( bSomeOpen) {
-      for ( int i = 0 ; i < int( pCompo->GetCurveCount()) ; ++ i)
-         pCompo->SetCurveTempProp( i, 0) ;
+      int nOpen ;
+      if ( FromString( ExtractInfo( m_Params.m_sUserNotes, "Open="), nOpen)  &&  nOpen == 0)
+         bSomeOpen = false ;
+   }
+
+  // aggiorno flag per lati aperti
+   if ( bSomeOpen) {
       INTVECTOR vOpen ;
       m_pGeomDB->GetInfo( nCrvId, KEY_OPEN, vOpen) ;
       for ( int j : vOpen)
diff --git a/Simulator.cpp b/Simulator.cpp
index 2bebe21..b761b60 100644
--- a/Simulator.cpp
+++ b/Simulator.cpp
@@ -974,7 +974,7 @@ Simulator::ManageSingleMove( int& nStatus, double& dMove)
         // se attivo CollisionCheck approssimo movimento con pił step
          int nStep = 1 ;
          if ( NeedCollisionCheck()) {
-            const double LEN_STEP = 10. ;
+            const double LEN_STEP = 20. ;
             nStep = max( int( dDist / LEN_STEP), 1) ;
          }
          for ( int i = 1 ; i <= nStep ; ++ i) {