From de077399b234b75e708718c0a121f46e23619e84 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 27 Apr 2020 07:30:39 +0000
Subject: [PATCH] =?UTF-8?q?EgtCAM5=202.2d4=20:=20-=20in=20simulazione=20e?=
 =?UTF-8?q?=20stima=20viene=20disabilitata=20la=20possibilit=C3=A0=20di=20?=
 =?UTF-8?q?accedere=20a=20DB=20utensili,=20lavorazioni=20e=20attrezzaggio?=
 =?UTF-8?q?=20-=20migliorata=20uscita=20da=20simulazione=20e=20stima.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 My Project/AssemblyInfo.vb                            |  4 ++--
 .../OperationExpander/OperationExpanderVM.vb          | 11 +++++++----
 .../SimulationExpander/SimulationExpanderViewModel.vb |  7 ++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 0c4b490..9fc0aee 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.2.4.3")>
-<Assembly: AssemblyFileVersion("2.2.4.3")>
+<Assembly: AssemblyVersion("2.2.4.4")>
+<Assembly: AssemblyFileVersion("2.2.4.4")>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb
index 0e209f2..b7b9a30 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderVM.vb
@@ -108,19 +108,22 @@ Public Class OperationExpanderVM
             ' Cerco l'operazione selezionata all'interno di OperationList
             Dim selOperation As OperationListBoxItem = Nothing
             For Each Operation In OperationList
-               If (Operation.IsSelected) Then
+               If Operation.IsSelected Then
                   selOperation = Operation
+                  Exit For
                End If
             Next
             If value Then
                If m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONLIST Then
                   ListIsExpanded = False
                ElseIf m_CurrExpandedExpander = MachiningOptionPanelExpander.SIMULATION Then
-                  m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
+                  'm_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
                   Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_SET_ISEXPANDED, False)
+                  m_ParametersIsExpanded = False
                ElseIf m_CurrExpandedExpander = MachiningOptionPanelExpander.ESTIMATIONS Then
-                  m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
+                  'm_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
                   Application.Msn.NotifyColleagues(Application.ESTIMATIONSEXPANDER_SET_ISEXPANDED, False)
+                  m_ParametersIsExpanded = False
                End If
                m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
                If IsValidDispositionType(selOperation.m_Type) Then
@@ -215,7 +218,7 @@ Public Class OperationExpanderVM
          End If
          Application.Msn.NotifyColleagues(Application.EMITTITLE)
          ' disattivo database utensili, lavorazioni e setup se vado sulla modifica di una lavorazione
-         Map.refMachinePanelVM.ToolMachSetUpIsEnabled(Not value, Not value, Not value)
+         Map.refMachinePanelVM.ToolMachSetUpIsEnabled(Not m_ParametersIsExpanded, Not m_ParametersIsExpanded, Not m_ParametersIsExpanded)
       End Set
    End Property
 
diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
index 08566d1..ebbb0d5 100644
--- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
@@ -88,6 +88,8 @@ Public Class SimulationExpanderVM
             Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_GET_ISEXPANDED, value)
             OnPropertyChanged("IsExpanded")
             OnPropertyChanged("GenerateIsEnabled")
+            ' disattivo database utensili, lavorazioni e setup se vado in simulazione
+            Map.refMachinePanelVM.ToolMachSetUpIsEnabled(Not value, Not value, Not value)
          End If
       End Set
    End Property
@@ -100,7 +102,6 @@ Public Class SimulationExpanderVM
       Set(value As Boolean)
          If value <> m_Estimation_IsExpanded Then
             If value Then
-
                If m_RefOperationExpanderVM.m_CurrExpandedExpander = OperationExpanderVM.MachiningOptionPanelExpander.OPERATIONLIST Then
                   m_RefOperationExpanderVM.ListIsExpanded = False
                ElseIf m_RefOperationExpanderVM.m_CurrExpandedExpander = OperationExpanderVM.MachiningOptionPanelExpander.OPERATIONPARAMETERS Then
@@ -112,8 +113,6 @@ Public Class SimulationExpanderVM
                   Application.Msn.NotifyColleagues(Application.ESTIMATIONSEXPANDER_SET_ISEXPANDED, False)
                End If
                m_RefOperationExpanderVM.m_CurrExpandedExpander = OperationExpanderVM.MachiningOptionPanelExpander.ESTIMATIONS
-
-
                IsExpanded = False
                EgtDeselectAll()
                Application.Msn.NotifyColleagues(Application.GETDISTANCE_ISCHECKED, False)
@@ -125,6 +124,8 @@ Public Class SimulationExpanderVM
             Application.Msn.NotifyColleagues(Application.ESTIMATIONEXPANDER_GET_ISEXPANDED, value)
             OnPropertyChanged("Estimation_IsExpanded")
             OnPropertyChanged("GenerateIsEnabled")
+            ' disattivo database utensili, lavorazioni e setup se vado in stima
+            Map.refMachinePanelVM.ToolMachSetUpIsEnabled(Not value, Not value, Not value)
          End If
       End Set
    End Property