From 689b33ec838ac2cd4c7cb7bb1d25c45b8c7eb288 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 24 Oct 2019 18:26:00 +0000
Subject: [PATCH] OmagCUT : - alle lavorazioni correnti aggiunto Waterjet -
 piccole modifiche DB lavorazioni.

---
 AlarmsPageUC.xaml         | 20 +++++++++++++-------
 AlarmsPageUC.xaml.vb      |  8 ++++++++
 MachiningDbPageUC.xaml.vb | 12 ++++++------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/AlarmsPageUC.xaml b/AlarmsPageUC.xaml
index 1d670fd..c56f734 100644
--- a/AlarmsPageUC.xaml
+++ b/AlarmsPageUC.xaml
@@ -238,7 +238,7 @@
             </GroupBox>
 
             <GroupBox Name="MachiningsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1"
-            Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="3">
+                      Grid.Row="0" Grid.ColumnSpan="1" Grid.RowSpan="3">
 
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -251,9 +251,10 @@
                         <RowDefinition Height="0.5*"/>
                         <RowDefinition Height="0.5*"/>
                         <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
                     </Grid.RowDefinitions>
 
-                    <TextBlock Name="CurrSawingTxBl" Grid.Column="0" Grid.Row="0"
+                  <TextBlock Name="CurrSawingTxBl" Grid.Column="0" Grid.Row="0"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
                     <EgtWPFLib:EgtTextBox Name="CurrSawingTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
@@ -268,17 +269,22 @@
                     <EgtWPFLib:EgtTextBox Name="CurrMillingTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-                    <TextBlock Name="CurrDripSawingTxBl" Grid.Column="0" Grid.Row="3"
+                    <TextBlock Name="CurrWaterJettingTxBl" Grid.Column="0" Grid.Row="3"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                    <EgtWPFLib:EgtTextBox Name="CurrDripSawingTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
+                    <EgtWPFLib:EgtTextBox Name="CurrWaterJettingTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-                    <TextBlock Name="CurrDripDrillingTxBl" Grid.Column="0" Grid.Row="4"
+                    <TextBlock Name="CurrDripSawingTxBl" Grid.Column="0" Grid.Row="4"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                    <EgtWPFLib:EgtTextBox Name="CurrDripDrillingTxBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
+                    <EgtWPFLib:EgtTextBox Name="CurrDripSawingTxBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-                </Grid>
+                    <TextBlock Name="CurrDripDrillingTxBl" Grid.Column="0" Grid.Row="5"
+                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                    <EgtWPFLib:EgtTextBox Name="CurrDripDrillingTxBx" Grid.Column="1" Grid.Row="5" Margin="10,0,10,0"
+                  Style="{DynamicResource OmagCut_FixedTextBox}" />
+
+            </Grid>
 
             </GroupBox>
 
diff --git a/AlarmsPageUC.xaml.vb b/AlarmsPageUC.xaml.vb
index 49aa1d7..ca849e8 100644
--- a/AlarmsPageUC.xaml.vb
+++ b/AlarmsPageUC.xaml.vb
@@ -91,6 +91,7 @@ Public Class AlarmsPageUC
       CurrSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 2)                ' Taglio lama
       CurrDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 3)              ' Foratura
       CurrMillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 4)               ' Fresatura
+      CurrWaterJettingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 7)          ' WaterJet
       CurrDripSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 5)            ' DripSawing
       CurrDripDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 6)          ' DripDrilling
       AutoRawImageParamGpBx.Visibility = Windows.Visibility.Hidden
@@ -208,6 +209,8 @@ Public Class AlarmsPageUC
       CurrDrillingTxBx.Visibility = Windows.Visibility.Hidden
       CurrMillingTxBl.Visibility = Windows.Visibility.Hidden
       CurrMillingTxBx.Visibility = Windows.Visibility.Hidden
+      CurrWaterJettingTxBl.Visibility = Windows.Visibility.Hidden
+      CurrWaterJettingTxBx.Visibility = Windows.Visibility.Hidden
       CurrDripSawingTxBl.Visibility = Windows.Visibility.Hidden
       CurrDripSawingTxBx.Visibility = Windows.Visibility.Hidden
       CurrDripDrillingTxBl.Visibility = Windows.Visibility.Hidden
@@ -228,6 +231,11 @@ Public Class AlarmsPageUC
          CurrMillingTxBl.Visibility = Windows.Visibility.Visible
          CurrMillingTxBx.Visibility = Windows.Visibility.Visible
       End If
+      If m_CurrentMachine.sCurrwaterJetting <> String.Empty Then
+         CurrWaterJettingTxBx.Text = m_CurrentMachine.sCurrwaterJetting
+         CurrWaterJettingTxBl.Visibility = Windows.Visibility.Visible
+         CurrWaterJettingTxBx.Visibility = Windows.Visibility.Visible
+      End If
       If m_CurrentMachine.sCurrDripSawing <> String.Empty Then
          CurrDripSawingTxBx.Text = m_CurrentMachine.sCurrDripSawing
          CurrDripSawingTxBl.Visibility = Windows.Visibility.Visible
diff --git a/MachiningDbPageUC.xaml.vb b/MachiningDbPageUC.xaml.vb
index d094a41..0a30755 100644
--- a/MachiningDbPageUC.xaml.vb
+++ b/MachiningDbPageUC.xaml.vb
@@ -1983,28 +1983,28 @@ Public Class MachiningDbPageUC
                                            New IdNameStruct(MCH_SAW_LO.EXT_OUT, EgtMsg(MSG_COMBOBOXPARAM + 28))})
          Case MCH_MY.MILLING
             LeadInTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
-                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
+                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
                                            New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48))})
             LeadOutTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
-                                         {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
+                                         {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
                                           New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48)),
                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_COMBOBOXPARAM + 50))})
          Case MCH_MY.POCKETING
             LeadInTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
-                                          {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
+                                          {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
                                            New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48)),
                                            New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(MSG_COMBOBOXPARAM + 38)),
                                            New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(MSG_COMBOBOXPARAM + 49))})
             LeadOutTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
-                                          {New IdNameStruct(MCH_POCK_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
+                                          {New IdNameStruct(MCH_POCK_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
                                            New IdNameStruct(MCH_POCK_LO.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48))})
          Case MCH_MY.WATERJETTING
             LeadInTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
-                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
+                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
                                            New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)),
                                            New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47))})
             LeadOutTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
-                                         {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
+                                         {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
                                           New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)),
                                           New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47)),
                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_COMBOBOXPARAM + 50))})