Merge branch 'develop'

My Project/AssemblyInfo.vb

@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.5.3")>
-<Assembly: AssemblyFileVersion("2.3.5.3")>
+<Assembly: AssemblyVersion("2.3.5.4")>
+<Assembly: AssemblyFileVersion("2.3.5.4")>
 

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
 

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
 

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
 

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
 

Special-Doors/DoorPanelV.xaml

@@ -14,7 +14,8 @@
       <Button Command="{Binding DMachCommand}" Style="{StaticResource GridViewPanelButton}"
          Width="55" Content="DMACH" Visibility="{Binding DMachBtn_Visibility}"/>
       <Button Command="{Binding MTableDbCommand}"
-         Style="{StaticResource GridViewPanelButton}" Width="65" Content="MTABLE"/>
+         Style="{StaticResource GridViewPanelButton}" Width="65" Content="MTABLE"
+              IsEnabled="{Binding MTableDb_IsEnabled}"/>
    </StackPanel>
 
 </UserControl>

Special-Doors/DoorPanelVM.vb

@@ -24,6 +24,13 @@ Public Class DoorPanelVM
       End Get
    End Property
 
+   Private m_MTableDb_IsEnabled As Boolean = True
+   Public ReadOnly Property MTableDb_IsEnabled As Boolean
+      Get
+         Return m_MTableDb_IsEnabled
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdDoors As ICommand
    Private m_cmdDMach As ICommand
@@ -181,6 +188,11 @@ Public Class DoorPanelVM
       OnPropertyChanged(NameOf(DMachBtn_Visibility))
    End Sub
 
+   Friend Sub MTableIsEnabled(MTableDb_IsEnabled As Boolean)
+      m_MTableDb_IsEnabled = MTableDb_IsEnabled
+      OnPropertyChanged(NameOf(MTableDb_IsEnabled))
+   End Sub
+
 #End Region    ' Methods
 
 End Class

SpecialPanel/SpecialPanelV.xaml

@@ -10,7 +10,8 @@
       </ItemsControl.ItemsPanel>
       <ItemsControl.ItemTemplate>
          <DataTemplate>
-            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}" Visibility="{Binding Btn_Visibility}">
+            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}" 
+                    Visibility="{Binding Btn_Visibility}" IsEnabled="{Binding Btn_IsEnabled}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>

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
 

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