Compare commits

...

3 Commits

Author SHA1 Message Date
NicolaP 56884c34f2 Migliorata lettura dato Sovratavola 2022-06-01 12:35:06 +02:00
NicolaP 332b17e55e Lettura/Scrittura dimensione sovratavola nel progetto 2022-06-01 11:50:03 +02:00
NicolaP 4bcbe8d290 Merge branch 'master' into develop 2022-06-01 10:18:53 +02:00
2 changed files with 31 additions and 1 deletions
+17 -1
View File
@@ -752,6 +752,7 @@ Public Class CurrentMachine
End Select End Select
End Get End Get
Set(value As Double) Set(value As Double)
Dim dValue As Double = 0
Select Case GetCurrentTable() Select Case GetCurrentTable()
Case 3 Case 3
If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
@@ -760,14 +761,24 @@ Public Class CurrentMachine
m_dTab3AdditionalTable = value m_dTab3AdditionalTable = value
' Aggiorno il progetto corrente ' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable() 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 End If
Case 2 Case 2
If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
WritePrivateProfileString(S_TABLE, K_TAB2_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then WritePrivateProfileString(S_TABLE, K_TAB2_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
' Aggiorno il valore corrente ' Aggiorno il valore corrente
m_dTab2AdditionalTable = value m_dTab2AdditionalTable = value
' Aggiorno il progetto corrente ' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable() 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 End If
Case Else Case Else
If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
@@ -776,6 +787,11 @@ Public Class CurrentMachine
m_dAdditionalTable = value m_dAdditionalTable = value
' Aggiorno il progetto corrente ' Aggiorno il progetto corrente
m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable() 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 If
End Select End Select
End Set End Set
+14
View File
@@ -508,6 +508,20 @@ Public Class CurrentProjectPageUC
UpdateHeightTxBx() UpdateHeightTxBx()
' aggiorno materiale ' aggiorno materiale
m_MainWindow.m_CurrentMachine.SetCurrMatByName(GetProjectMaterial()) 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 ' forzo visualizzazione eventuali dati su aree
SetAreasStatus( True) SetAreasStatus( True)
' Dichiaro progetto non modificato ' Dichiaro progetto non modificato