From 9f6df110dca8cb08072c99ffc638bef9fc780394 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.p@egaltech.com>
Date: Wed, 27 Jan 2021 11:19:46 +0000
Subject: [PATCH] OmagOFFICE 2.3a1: -> correzione chiusura comando FIloTop.

---
 My Project/AssemblyInfo.vb               |  4 +--
 OptionPanel/MachiningTab/SplitModeV.xaml |  2 +-
 OptionPanel/MachiningTab/SplitModeVM.vb  | 42 +++++++++++++++++++++++-
 SideEntityControl/SideEntityControlVM.vb | 14 ++++++++
 4 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 1a4a69d..0b20514 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.2.11.2")>
-<Assembly: AssemblyFileVersion("2.2.11.2")>
+<Assembly: AssemblyVersion("2.3.1.1")>
+<Assembly: AssemblyFileVersion("2.3.1.1")>
 
diff --git a/OptionPanel/MachiningTab/SplitModeV.xaml b/OptionPanel/MachiningTab/SplitModeV.xaml
index c6e1723..7ecc944 100644
--- a/OptionPanel/MachiningTab/SplitModeV.xaml
+++ b/OptionPanel/MachiningTab/SplitModeV.xaml
@@ -170,7 +170,7 @@
                        Command="{Binding }"
                         Visibility="Hidden"
                        Margin="2.5,0,2.5,0"/>
-
+                    <!--Inverti direzione di taglio-->
                     <Button Content="{Binding InvertMsg}" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding InvertCommand}"
diff --git a/OptionPanel/MachiningTab/SplitModeVM.vb b/OptionPanel/MachiningTab/SplitModeVM.vb
index c00d75c..6324d8f 100644
--- a/OptionPanel/MachiningTab/SplitModeVM.vb
+++ b/OptionPanel/MachiningTab/SplitModeVM.vb
@@ -1640,7 +1640,47 @@ Public Class SplitModeVM
    End Property
 
    Public Sub Invert(ByVal param As Object)
-
+      If m_CurrFirstInd = -1 Then Return
+      For Index = m_CurrFirstInd To m_CurrLastInd
+         Dim nI As Integer = m_ItemList(Index).Ind
+         ' Si possono invertire solo i tagli di lama
+         If m_MachiningList(nI).m_nType <> MCH_OY.SAWING Then Continue For
+         ' Non si possono invertire i tagli di lama inclinati
+         If Math.Abs(m_MachiningList(nI).m_dSideAng) > 0.1 Then Continue For
+         ' Se abilitata inversione automatica e quindi non invertito
+         If m_MachiningList(nI).m_bEnableInvert Then
+            ' Inverto e disabilito inversione automatica
+            If CamAuto.InvertVerticalCut(m_MachiningList(nI).m_nId) Then
+               m_MachiningList(nI).m_bInvert = True
+               m_MachiningList(nI).m_vtDir = -m_MachiningList(nI).m_vtDir
+               m_MachiningList(nI).m_bEnableInvert = False
+               SwapStartEndData(nI)
+               ResetEnableInvert(m_MachiningList(nI).m_nEntId)
+               EgtErase(m_MachiningList(nI).m_nArrId)
+               NumberDirectionMachining(nI, False)
+               EgtDraw()
+            End If
+            ' se altrimenti disabilitata inversione automatica e invertito
+         ElseIf m_MachiningList(nI).m_bInvert Then
+            ' Tolgo inversione e lascio disabilitazione inv. autom.
+            If CamAuto.InvertVerticalCut(m_MachiningList(nI).m_nId) Then
+               m_MachiningList(nI).m_bInvert = False
+               m_MachiningList(nI).m_vtDir = -m_MachiningList(nI).m_vtDir
+               SwapStartEndData(nI)
+               EgtErase(m_MachiningList(nI).m_nArrId)
+               NumberDirectionMachining(nI, False)
+               EgtDraw()
+            End If
+            ' altrimenti disabilitata inversione automatica e non invertito
+         Else
+            ' Abilito inversione automatica e lascio non invertito
+            m_MachiningList(nI).m_bEnableInvert = True
+            SetEnableInvert(m_MachiningList(nI).m_nEntId)
+            EgtErase(m_MachiningList(nI).m_nArrId)
+            NumberDirectionMachining(nI, False)
+            EgtDraw()
+         End If
+      Next
    End Sub
 
 #End Region       ' COMMANDS
diff --git a/SideEntityControl/SideEntityControlVM.vb b/SideEntityControl/SideEntityControlVM.vb
index 5b0d798..9d219b5 100644
--- a/SideEntityControl/SideEntityControlVM.vb
+++ b/SideEntityControl/SideEntityControlVM.vb
@@ -912,6 +912,20 @@ Public Class SideEntityControlVM
       ElseIf m_Mode = ModeOpt.FILOTOP Then
          WriteMainPrivateProfileString(S_SIDES, K_FILOTOPOFFSET, DoubleToString(m_Parameter1, 3))
          WriteMainPrivateProfileString(S_SIDES, K_FILOTOPDEPTH, DoubleToString(m_Parameter2, 3))
+         ' Aggiorno affondamento del profilo
+         Dim nPartId As Integer = EgtGetFirstPart()
+         While nPartId <> GDB_ID.NULL
+            Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
+            While nLayId <> GDB_ID.NULL
+               Dim sLayName As String = ""
+               If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
+                  EgtSetInfo(nLayId, INFO_OFFSET, m_Parameter1)
+                  EgtSetInfo(nLayId, INFO_DEPTH, m_Parameter2)
+               End If
+               nLayId = EgtGetNextLayer(nLayId)
+            End While
+            nPartId = EgtGetNextPart(nPartId)
+         End While
       ElseIf m_Mode = ModeOpt.DRIP Then
          WriteMainPrivateProfileString(S_SIDES, K_DRIPOFFSET, DoubleToString(m_dDripOffset, 3))
          WriteMainPrivateProfileString(S_SIDES, K_DRIPOFFSET2, DoubleToString(m_dDripOffset2, 3))