From 61ca7677974eb2a830be404b5d384bdafae33dc0 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 27 Jul 2020 09:18:23 +0000
Subject: [PATCH] OmagCUT 2.2g3 : - nel posizionamento per tagli da sotto ora
 cerco primo taglio da sotto attivo - in simulazione all'avvio del movimento
 ora si assegna flag relativo a EgtSimStart.

---
 CadCuts/VacuumCups.vb               | 8 +++++++-
 My Project/AssemblyInfo.vb          | 4 ++--
 Simulation/SimulationPageUC.xaml.vb | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CadCuts/VacuumCups.vb b/CadCuts/VacuumCups.vb
index 15bb5fa..38784f2 100644
--- a/CadCuts/VacuumCups.vb
+++ b/CadCuts/VacuumCups.vb
@@ -188,9 +188,15 @@ Module VacuumCups
       ResetVacuumCups()
       ' Verifico sia veramente un pezzo
       If EgtGetRawPartFromPart(nPartId) = GDB_ID.NULL Then Return False
-      ' Cerco la direzione dei tagli da sotto
+      ' Cerco la direzione del primo taglio attivo da sotto
       Dim nDripLayId As Integer = EgtGetFirstNameInGroup( nPartId, NAME_DRIPCUT)
       Dim nDripLineId As Integer = EgtGetFirstInGroup( nDripLayId)
+      While nDripLayId <> GDB_ID.NULL
+         Dim nMchId As Integer = EgtGetOperationId( "DripSaw" & nDripLineId.ToString())
+         Dim nMode As Integer
+         If EgtGetMode( nMchId, nMode) AndAlso nMode = GDB_MD.STD Then Exit While
+         nDripLineId = EgtGetNext( nDripLineId)
+      End While
       Dim vtDir As New Vector3d
       if EgtStartVector( nDripLineId, GDB_ID.ROOT, vtDir) Then
          Dim dLen, dAngV, dAngH As Double
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 87ef3b0..41235f1 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.2.7.2")>
-<Assembly: AssemblyFileVersion("2.2.7.2")>
+<Assembly: AssemblyVersion("2.2.7.3")>
+<Assembly: AssemblyFileVersion("2.2.7.3")>
diff --git a/Simulation/SimulationPageUC.xaml.vb b/Simulation/SimulationPageUC.xaml.vb
index a72d7d9..55c9aa2 100644
--- a/Simulation/SimulationPageUC.xaml.vb
+++ b/Simulation/SimulationPageUC.xaml.vb
@@ -322,7 +322,7 @@ Public Class SimulationPageUC
 
    Private Sub ExecSim()
       m_bSimExecuting = True
-      EgtSimStart()
+      EgtSimStart( False)
       LoadCurrTools()
       SkipForRestart()
       EgtSimSetStep(SpeedSlider.Value * m_SliderX)