diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb index a3684d2..ced2363 100644 --- a/Constants/ConstMachIni.vb +++ b/Constants/ConstMachIni.vb @@ -220,7 +220,7 @@ Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc" Public Const K_USELASERORIGIN As String = "UseLaserOrigin" Public Const K_HOLES_DIAMITERWJ As String = "HolesDiameterWJ" - Public Const K_HOLESO_FFSETWJ As String = "HolesOffsetWJ" + Public Const K_HOLES_OFFSETWJ As String = "HolesOffsetWJ" Public Const K_MIN_RADIUSWJ As String = "MinRadiusWJ" Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners" ' DrillMillC90 diff --git a/Machine/AlarmsPageUC.xaml.vb b/Machine/AlarmsPageUC.xaml.vb index 3fc3043..72424cd 100644 --- a/Machine/AlarmsPageUC.xaml.vb +++ b/Machine/AlarmsPageUC.xaml.vb @@ -339,12 +339,22 @@ Public Class AlarmsPageUC EgtMdbSave() ' Leggo lavorazione angoli con fresa CornerCutsChBx.IsChecked = - (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0) + (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0) ' Leggo lavorazione interni con fresa InternalCutsChBx.IsChecked = - (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0) + (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0) WjIntCutsChBx.IsChecked = - (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0) + (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0) + ' Lavorazione preforo lavello con WaterJet + dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_DIAMITERWJ, 0, m_MainWindow.GetMachIniFile()) + HolesDiameterWJTxBx.Text = LenToString(dVal, 2) + dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_OFFSETWJ, 0, m_MainWindow.GetMachIniFile()) + HolesOffsetWJTxBx.Text = LenToString(dVal, 2) + dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MIN_RADIUSWJ, 0, m_MainWindow.GetMachIniFile()) + MinRadiusWJTxBx.Text = LenToString(dVal, 2) + OneHoleInCornerWJChBx.IsChecked = + (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0) + ' Leggo accorciamento angoli con fresa dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile()) ShortTxBx.Text = LenToString(dVal, 2) @@ -397,7 +407,7 @@ Public Class AlarmsPageUC If nWashing = -1 Then WashingGpBx.Visibility = Visibility.Hidden Else - WashingChBx.IsChecked = ( nWashing <> 0) + WashingChBx.IsChecked = (nWashing <> 0) End If ' Leggo parametri per variazione feed in tagli CfrLenTxBx.Text = LenToString(m_CurrentMachine.dFsevLength, 3) @@ -944,12 +954,12 @@ Public Class AlarmsPageUC Private Sub HolesOffsetWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesOffsetWJTxBx.EgtClosed Dim dVal As Double = 0 StringToLen(HolesOffsetWJTxBx.Text, dVal) - WritePrivateProfileString(S_MACH_NEST, K_HOLESO_FFSETWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile()) + WritePrivateProfileString(S_MACH_NEST, K_HOLES_OFFSETWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile()) End Sub Private Sub MinRadiusWJTxBx_Click(sender As Object, e As EventArgs) Handles MinRadiusWJTxBx.EgtClosed Dim dVal As Double = 0 - StringToLen(HolesOffsetWJTxBx.Text, dVal) + StringToLen(MinRadiusWJTxBx.Text, dVal) WritePrivateProfileString(S_MACH_NEST, K_MIN_RADIUSWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile()) End Sub