diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index a4c72f6..fdf0c0f 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb index 868e968..0075179 100644 --- a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb +++ b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb @@ -87,6 +87,9 @@ Public Class EstimationsExpanderVM Map.refMachiningOptionPanelVM.OnPropertyChanged("GenerateIsEnabled") ' disattivo database utensili, lavorazioni e setup se vado in stima Map.refMachinePanelVM.ToolMachSetUpIsEnabled(False, False, False) + ' disattivo MTable e SpecialPanel se vado in stima + Map.refDoorPanelVM.MTableIsEnabled(False) + Map.refSpecialPanelVM.SpecialPanelIsEnabled(False) Return True End Function @@ -96,8 +99,11 @@ Public Class EstimationsExpanderVM Map.refOperationsListExpanderVM.EstimationExpander_Get_IsExpanded(False) NotifyPropertyChanged("Estimation_IsExpanded") Map.refMachiningOptionPanelVM.OnPropertyChanged("GenerateIsEnabled") - ' disattivo database utensili, lavorazioni e setup se vado in stima + ' attivo database utensili, lavorazioni e setup se esco dalla stima Map.refMachinePanelVM.ToolMachSetUpIsEnabled(True, True, True) + ' attivo MTable e SpecialPanel se esco dalla stima + Map.refDoorPanelVM.MTableIsEnabled(True) + Map.refSpecialPanelVM.SpecialPanelIsEnabled(True) Return True End Function diff --git a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb index fefa553..17558ec 100644 --- a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb @@ -29,6 +29,9 @@ Public Class OperationParametersExpanderVM Map.refProjectVM.EmitTitle() ' disattivo database utensili, lavorazioni e setup se vado sulla modifica di una lavorazione Map.refMachinePanelVM.ToolMachSetUpIsEnabled(Not m_ParametersIsExpanded, Not m_ParametersIsExpanded, Not m_ParametersIsExpanded) + ' disattivo MTable e SpecialPanel se vado sulla modifica di una lavorazione + Map.refDoorPanelVM.MTableIsEnabled(Not m_ParametersIsExpanded) + Map.refSpecialPanelVM.SpecialPanelIsEnabled(Not m_ParametersIsExpanded) End Set End Property diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb index 5de167c..7d102f7 100644 --- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb @@ -967,6 +967,8 @@ Public Class OperationsListExpanderVM Map.refProjectVM.SceneSelMode = SceneSelModeOpt.ALL OnPropertyChanged("ListIsExpanded") Map.refMachinePanelVM.ToolMachSetUpIsEnabled(True, True, True) + Map.refDoorPanelVM.MTableIsEnabled(True) + Map.refSpecialPanelVM.SpecialPanelIsEnabled(True) Return True End Function diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb index d5d51be..f98060a 100644 --- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb @@ -148,6 +148,9 @@ Public Class SimulationExpanderVM Map.refMachiningOptionPanelVM.OnPropertyChanged("GenerateIsEnabled") ' disattivo database utensili, lavorazioni e setup se vado in simulazione Map.refMachinePanelVM.ToolMachSetUpIsEnabled(False, False, False) + ' disattivo MTable e SpecialPanel se vado in simulazione + Map.refDoorPanelVM.MTableIsEnabled(False) + Map.refSpecialPanelVM.SpecialPanelIsEnabled(False) Return True End Function @@ -165,8 +168,11 @@ Public Class SimulationExpanderVM Map.refOperationsListExpanderVM.SimulationExpander_Get_IsExpanded(False) NotifyPropertyChanged("Simulation_IsExpanded") Map.refMachiningOptionPanelVM.OnPropertyChanged("GenerateIsEnabled") - ' disattivo database utensili, lavorazioni e setup se vado in simulazione + ' attivo database utensili, lavorazioni e setup se esco dalla simulazione Map.refMachinePanelVM.ToolMachSetUpIsEnabled(True, True, True) + ' disattivo MTable e SpecialPanel se esco dalla simulazione + Map.refDoorPanelVM.MTableIsEnabled(True) + Map.refSpecialPanelVM.SpecialPanelIsEnabled(True) Return True End Function diff --git a/Special-Doors/DoorPanelV.xaml b/Special-Doors/DoorPanelV.xaml index 694c205..90b1e17 100644 --- a/Special-Doors/DoorPanelV.xaml +++ b/Special-Doors/DoorPanelV.xaml @@ -14,7 +14,8 @@ diff --git a/SpecialPanel/SpecialPanelVM.vb b/SpecialPanel/SpecialPanelVM.vb index 83db617..e6e5429 100644 --- a/SpecialPanel/SpecialPanelVM.vb +++ b/SpecialPanel/SpecialPanelVM.vb @@ -45,6 +45,13 @@ Public Class SpecialPanelVM Return bSpecialPanel_Visible End Function + Friend Sub SpecialPanelIsEnabled(SpecialPanelBtn_IsEnabled As Boolean) + For Each BtnItem In m_ButtonList + BtnItem.m_Btn_IsEnabled = SpecialPanelBtn_IsEnabled + BtnItem.OnPropertyChanged(NameOf(BtnItem.Btn_IsEnabled)) + Next + End Sub + #End Region ' Methods End Class @@ -78,6 +85,13 @@ Public Class ButtonItem End Get End Property + Friend m_Btn_IsEnabled As Boolean = True + Public ReadOnly Property Btn_IsEnabled As Boolean + Get + Return m_Btn_IsEnabled + End Get + End Property + ' Definizione comandi Private m_cmdLuaExec As ICommand diff --git a/TopCommandBar/TopCommandBarVM.vb b/TopCommandBar/TopCommandBarVM.vb index c8e0cbd..75f95a8 100644 --- a/TopCommandBar/TopCommandBarVM.vb +++ b/TopCommandBar/TopCommandBarVM.vb @@ -178,6 +178,14 @@ Public Class TopCommandBarVM If Not IsNothing(Map.refMachinePanelVM) Then Map.refMachinePanelVM.ToolMachSetUpIsEnabled(value, value, value) End If + ' attivo MTable + If Not IsNothing(Map.refDoorPanelVM) Then + Map.refDoorPanelVM.MTableIsEnabled(value) + End If + ' attivo SpecialPanel + If Not IsNothing(Map.refSpecialPanelVM) Then + Map.refSpecialPanelVM.SpecialPanelIsEnabled(value) + End If End If End Sub @@ -195,8 +203,11 @@ Public Class TopCommandBarVM ' altrimenti, aggiusto... Else ' se parametri di una lavorazione aperti, disattivo database utensili, lavorazioni e setup - Dim MachinePanelIsEnabled As Boolean = Not Map.refOperationParametersExpanderVM.ParametersIsExpanded - Map.refMachinePanelVM.ToolMachSetUpIsEnabled(MachinePanelIsEnabled, MachinePanelIsEnabled, MachinePanelIsEnabled) + Dim bIsEnabled As Boolean = Not Map.refOperationParametersExpanderVM.ParametersIsExpanded + Map.refMachinePanelVM.ToolMachSetUpIsEnabled(bIsEnabled, bIsEnabled, bIsEnabled) + ' se parametri di una lavorazione aperti, disattivo MTable e SpecialPanel + Map.refDoorPanelVM.MTableIsEnabled(bIsEnabled) + Map.refSpecialPanelVM.SpecialPanelIsEnabled(bIsEnabled) End If Else ' Deseleziono tutto