From 71874af84348ba49ab5b048d4ed27357405d3cc5 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 18 Mar 2020 12:07:50 +0000
Subject: [PATCH] EgtCAM5 : - altre correzioni per cancellare sempre contorno
 temporaneo facce di lavorazione corrente.

---
 .../OperationExpander/OperationExpanderVM.vb                    | 1 +
 .../OperationListBoxItem/OperationListBoxItem.vb                | 1 +
 .../SimulationExpander/SimulationExpanderViewModel.vb           | 1 +
 Project/ProjectVM.vb                                            | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb
index 79c448d..0e209f2 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb
@@ -915,6 +915,7 @@ Public Class OperationExpanderVM
          selOperation.m_Type = MCH_OY.DISP Then Return
       ' Tolgo Mark da lavorazione originale
       EgtResetMark(EgtGetFirstNameInGroup(selOperation.Id, MCH_MGR_CL))
+      SelData.ClearIdSub()
       ' Eseguo la copia
       Dim MachiningId As Integer = EgtCopyMachining(selOperation.Name, selOperation.Name)
       ' Se è abilitata l'opzione
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb
index 1db74e9..95e2bd4 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb
@@ -65,6 +65,7 @@ Public Class OperationListBoxItem
                Dim bEnabModif As Boolean = EgtGetEnableModified()
                EgtDisableModified()
                EgtResetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_CL))
+               SelData.ClearIdSub()
                If bEnabModif Then EgtEnableModified()
                ' Ne deseleziono la geometria
                EgtDeselectAll()
diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
index 72a0836..08566d1 100644
--- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
@@ -67,6 +67,7 @@ Public Class SimulationExpanderVM
                EgtDeselectAll()
                Application.Msn.NotifyColleagues(Application.GETDISTANCE_ISCHECKED, False)
                Map.refTopCommandBarVM.SaveIsEnabled = False
+               SelData.ClearIdSub()
                If IniFile.m_bShowOnlyTable Then
                   EgtShowOnlyTable(False)
                   EgtZoom(ZM.ALL, False)
diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb
index 0b6120f..a75b4f5 100644
--- a/Project/ProjectVM.vb
+++ b/Project/ProjectVM.vb
@@ -1136,12 +1136,12 @@ Public Class ProjectVM
                SelData.RemoveIdSub(nId, nFac)
                If Not SelData.FindId( nId) Then
                   EgtDeselectObj( nId)
-                  EgtDraw()
                End If
             End If
          Else
             SelData.RemoveId(nId)
          End If
+         EgtDraw()
       End If
    End Sub