diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 33d8274..91af21b 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -279,7 +279,6 @@ Module ConstIni Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir" Public Const K_CURRMACH As String = "CurrMach" Public Const K_ENABLEFINALSAWCUT As String = "EnableFinalSawCut" - Public Const K_FINALDEPTH As String = "FinalDepth" Public Const S_SIMUL As String = "Simul" Public Const K_SLIDERX As String = "SliderX" diff --git a/Machine/AlarmsPageUC.xaml b/Machine/AlarmsPageUC.xaml index 11240e5..550d030 100644 --- a/Machine/AlarmsPageUC.xaml +++ b/Machine/AlarmsPageUC.xaml @@ -579,7 +579,7 @@ - @@ -588,7 +588,6 @@ - - - - - - - diff --git a/Machine/AlarmsPageUC.xaml.vb b/Machine/AlarmsPageUC.xaml.vb index 5f84da6..469a73a 100644 --- a/Machine/AlarmsPageUC.xaml.vb +++ b/Machine/AlarmsPageUC.xaml.vb @@ -108,7 +108,6 @@ Public Class AlarmsPageUC WashingTxBl.Text = EgtMsg(90941) ' Lavaggio FinalSawCutGpBx.Header = EgtMsg(91254) ' Taglio Finale EnableFinalSawCutTxBl.Text = EgtMsg(91255) ' Abilita - FinalDepthTxBl.Text = EgtMsg(91256) ' Ultimo Spessore AutoRawImageParamGpBx.Visibility = Windows.Visibility.Hidden End Sub @@ -388,7 +387,6 @@ Public Class AlarmsPageUC End If EnableFinalSawCutChBx.IsChecked = m_MainWindow.m_CurrentMachine.bEnableFinalSawCut - FinalDepthTxBx.Text = m_MainWindow.m_CurrentMachine.dFinalDepth End Sub ' aggiorna le text delle lavorazioni (la selezione avviene nella pagina del grezzo o dalla pagina del progetto corrente) @@ -1350,11 +1348,4 @@ Public Class AlarmsPageUC WritePrivateProfileString(S_MACH, K_ENABLEFINALSAWCUT, If(m_MainWindow.m_CurrentMachine.bEnableFinalSawCut, "1", "0"), m_MainWindow.GetMachIniFile()) End Sub - Private Sub FinalDepthTxBx_EgtClosed() Handles FinalDepthTxBx.EgtClosed - Dim dVal As Double = 0 - StringToLen(FinalDepthTxBx.Text, dVal) - m_MainWindow.m_CurrentMachine.dFinalDepth = dVal - WritePrivateProfileString(S_MACH, K_FINALDEPTH, DoubleToString(m_MainWindow.m_CurrentMachine.dFinalDepth, 3), m_MainWindow.GetMachIniFile()) - End Sub - End Class diff --git a/Machine/CurrentMachine.vb b/Machine/CurrentMachine.vb index 36cdc72..43055fd 100644 --- a/Machine/CurrentMachine.vb +++ b/Machine/CurrentMachine.vb @@ -217,9 +217,6 @@ Public Class CurrentMachine ' Massima altezza lavorabile con lama grande Private m_dHighPieceZ As Double = 200.0 - ' - Private m_dFinalDepth As Double = 0.0 - ' Flag che abilita l'esecuzione del taglio finale Private m_bEnableFinalSawCut As Boolean = False @@ -1236,15 +1233,6 @@ Public Class CurrentMachine End Set End Property - Friend Property dFinalDepth As Double - Get - Return m_dFinalDepth - End Get - Set(value As Double) - m_dFinalDepth = value - End Set - End Property - #End Region Sub New() @@ -1542,9 +1530,6 @@ Public Class CurrentMachine ' Flag per abilitare taglio finale m_bEnableFinalSawCut = GetPrivateProfileInt(S_MACH, K_ENABLEFINALSAWCUT, 0, m_MainWindow.GetMachIniFile()) <> 0 - - ' Flag per abilitare taglio finale - m_dFinalDepth = GetPrivateProfileDouble(S_MACH, K_FINALDEPTH, 0.0, m_MainWindow.GetMachIniFile()) End Sub ' Per il controllo FANUC al momento dell'inizializzazione del CN devono essere lette alcune variabili