EgtCAM5 :

- Miglioramenti gestione più macchine nelle tabelle per Doors.
- Gestita aggiunta operazione di lavorazione successiva a quella selezionata e sempre nella stessa fase.

MTableDb/MTableDbViewModel.vb

@@ -9,6 +9,8 @@ Namespace EgtCAM5
    Public Class MTableDbViewModel
       Inherits TabViewModel
 
+      Private m_sPreviousActiveMachine As String
+
       Private m_TablesList As New ObservableCollection(Of MTableListBoxItem)
       Public Property TablesList As ObservableCollection(Of MTableListBoxItem)
          Get
@@ -132,7 +134,6 @@ Namespace EgtCAM5
 
 #End Region
 
-
 #Region "ToolTip"
 
       'Proprietà ToolTip
@@ -175,6 +176,7 @@ Namespace EgtCAM5
 #Region "CONSTRUCTOR"
 
       Sub New()
+         EgtGetCurrMachineName(m_sPreviousActiveMachine)
          UpdateTables()
          If m_TablesList.Count > 0 Then
             m_TablesList(0).IsSelected = True
@@ -445,8 +447,8 @@ Namespace EgtCAM5
          Dim SelectedMTable As MTableListBoxItem = DirectCast(param, MTableListBoxItem)
          If Not IsNothing(SelectedMTable) AndAlso Not IsNothing(SelectedMTable.SelectedAssociation) Then
             Dim SelectedIndex As Integer = SelectedMTable.AssociationList.IndexOf(SelectedMTable.SelectedAssociation)
-            Dim NewEmptyRow As MTableAssociationGridBoxItem = New MTableAssociationGridBoxItem(False, String.Empty, 1, 0, String.Empty, String.Empty, String.Empty, String.Empty)
-            SelectedMTable.AssociationList.Insert(SelectedIndex, NewEmptyRow)
+            Dim NewEmptyRow As MTableAssociationGridBoxItem = New MTableAssociationGridBoxItem(False, String.Empty, 1, 0, String.Empty, String.Empty, String.Empty, String.Empty, SelectedMTable.ActiveMachinesList)
+            SelectedMTable.AssociationList.Insert(SelectedIndex + 1, NewEmptyRow)
             SelectedMTable.SelectedAssociation = NewEmptyRow
             SelectedMTable.NotifyPropertyChanged("SelectedAssociation")
          End If
@@ -567,6 +569,8 @@ Namespace EgtCAM5
                SaveTable(SelectedMTable)
             End If
          End If
+         ' ripristino la macchina selezionata all'apertura della finestra
+         EgtSetCurrMachine(m_sPreviousActiveMachine)
          ' Chiusura finestra
          For Each Window In Application.Current.Windows
             If TypeOf Window Is MTableDbView Then