Cambio versione 2.4e5

DrawImport/AlzFrontUC.xaml.vb

@@ -76,9 +76,9 @@ Public Class AlzFrontUC
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
 
       ' nome dei parametri condivisi
-      Parameter1TxBl.Text = "Altezza"
-      Parameter2TxBl.Text = "Delta angolo"
-      Parameter5TxBl.Text = "Spessore"
+      Parameter1TxBl.Text = EgtMsg(91134)
+      Parameter2TxBl.Text = EgtMsg(91135)
+      Parameter5TxBl.Text = EgtMsg(91136)
 
       EgtZoom(ZM.ALL)
    End Sub

Machine/CurrentMachine.vb

@@ -752,7 +752,6 @@ 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
@@ -761,24 +760,14 @@ 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
@@ -787,11 +776,6 @@ 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

My Project/AssemblyInfo.vb

@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.5.4")>
-<Assembly: AssemblyFileVersion("2.4.5.4")>
+<Assembly: AssemblyVersion("2.4.5.5")>
+<Assembly: AssemblyFileVersion("2.4.5.5")>

Project/CurrentProjectPageUC.xaml.vb

@@ -508,20 +508,6 @@ 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

Project/ProjectMgrUC.xaml.vb

@@ -753,7 +753,7 @@ Public Class ProjectMgrUC
       Else
          m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
          EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
-         EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
+         EgtResetMark(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
       End If
       ' aggiorno il disegno
       EgtDraw()