Migliorata lettura dato Sovratavola

CadCuts/SplitPageUC.xaml.vb

@@ -1467,37 +1467,8 @@ Public Class SplitPageUC
          ' assegno numerazione
          NumberDirectionMachining(nI)
       Next
-
-      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
-      Dim ActiveMachLst As New List(Of Integer)
-      For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
-         ActiveMachLst.Add(ItemSplitMach.Ind)
-      Next
-      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
-
       ' Preparo la lista degli Item
       ShowMachiningList()
-
-      ' -------------------- Riattivo le lavorazioni precedenti --------------------
-
-      For Each Item As SplitMach In m_MachiningList
-         EgtSetInfo(Item.m_nId, INFO_MCH_USER_OFF, True)
-      Next
-
-      For nIndex As Integer = 0 To ActiveMachLst.Count - 1
-         For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
-            If ItemSplitMach.Ind = ActiveMachLst(nIndex) Then
-               EgtRemoveInfo(m_MachiningList(ItemSplitMach.Ind).m_nId, INFO_MCH_USER_OFF)
-               m_MachiningList(ItemSplitMach.Ind).m_bEnabled = True
-               ItemSplitMach.bIsActive = True
-               ' sistemo colore
-               ColorMachining(m_MachiningList(ItemSplitMach.Ind))
-               Exit For
-            End If
-         Next
-      Next
-      ' -------------------- Riattivo le lavorazioni precedenti --------------------
-
       ' Aggiorno visualizzazione
       EgtDraw()
       ' Aggiono abilitazione bottoni

Machine/CurrentMachine.vb

@@ -752,6 +752,7 @@ Public Class CurrentMachine
          End Select
       End Get
       Set(value As Double)
+         Dim dValue As Double = 0
          Select Case GetCurrentTable()
             Case 3
                If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
@@ -760,14 +761,24 @@ Public Class CurrentMachine
                   m_dTab3AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, value)
+                  End If
                End If
-            Case 2
+                  Case 2
                If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
                WritePrivateProfileString(S_TABLE, K_TAB2_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
                   ' Aggiorno il valore corrente
                   m_dTab2AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, value)
+                  End If
                End If
             Case Else
                If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
@@ -776,6 +787,11 @@ Public Class CurrentMachine
                   m_dAdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, value)
+                  End If
                End If
          End Select
       End Set

Project/CurrentProjectPageUC.xaml.vb

@@ -508,6 +508,20 @@ Public Class CurrentProjectPageUC
       UpdateHeightTxBx()
       ' aggiorno materiale
       m_MainWindow.m_CurrentMachine.SetCurrMatByName(GetProjectMaterial())
+      ' aggiorno altezza sovaratavola
+      If GetPrivateProfileInt(S_GENERAL, "AdditionalTableByProj", 0, m_sIniFile) = 1 Then
+         ' leggo il valore OrigiAdditionalTable
+         Dim dValue As Double = m_MainWindow.m_CurrentMachine.dAdditionalTable
+         Select Case GetCurrentTable()
+            Case 3
+               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
+            Case 2
+               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
+            Case Else
+               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
+         End Select
+         m_MainWindow.m_CurrentMachine.dAdditionalTable = dValue
+      End If
       ' forzo visualizzazione eventuali dati su aree
       SetAreasStatus( True)
       ' Dichiaro progetto non modificato