Gestione qualità tagli WJ in SplitPage

(cherry picked from commit c01972f99e)

EgtStoneLib/EstCalc.vb

@@ -247,7 +247,7 @@ Module EstCalc
    Friend Function SetCurrSawing(sCurrSawing As String) As Boolean
       Dim nOperId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), "Opers")
       If nOperId = GDB_ID.NULL Then Return False
-      Return EgtSetInfo(nOperId, INFO_CURRSAWING, sCurrSawing)
+      Return EgtSetInfo(nOperId, INFO_CURRSAWING, sCurrSawing, True)
    End Function
 
    Friend Function GetCurrSawing() As String
@@ -261,7 +261,7 @@ Module EstCalc
    Friend Function SetCurrMilling(sCurrMilling As String) As Boolean
       Dim nOperId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), "Opers")
       If nOperId = GDB_ID.NULL Then Return False
-      Return EgtSetInfo(nOperId, INFO_CURRMILLING, sCurrMilling)
+      Return EgtSetInfo(nOperId, INFO_CURRMILLING, sCurrMilling, True)
    End Function
 
    Friend Function GetCurrMilling() As String
@@ -275,7 +275,7 @@ Module EstCalc
    Friend Function SetCurrDrilling(sCurrDrilling As String) As Boolean
       Dim nOperId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), "Opers")
       If nOperId = GDB_ID.NULL Then Return False
-      Return EgtSetInfo(nOperId, INFO_CURRDRILLING, sCurrDrilling)
+      Return EgtSetInfo(nOperId, INFO_CURRDRILLING, sCurrDrilling, True)
    End Function
 
    Friend Function GetCurrDrilling() As String
@@ -289,7 +289,7 @@ Module EstCalc
    Friend Function SetCurrPocketing(sCurrMilling As String) As Boolean
       Dim nOperId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), "Opers")
       If nOperId = GDB_ID.NULL Then Return False
-      Return EgtSetInfo(nOperId, INFO_CURRPOCKETING, sCurrMilling)
+      Return EgtSetInfo(nOperId, INFO_CURRPOCKETING, sCurrMilling, True)
    End Function
 
    Friend Function GetCurrPocketing() As String
@@ -303,7 +303,7 @@ Module EstCalc
    Friend Function SetCurrWaterjetting(sCurrMilling As String) As Boolean
       Dim nOperId As Integer = EgtGetFirstNameInGroup(EgtGetCurrMachGroup(), "Opers")
       If nOperId = GDB_ID.NULL Then Return False
-      Return EgtSetInfo(nOperId, INFO_CURRWATERJETTING, sCurrMilling)
+      Return EgtSetInfo(nOperId, INFO_CURRWATERJETTING, sCurrMilling, True)
    End Function
 
    Friend Function GetCurrWaterjetting() As String

OmagOFFICE.vbproj

@@ -251,6 +251,10 @@
     </Compile>
     <Compile Include="OptionPanel\MachiningTab\ModifStartEndCutWindowVM.vb" />
     <Compile Include="OptionPanel\MachiningTab\ModifStartEndWjWindowVM.vb" />
+    <Compile Include="OptionPanel\MachiningTab\ModifyQualityV.xaml.vb">
+      <DependentUpon>ModifyQualityV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="OptionPanel\MachiningTab\ModifyQualityVM.vb" />
     <Compile Include="OptionPanel\MachiningTab\MoveRawModeV.xaml.vb">
       <DependentUpon>MoveRawModeV.xaml</DependentUpon>
     </Compile>
@@ -441,6 +445,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="OptionPanel\MachiningTab\ModifyQualityV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OptionPanel\MachiningTab\MoveRawModeV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

OptionPanel/MachiningTab/MachiningTabV.xaml

@@ -7,20 +7,20 @@
       <Button Style="{StaticResource OptionPanel_Button}"
               Command="{Binding PrevCommand}"
               IsEnabled="{Binding PrevIsEnabled}"
-              Margin="0,0,2.5,0">
+              Margin="0,0,0,0">
          <Image Source="/Resources/MachiningTab/BackArrow.png"/>
       </Button>
       <Button Style="{StaticResource OptionPanel_Button}"
               Command="{Binding NextCommand}"
               IsEnabled="{Binding NextIsEnabled}"
-              Margin="0,0,2.5,0">
+              Margin="0,0,0,0">
          <Image Source="/Resources/MachiningTab/ForwardArrow.png"/>
       </Button>
       <Button Style="{StaticResource OptionPanel_Button}"
               Content="{Binding ModifyMsg}"
               Command="{Binding ModifyCommand}"
               IsEnabled="{Binding ModifyIsEnabled}"
-              Margin="0,0,2.5,0"/>
+              Margin="0,0,0,0"/>
       <Button Style="{StaticResource OptionPanel_Button}"
               Content="{Binding AutoMsg}"
               Command="{Binding AutoCommand}"

OptionPanel/MachiningTab/ModifyQualityV.xaml

@@ -0,0 +1,53 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="ModifyQualityV"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   IsMinimizable="False"
+   ShowInTaskbar="False"
+   Title="{Binding Title}"
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   Height="200" Width="400"
+   WindowStartupLocation="CenterOwner">
+
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.5*"/>
+         <ColumnDefinition Width="4*"/>
+         <ColumnDefinition Width="4*"/>
+         <ColumnDefinition Width="0.5*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="0.5*"/>
+         <RowDefinition Height="0.5*"/>
+         <RowDefinition Height="0.5*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="0.5*"/>
+      </Grid.RowDefinitions>
+
+      <TextBlock Grid.Column="1" Grid.Row="1" Margin="0,5,0,0"
+                        Style="{StaticResource OptionTextBlock}" Text="{Binding ValueMsg}"/>
+      <ComboBox ItemsSource="{Binding QualityList}"
+                SelectedItem="{Binding SelectedQuality}"
+                Grid.Column="2" Grid.Row="1" Margin="10,5,10,0"/>
+
+      <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1" Grid.ColumnSpan="2">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="0.5*"/>
+         </Grid.ColumnDefinitions>
+
+         <Button Name="OkBtn" Content="{Binding OkMsg}" Grid.Column="1"
+                 Style="{DynamicResource ToolBar_TextButton}">
+         </Button>
+         <Button Content="{Binding ExitMsg}" Grid.Column="3"
+                    IsCancel="True"
+                    Style="{DynamicResource ToolBar_TextButton}">
+         </Button>
+
+      </Grid>
+
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

OptionPanel/MachiningTab/ModifyQualityV.xaml.vb

@@ -0,0 +1,6 @@
+Public Class ModifyQualityV
+
+   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
+      DialogResult = True
+   End Sub
+End Class

OptionPanel/MachiningTab/ModifyQualityVM.vb

@@ -0,0 +1,61 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+Public Class ModifyQualityVM
+   Inherits VMBase
+
+   Private m_Title As String = String.Empty
+   Public Property Title As String
+      Get
+         Return m_Title
+      End Get
+      Set(value As String)
+         m_Title = value
+      End Set
+   End Property
+   Public ReadOnly Property ValueMsg As String
+      Get
+         Return EgtMsg(MSG_SPLITPAGEUC + 35)
+      End Get
+   End Property
+
+   Public ReadOnly Property OkMsg As String
+      Get
+         Return EgtMsg(91651)          'Ok
+      End Get
+   End Property
+
+   Public ReadOnly Property ExitMsg As String
+      Get
+         Return EgtMsg(91652)          'Annulla
+      End Get
+   End Property
+
+   Private m_QualityList As New ObservableCollection(Of String)
+
+   Public Property QualityList As ObservableCollection(Of String)
+      Get
+         Return m_QualityList
+      End Get
+      Set(value As ObservableCollection(Of String))
+         m_QualityList = value
+      End Set
+   End Property
+
+   Private m_SelectedQuality As String
+
+   Public Property SelectedQuality As String
+      Get
+         Return m_SelectedQuality
+      End Get
+      Set(value As String)
+         m_SelectedQuality = value
+      End Set
+   End Property
+
+   Sub New()
+
+   End Sub
+
+End Class

OptionPanel/MachiningTab/SplitModeV.xaml

@@ -7,17 +7,17 @@
       <ListBox ItemsSource="{Binding ItemList}"
                DisplayMemberPath="Name"
                SelectionMode="Extended"
-               Height="250" Margin="0,0,0,5">
-          <ListBox.ItemContainerStyle>
-              <Style TargetType="ListBoxItem">
-                  <Style.Triggers>
-                      <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                          <Setter Property="Foreground" Value="{StaticResource Omag_Gray}"/>
-                      </DataTrigger>
-                  </Style.Triggers>
-                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-              </Style>
-          </ListBox.ItemContainerStyle>
+               Height="200" Margin="0,0,0,5">
+         <ListBox.ItemContainerStyle>
+            <Style TargetType="ListBoxItem">
+               <Style.Triggers>
+                  <DataTrigger Binding="{Binding bIsActive}" Value="False">
+                     <Setter Property="Foreground" Value="{StaticResource Omag_Gray}"/>
+                  </DataTrigger>
+               </Style.Triggers>
+               <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+            </Style>
+         </ListBox.ItemContainerStyle>
       </ListBox>
 
       <Grid Margin="0,0,0,5">
@@ -44,7 +44,7 @@
       </Grid>
 
       <Border Margin="0,0,0,5" Style="{StaticResource Border}">
-         
+
          <UniformGrid Columns="3">
 
             <Button Content="{Binding OnOffMsg}"
@@ -65,29 +65,37 @@
       </Border>
 
       <Border Margin="0,0,0,5" Style="{StaticResource Border}">
-         
+
          <StackPanel>
-            
+
             <UniformGrid Columns="3" Margin="0,0,0,5">
-                <Grid>
-                   <Button Content="{Binding CutMsg}"
+               <Grid>
+                  <Button Content="{Binding CutMsg}"
                            Style="{StaticResource OptionPanel_TextWrapButton}"
                            Command="{Binding CutCommand}"
                            Visibility="{Binding CutBtnVisibility}"
                            Margin="0,0,2.5,0"/>
-                   <ToggleButton Grid.Row="0"
+                  <ToggleButton Grid.Row="0"
                            Content="{Binding BridgeMsg}"           
                            Style="{StaticResource OptionPanel_ToggleWrapButton}"
                            IsChecked="{Binding BridgeBtn_IsChecked}"
                            Visibility="{Binding BridgeBtnVisibility}"
                            Margin="0,0,2.5,0" Padding="0"/>
-                </Grid>
-                
-               <Button Content="{Binding CutStartMsg}"
+               </Grid>
+
+               <Grid>
+                  <Button Content="{Binding CutStartMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding CutStartCommand}"
                        Visibility="{Binding CutStartBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>
+                  <Button Content="{Binding QualityMsg}"
+                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                       Command="{Binding QualityCommand}"
+                       Visibility="{Binding QualityBtnVisibility}"
+                       Margin="2.5,0,2.5,0"/>
+               </Grid>
+
                <Grid>
                   <Button Content="{Binding CutEndMsg}"
                           Style="{StaticResource OptionPanel_TextWrapButton}"
@@ -125,11 +133,11 @@
             </Grid>
 
          </StackPanel>
-         
+
       </Border>
 
       <Border Margin="0,0,0,5" Style="{StaticResource Border}">
-         
+
          <StackPanel>
 
             <UniformGrid Columns="3" Margin="0,0,0,5">
@@ -149,11 +157,11 @@
                        Command="{Binding AllCenStartCommand}"
                        Visibility="{Binding AllCenStartBtnVisibility}"
                        Margin="2.5,0,0,0"/>
-               
+
             </UniformGrid>
 
             <UniformGrid Columns="3" Margin="0,0,0,5">
-              
+
                <Button Content="{Binding OutCenEndMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding OutCenEndCommand}"
@@ -195,14 +203,14 @@
             </UniformGrid>
 
             <UniformGrid Columns="3" Margin="0,0,0,5">
-                <!--Bottone invisibile per permetter il corretto allineamento-->
-                <Button Content="{Binding }" Grid.Column="0"
+               <!--Bottone invisibile per permetter il corretto allineamento-->
+               <Button Content="{Binding }" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding }"
                         Visibility="Hidden"
                        Margin="2.5,0,2.5,0"/>
-                    <!--Inverti direzione di taglio-->
-                    <Button Content="{Binding InvertMsg}" Grid.Column="0"
+               <!--Inverti direzione di taglio-->
+               <Button Content="{Binding InvertMsg}" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding InvertCommand}"
                             Visibility="{Binding InvertBtnVisibility}"
@@ -210,7 +218,7 @@
 
             </UniformGrid>
 
-            </StackPanel>
+         </StackPanel>
 
       </Border>
 

OptionPanel/MachiningTab/SplitModeVM.vb

@@ -256,6 +256,18 @@ Public Class SplitModeVM
       End Set
    End Property
 
+   Private m_QualityBtnVisibility As Visibility = Visibility.Hidden
+
+   Public Property QualityBtnVisibility As Visibility
+      Get
+         Return m_QualityBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_QualityBtnVisibility = value
+         NotifyPropertyChanged(NameOf(QualityBtnVisibility))
+      End Set
+   End Property
+
    Private m_BridgeBtn_IsChecked As Boolean = False
    Public Property BridgeBtn_IsChecked As Boolean
       Get
@@ -402,6 +414,12 @@ Public Class SplitModeVM
       End Get
    End Property
 
+   Public ReadOnly Property QualityMsg As String
+      Get
+         Return "Quality"
+      End Get
+   End Property
+
 #End Region    ' Messages
 
    ' Definizione comandi
@@ -425,6 +443,7 @@ Public Class SplitModeVM
    Private m_cmdModifEnd As ICommand
    Private m_cmdPause As ICommand
    Private m_cmdInvert As ICommand
+   Private m_cmdQuality As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -867,9 +886,11 @@ Public Class SplitModeVM
          If CutBtnVisibility = Visibility.Hidden Then
             BridgeBtnVisibility = Visibility.Visible
             BridgeDeleteBtnVisibility = Visibility.Visible
+            QualityBtnVisibility = Visibility.Visible
          Else
             BridgeBtnVisibility = Visibility.Hidden
             BridgeDeleteBtnVisibility = Visibility.Hidden
+            QualityBtnVisibility = Visibility.Hidden
          End If
       Else
          BridgeBtnVisibility = Visibility.Hidden
@@ -2605,6 +2626,72 @@ Public Class SplitModeVM
 
 #End Region    ' Bridge
 
+#Region "Quality"
+
+   Public ReadOnly Property QualityCommand As ICommand
+      Get
+         If m_cmdQuality Is Nothing Then
+            m_cmdQuality = New Command(AddressOf ModifyQuality)
+         End If
+         Return m_cmdQuality
+      End Get
+   End Property
+
+   Public Sub ModifyQuality()
+      Dim bFirstWJ As Boolean = True
+      Dim sQuality As String = String.Empty
+      ' Recupero la lavorazione corrente
+      If m_CurrFirstInd = -1 Then Return
+      Dim bGenModif As Boolean = False
+      For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
+         Dim nI As Integer = m_ItemList(Index).Ind
+         Dim nOperId As Integer = m_MachiningList(nI).m_nId
+         Dim nMachiningType As Integer = EgtGetOperationType(nOperId)
+         ' se altrimenti getto d'acqua
+         If nMachiningType = MCH_MY.WATERJETTING Then
+            ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
+            If bFirstWJ Then
+               EgtSetCurrMachining(nOperId)
+               ' Dialogo richiesta valore
+               '(m_MainWindow, m_MainWindow.m_CurrentMachine.Qualities, "Quality")
+               Dim ModifyQualityWnd As New ModifyQualityV
+               Dim ModifyQuality As New ModifyQualityVM
+               ModifyQuality.Title = "Quality"
+               ModifyQuality.QualityList = CurrentMachine.Qualities
+               ModifyQualityWnd.DataContext = ModifyQuality
+               ModifyQualityWnd.Owner = Application.Current.MainWindow
+               If EgtGetInfo(nOperId, "Quality", sQuality) Then
+                  ModifyQuality.SelectedQuality = sQuality
+               Else
+                  ModifyQuality.SelectedQuality = CurrentMachine.sCurrWaterJettingQuality
+               End If
+               If Not ModifyQualityWnd.ShowDialog() Then Return
+               sQuality = ModifyQuality.SelectedQuality
+               ' comunico che ho letto il primo dato
+               bFirstWJ = False
+
+            End If
+            ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            EgtSetInfo(nOperId, "Quality", sQuality)
+            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+            ' verifico interferenza
+            bGenModif = True
+         End If
+      Next
+      ' Se modificato qualcosa
+      If bGenModif Then
+         EgtDraw()
+         m_bModified = True
+      End If
+   End Sub
+
+#End Region    ' Quality
+
    Friend Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
       If Not m_bActive OrElse OmagOFFICEMap.refMachiningTabVM.IsShow Then Return