From 576d547a85190c023f39bfa8006ad3dc1dc31eec Mon Sep 17 00:00:00 2001 From: NicolaP Date: Fri, 16 Dec 2022 17:50:39 +0100 Subject: [PATCH 1/4] Aggiunti nuovi campi per la gestione dei fori nei lavelli --- Machine/AlarmsPageUC.xaml | 964 ++++++++++++++++++----------------- Machine/AlarmsPageUC.xaml.vb | 7 +- 2 files changed, 498 insertions(+), 473 deletions(-) diff --git a/Machine/AlarmsPageUC.xaml b/Machine/AlarmsPageUC.xaml index d1f196b..d50adaf 100644 --- a/Machine/AlarmsPageUC.xaml +++ b/Machine/AlarmsPageUC.xaml @@ -10,317 +10,337 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + - + - - + - - - - - - - - + + + + + + + + + + + + - - + + - - + + - + + - - - - - - + + - + + + - - - - - - - + + + + + + - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Machine/AlarmsPageUC.xaml.vb b/Machine/AlarmsPageUC.xaml.vb index 70520fe..ac6c66d 100644 --- a/Machine/AlarmsPageUC.xaml.vb +++ b/Machine/AlarmsPageUC.xaml.vb @@ -91,7 +91,12 @@ Public Class AlarmsPageUC TmDepthTxBl.Text = EgtMsg( 91063) ' Profondità TmWidthTxBl.Text = EgtMsg( 91064) ' Larghezza WJsParamGpBx.Header = EgtMsg( 91058) ' Parametri waterjet - WjIntCutsTxBl.Text = EgtMsg( 90930) ' Sempre sugli interni + WjIntCutsTxBl.Text = EgtMsg(90930) ' Sempre sugli interni + '-- INIZIO -- nuovi parametri per preforo lavello + HolesDiameterWJTxBl.Text = "Diameter" + HolesOffsetWJTxBl.Text = "Offset" + OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26) + '-- FINE -- nuovi parametri per preforo lavello NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31) ' Nesting AlignTxBl.Text = EgtMsg(90932) ' Allineato GhigliottinaTxBl.Text = EgtMsg(91066) ' Ghigliottina From 468270cbabff0c46d6647b3f6a8f3c1371f9f28d Mon Sep 17 00:00:00 2001 From: NicolaP Date: Fri, 16 Dec 2022 19:11:57 +0100 Subject: [PATCH 2/4] Aggiunto parametro Tolerance per preforo --- Machine/AlarmsPageUC.xaml | 14 ++++++++++---- Machine/AlarmsPageUC.xaml.vb | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Machine/AlarmsPageUC.xaml b/Machine/AlarmsPageUC.xaml index d50adaf..679212d 100644 --- a/Machine/AlarmsPageUC.xaml +++ b/Machine/AlarmsPageUC.xaml @@ -184,8 +184,8 @@ - - + @@ -198,6 +198,7 @@ + - + + + - diff --git a/Machine/AlarmsPageUC.xaml.vb b/Machine/AlarmsPageUC.xaml.vb index ac6c66d..4c1ef00 100644 --- a/Machine/AlarmsPageUC.xaml.vb +++ b/Machine/AlarmsPageUC.xaml.vb @@ -95,6 +95,7 @@ Public Class AlarmsPageUC '-- INIZIO -- nuovi parametri per preforo lavello HolesDiameterWJTxBl.Text = "Diameter" HolesOffsetWJTxBl.Text = "Offset" + HolesToleranceWJTxBl.Text = "Tolerance" OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26) '-- FINE -- nuovi parametri per preforo lavello NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31) ' Nesting @@ -933,6 +934,29 @@ Public Class AlarmsPageUC End If End Sub + ' -- INIZIO -- nuovi parametri per prefori WaterJet + Private Sub HolesDiameterWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesDiameterWJTxBx.EgtClosed + 'WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile()) + End Sub + + Private Sub HolesOffsetWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesOffsetWJTxBx.EgtClosed + 'WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile()) + End Sub + + Private Sub HolesToleranceWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesToleranceWJTxBx.EgtClosed + 'WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile()) + End Sub + + Private Sub OneHoleInCornerWJChBx_Click(sender As Object, e As EventArgs) Handles OneHoleInCornerWJChBx.Click + If OneHoleInCornerWJChBx.IsChecked() Then + ' WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile()) + Else + ' WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "0", m_MainWindow.GetMachIniFile()) + End If + End Sub + + ' -- FINE -- nuovi parametri per prefori WaterJet + Private Sub TmEnableChBx_Click(sender As Object, e As RoutedEventArgs) Handles TmEnableChBx.Click If TmEnableChBx.IsChecked() Then WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "1", m_MainWindow.GetMachIniFile()) From 73a1caf1d06b24b7727304c11d8fa46fd23e9eed Mon Sep 17 00:00:00 2001 From: NicolaP Date: Mon, 19 Dec 2022 11:01:15 +0100 Subject: [PATCH 3/4] Stampa configurazione in fil eini macchina --- Constants/ConstMachIni.vb | 4 ++++ Machine/AlarmsPageUC.xaml | 4 ++-- Machine/AlarmsPageUC.xaml.vb | 20 +++++++++++++------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb index 491e742..a3684d2 100644 --- a/Constants/ConstMachIni.vb +++ b/Constants/ConstMachIni.vb @@ -219,6 +219,10 @@ Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen" 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_MIN_RADIUSWJ As String = "MinRadiusWJ" + Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners" ' DrillMillC90 ' CutLongDxSx ' AngRotMultiCut diff --git a/Machine/AlarmsPageUC.xaml b/Machine/AlarmsPageUC.xaml index 679212d..51e142f 100644 --- a/Machine/AlarmsPageUC.xaml +++ b/Machine/AlarmsPageUC.xaml @@ -216,9 +216,9 @@ - - Date: Wed, 28 Dec 2022 17:33:46 +0100 Subject: [PATCH 4/4] Caricamento dati per preforo Wj --- Constants/ConstMachIni.vb | 2 +- Machine/AlarmsPageUC.xaml.vb | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) 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