EgtCAM5 :

- Migliorie varie.

ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb

@@ -19,6 +19,9 @@ Namespace EgtCAM5
                   EgtZoom(ZM.ALL)
                End If
                OnPropertyChanged("ManageLayerExpander")
+               OnPropertyChanged("InfoExpander")
+               OnPropertyChanged("InputExpander")
+               OnPropertyChanged("SimulationExpander")
             End If
          End Set
       End Property
@@ -40,9 +43,11 @@ Namespace EgtCAM5
                      EgtAddMachGroup("Mach01", "CMS-PF122R8RR")
                   End If
                   EgtZoom(ZM.ALL)
-                  Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST)
                End If
                OnPropertyChanged("ManageLayerExpander")
+               OnPropertyChanged("InfoExpander")
+               OnPropertyChanged("InputExpander")
+               OnPropertyChanged("SimulationExpander")
             End If
          End Set
       End Property
@@ -63,38 +68,108 @@ Namespace EgtCAM5
                   m_OperationExpander = New OperationExpanderView
                   m_OperationExpander.DataContext = New OperationExpanderViewModel
                End If
+               Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST)
                Return m_OperationExpander
             End If
          End Get
       End Property
 
-      Private m_InputExpander As InputExpanderView
-      Public ReadOnly Property InputExpander As InputExpanderView
+      Private m_OperationPropertyExpander As OperationPropertyExpanderView
+      Private m_InfoExpander As InfoExpanderView
+      Public ReadOnly Property InfoExpander As ContentControl
          Get
-            If IsNothing(m_InputExpander) Then
-               m_InputExpander = New InputExpanderView
-               m_InputExpander.DataContext = New InputExpanderViewModel
+            If m_DrawIsChecked Then
+               If IsNothing(m_InfoExpander) Then
+                  m_InfoExpander = New InfoExpanderView
+                  m_InfoExpander.DataContext = New InfoExpanderViewModel
+               End If
+               Return m_InfoExpander
+            Else
+               If IsNothing(m_OperationPropertyExpander) Then
+                  m_OperationPropertyExpander = New OperationPropertyExpanderView
+                  m_OperationPropertyExpander.DataContext = New OperationPropertyExpanderViewModel
+               End If
+               Return m_OperationPropertyExpander
             End If
-            Return m_InputExpander
          End Get
       End Property
 
-      Private m_InfoExpander As InfoExpanderView
-      Public ReadOnly Property InfoExpander As InfoExpanderView
+      Private m_MachiningsTreeExpander As MachiningTreeExpanderView
+      Private m_InputExpander As InputExpanderView
+      Public ReadOnly Property InputExpander As ContentControl
          Get
-            If IsNothing(m_InfoExpander) Then
-               m_InfoExpander = New InfoExpanderView
-               m_InfoExpander.DataContext = New InfoExpanderViewModel
+            If m_DrawIsChecked Then
+               If IsNothing(m_InputExpander) Then
+                  m_InputExpander = New InputExpanderView
+                  m_InputExpander.DataContext = New InputExpanderViewModel
+               End If
+               Return m_InputExpander
+            Else
+               If IsNothing(m_MachiningsTreeExpander) Then
+                  m_MachiningsTreeExpander = New MachiningTreeExpanderView
+                  m_MachiningsTreeExpander.DataContext = New MachiningTreeExpanderViewModel
+               End If
+               Return m_MachiningsTreeExpander
             End If
-            Return m_InfoExpander
          End Get
       End Property
 
+      Private m_SimulationExpander As SimulationExpanderView
+      Public ReadOnly Property SimulationExpander As ContentControl
+         Get
+            If m_DrawIsChecked Then
+               Return Nothing
+            Else
+               If IsNothing(m_SimulationExpander) Then
+                  m_SimulationExpander = New SimulationExpanderView
+                  m_SimulationExpander.DataContext = New SimulationExpanderViewModel
+               End If
+               Return m_SimulationExpander
+            End If
+         End Get
+      End Property
+
+      ' Definizione comandi
+      Private m_cmdClosing As ICommand
+
       Sub New()
          ' Inizializzo la selezione della modilità Draw all'apertura del programma
          DrawIsChecked = True
       End Sub
 
+#Region "COMMANDS"
+
+#Region "ClosingCommand"
+
+      ''' <summary>
+      ''' Returns a command that create a new tool.
+      ''' </summary>
+      Public ReadOnly Property ClosingCommand As ICommand
+         Get
+            If m_cmdClosing Is Nothing Then
+               m_cmdClosing = New RelayCommand(AddressOf Closing, AddressOf CanClosing)
+            End If
+            Return m_cmdClosing
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Creata the new tool.  This method is invoked by the NewCommand.
+      ''' </summary>
+      Public Sub Closing(ByVal param As Object)
+         Application.Msn.NotifyColleagues(Application.DRAWOPTIONPANEL_CLOSING)
+      End Sub
+
+      ''' <summary>
+      ''' Returns true if the selected treeviewitem is valid for new tool creation.
+      ''' </summary>
+      Private Function CanClosing(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' ClosingCommand
+
+#End Region     ' Commands
    End Class
 
 End Namespace