Gestione definizione qualità nella pagina split

- modifiche per lancio script di macchina opzionale.

CadCuts/EditValueWD.xaml

@@ -27,6 +27,14 @@
          <EgtWPFLib:EgtTextBox Name="ValueTxBx" Grid.Column="1" Grid.Row="1"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
+         <ComboBox Name="ValueCmBx" Grid.Column="1" Grid.Row="1">
+            <ComboBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding}" FontSize="20" />
+               </DataTemplate>
+            </ComboBox.ItemTemplate>
+         </ComboBox>
+
          <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="0.5*"/>

CadCuts/EditValueWD.xaml.vb

@@ -1,6 +1,7 @@
 Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib
+Imports System.Collections.ObjectModel
 
 Public Class EditValueWD
 
@@ -8,13 +9,27 @@ Public Class EditValueWD
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private m_sMsg As String = "Value"
    Private m_sValue As String = ""
+   Private m_sList As ObservableCollection(Of String)
+   Private m_IsText As Boolean = True
 
+   ' avvia la visualizzazione della textbox
    Sub New(Owner As Window, Optional sMsg As String = "")
       Me.Owner = Owner
       m_sMsg = sMsg
+      m_IsText = True
       InitializeComponent()
    End Sub
 
+   ' avvia la visualizzazione della combobox
+   Sub New(Owner As Window, sList As ObservableCollection(Of String), Optional sMsg As String = "")
+      Me.Owner = Owner
+      m_sMsg = sMsg
+      m_IsText = False
+      InitializeComponent()
+      m_sList = sList
+      SetComboBox(m_sList)
+   End Sub
+
    Friend Function SetVal( dVal As Double) As Boolean
       m_sValue = DoubleToString( dVal, 3)
       ValueTxBx.Text = m_sValue
@@ -27,10 +42,36 @@ Public Class EditValueWD
       Return dVal
    End Function
 
+   Friend Function SetComboBox(sList As ObservableCollection(Of String)) As Boolean
+      ValueCmBx.ItemsSource = sList
+      Return True
+   End Function
+
+   Friend Function SetItemComboBox(sItem As String) As Boolean
+      For Each MyItem As String In ValueCmBx.ItemsSource
+         If MyItem = sItem Then
+            ValueCmBx.SelectedItem = MyItem
+         End If
+      Next
+      Return True
+   End Function
+
+   Friend Function GetItemComboBox() As String
+      Dim sVal As String = ValueCmBx.SelectedItem
+      Return sVal
+   End Function
+
    Private Sub EditValueWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
       Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
       ValueTxbl.Text = m_sMsg
+      If m_IsText Then
+         ValueCmBx.Visibility = Visibility.Collapsed
+         ValueTxBx.Visibility = Visibility.Visible
+      Else
+         ValueCmBx.Visibility = Visibility.Visible
+         ValueTxBx.Visibility = Visibility.Collapsed
+      End If
    End Sub
 
    Private Sub EditValueWD_Rendered(sender As Object, e As EventArgs) Handles Me.ContentRendered

CadCuts/SplitPageUC.xaml

@@ -38,7 +38,7 @@
                <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
                   <Image.RenderTransform>
                      <TransformGroup>
                         <RotateTransform Angle="180"/>
@@ -48,8 +48,8 @@
             </Button>
             <Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
             <Button Name="AutoBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                <Button Name="RestartBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}" Visibility="Hidden"/>
-            </Grid>
+            <Button Name="RestartBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}" Visibility="Hidden"/>
+         </Grid>
       </Grid>
 
       <!--Left Button Grid-->
@@ -63,17 +63,27 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <ListBox Name="MachiningLsBx" Grid.Row="1" ItemTemplate="{DynamicResource NameIdLsBxItem}"
+         <ListBox Name="MachiningLsBx" Grid.Row="1"
             SelectionMode="Extended">
-            <ListBox.ItemContainerStyle>
-               <Style TargetType="ListBoxItem">
-                  <Style.Triggers>
-                     <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                        <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
-                     </DataTrigger>
-                  </Style.Triggers>
-               </Style>
-            </ListBox.ItemContainerStyle>
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Name}">
+                     <TextBlock.Style>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource OmagCut_CurrProjSummeryTextBlock}">
+                           <Style.Triggers>
+                              <DataTrigger Binding="{Binding bIsActive}" Value="False">
+                                 <Setter Property="TextDecorations" Value="Strikethrough"/>
+                                 <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
+                              </DataTrigger>
+                              <DataTrigger Binding="{Binding bIsActive}" Value="True">
+                                 <Setter Property="Foreground" Value="Black"/>
+                              </DataTrigger>
+                           </Style.Triggers>
+                        </Style>
+                     </TextBlock.Style>
+                  </TextBlock>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
          </ListBox>
 
          <Grid Grid.Row="2">
@@ -101,13 +111,13 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="OnOffBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource ON_OFF-singolo-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource ON_OFF-singolo-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
             <Button Name="AllOnBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Tutti-ONImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource Tutti-ONImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
             <Button Name="AllOffBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Tutti-OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource Tutti-OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
 
          </Grid>
@@ -119,28 +129,36 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="CutBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <Button Name="CutStartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Inizio-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
+            <Button Name="CutBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            
+            <Button Name="CutStartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Inizio-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
 
-                <!-- solo per macchine con lavorazioni Waterjet -->
-                <ToggleButton Name="BridgesWJBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource PonticelliWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
+            <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Fine-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
 
-                <!-- solo per macchine con lavorazioni Waterjet -->
-                <ToggleButton Name="BridgesDeleteWJBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource PonticelliDeleteWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
+            <!-- solo per macchine con lavorazioni Waterjet -->
+            <ToggleButton Name="BridgesWJBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource PonticelliWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
 
-                <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Fine-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
+             <!--solo per macchine con lavorazioni Waterjet--> 
+            <Button Name="QualityWJBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource QualityWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            
+            <!-- solo per macchine con lavorazioni Waterjet -->
+            <ToggleButton Name="BridgesDeleteWJBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource PonticelliDeleteWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
 
-            </Grid>
+           
+
+         </Grid>
 
       </Grid>
 
@@ -163,41 +181,41 @@
 
 
          <Button Name="OutCenStartBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Inizio-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            <Image Source="{DynamicResource Inizio-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="OutCenEndBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Fine-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="ModifStartBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Modifica-InizioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="ModifEndBtn" Grid.Column="3"  Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Modifica-FineImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="InvertBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource InvertiImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="PauseBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="AllOutStartBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Inizio-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="AllCenStartBtn" Grid.Column="7" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Inizio-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="AllOutEndBtn" Grid.Column="8" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Fine-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="AllCenEndBtn" Grid.Column="9" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Fine-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="AllExtendBtn" Grid.Column="10" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Tutti-allungaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="AllReduceBtn" Grid.Column="11" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Tutti-accorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
          </Button>
-            <Button Name="OutCenEndBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Fine-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="ModifStartBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Modifica-InizioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="ModifEndBtn" Grid.Column="3"  Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Modifica-FineImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="InvertBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource InvertiImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="PauseBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllOutStartBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Inizio-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllCenStartBtn" Grid.Column="7" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Inizio-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllOutEndBtn" Grid.Column="8" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Fine-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllCenEndBtn" Grid.Column="9" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Fine-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllExtendBtn" Grid.Column="10" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Tutti-allungaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllReduceBtn" Grid.Column="11" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Tutti-accorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
 
       </Grid>
 

CadCuts/SplitPageUC.xaml.vb

@@ -978,6 +978,54 @@ Public Class SplitPageUC
       End If
    End Sub
 
+   Private Sub QualityWJBtn_Click(Sender As Object, e As RoutedEventArgs) Handles QualityWJBtn.Click
+      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
+               Dim ValWnd As New EditValueWD(m_MainWindow, m_MainWindow.m_CurrentMachine.Qualities, "Quality")
+               If EgtGetInfo(nOperId, "Quality", sQuality) Then
+                  ValWnd.SetItemComboBox(sQuality)
+               Else
+                  ValWnd.SetItemComboBox(m_MainWindow.m_CurrentMachine.sCurrWaterJettingQuality)
+               End If
+               If Not ValWnd.ShowDialog() Then Return
+               sQuality = ValWnd.GetItemComboBox
+               ' 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
+
    Private Function AdjustBothCuts(nI As Integer,
                                    Optional bAllForced As Boolean = False,
                                    Optional bAccForced As Boolean = False) As Boolean
@@ -1958,7 +2006,7 @@ Public Class SplitPageUC
       Dim MyCuts As New List(Of Integer)
       For nI As Integer = 0 To m_MachiningList.Count() - 1
          If m_MachiningList(nI).m_bEnabled And
-            ( m_MachiningList(nI).m_sLay = NAME_OUTLOOP Or m_MachiningList(nI).m_sLay = NAME_INLOOP) Then
+            (m_MachiningList(nI).m_sLay = NAME_OUTLOOP Or m_MachiningList(nI).m_sLay = NAME_INLOOP) Then
             MyCuts.Add(m_MachiningList(nI).m_nId)
          End If
       Next
@@ -1970,7 +2018,7 @@ Public Class SplitPageUC
       PrevBtn.IsEnabled = (m_nCurrPhase > 1)
       ' Per bottone NEXT
       ' Se abilitato manipolatore e non è con waterjet
-      If ( m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_MANIP) Or
+      If (m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_MANIP) Or
            m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.AUTO_MANIP)) And
            Not m_MainWindow.m_CurrentMachine.bWaterJetting Then
          ' Se in modifica
@@ -2032,6 +2080,7 @@ Public Class SplitPageUC
       PauseBtn.IsEnabled = Not m_bShow And m_MainWindow.m_CurrentMachine.bEnablePause
       BridgesWJBtn.IsEnabled = Not m_bShow
       BridgesDeleteWJBtn.IsEnabled = Not m_bShow
+      QualityWJBtn.IsEnabled = Not m_bShow
 
       ' nascondo i comandi che non devono essere visualizzati in funzione delle lavorazioni attive
       If m_nCountSawing = 0 And (m_nCountWaterjetting > 0 Or m_nCountOtherMachining) Then
@@ -2151,13 +2200,16 @@ Public Class SplitPageUC
          If CutStartBtn.Visibility = Visibility.Hidden Then
             BridgesWJBtn.Visibility = Visibility.Visible
             BridgesDeleteWJBtn.Visibility = Visibility.Visible
+            QualityWJBtn.Visibility = Visibility.Visible
          Else
             BridgesWJBtn.Visibility = Visibility.Hidden
             BridgesDeleteWJBtn.Visibility = Visibility.Hidden
+            QualityWJBtn.Visibility = Visibility.Hidden
          End If
       Else
          BridgesWJBtn.Visibility = Visibility.Hidden
          BridgesDeleteWJBtn.Visibility = Visibility.Hidden
+         QualityWJBtn.Visibility = Visibility.Hidden
       End If
    End Sub
 
@@ -2179,7 +2231,7 @@ Public Class SplitPageUC
       Return True
    End Function
 
-   Private Sub NumberDirectionMachining( nI As Integer, Optional bNumber As Boolean = True)
+   Private Sub NumberDirectionMachining(nI As Integer, Optional bNumber As Boolean = True)
       EgtDisableModified()
       ' Determino se seconda lavorazione
       Dim sName As String = String.Empty
@@ -2213,28 +2265,28 @@ Public Class SplitPageUC
       End If
 
       If bNumber Then
-         Dim nNbrId As Integer = EgtCreateTextAdv( m_nNbrGrpId, ptCen, 0, (nI + 1).ToString(), "",
+         Dim nNbrId As Integer = EgtCreateTextAdv(m_nNbrGrpId, ptCen, 0, (nI + 1).ToString(), "",
                                                    300, False, dHtxt, dRat, 0, INS_POS.MC)
          m_MachiningList(nI).m_nNbrId = nNbrId
          ' Aggiungo a numero info con identificativo della lavorazione e viceversa
-         EgtSetInfo( nNbrId, "MId", m_MachiningList(nI).m_nId)
-         EgtSetInfo( m_MachiningList(nI).m_nId, "NbrId", nNbrId)
+         EgtSetInfo(nNbrId, "MId", m_MachiningList(nI).m_nId)
+         EgtSetInfo(m_MachiningList(nI).m_nId, "NbrId", nNbrId)
       End If
       ' Se taglio con lama, metto la direzione accanto al numero
       If m_MachiningList(nI).m_nType = MCH_OY.SAWING Then
-         Dim ptStart As New Point3d( ptCen + m_MachiningList(nI).m_vtDir * dHtxt)
-         Dim vtDir As New Vector3d( m_MachiningList(nI).m_vtDir) 
-         Dim bTwin As Boolean = ( Not m_MachiningList(nI).m_bEnableInvert  OrElse  Math.Abs( m_MachiningList(nI).m_dSideAng) > 0.1) 
-         Dim nArrId As Integer = AddMachiningDirection( ptStart, vtDir, dHtxt, bTwin)
+         Dim ptStart As New Point3d(ptCen + m_MachiningList(nI).m_vtDir * dHtxt)
+         Dim vtDir As New Vector3d(m_MachiningList(nI).m_vtDir)
+         Dim bTwin As Boolean = (Not m_MachiningList(nI).m_bEnableInvert OrElse Math.Abs(m_MachiningList(nI).m_dSideAng) > 0.1)
+         Dim nArrId As Integer = AddMachiningDirection(ptStart, vtDir, dHtxt, bTwin)
          m_MachiningList(nI).m_nArrId = nArrId
          ' Aggiungo a freccia info con identificativo della lavorazione e viceversa
-         EgtSetInfo( nArrId, "MId", m_MachiningList(nI).m_nId)
-         EgtSetInfo( m_MachiningList(nI).m_nId, "ArrId", nArrId)
+         EgtSetInfo(nArrId, "MId", m_MachiningList(nI).m_nId)
+         EgtSetInfo(m_MachiningList(nI).m_nId, "ArrId", nArrId)
       Else
          m_MachiningList(nI).m_nArrId = GDB_ID.NULL
       End If
       ' Assegno colore a numero e freccia
-      ColorNumberArrow( nI)
+      ColorNumberArrow(nI)
       EgtEnableModified()
    End Sub
 
@@ -2296,18 +2348,18 @@ Public Class SplitPageUC
       Return True
    End Function
 
-   Private Function AddMachiningDirection( ptStart As Point3d, vtDir As Vector3d, dLen As Double, bTwin As Boolean) As Integer
-      Dim dArrX As Double = dLen * Math.Cos( 30 * Math.PI / 180)
-      Dim dArrY As Double = dLen * Math.Sin( 30 * Math.PI / 180)
-      Dim nTmpId As Integer = EgtCreateLine( m_nNbrGrpId, Point3d.ORIG() + dArrY * Vector3d.Y_AX(), Point3d.ORIG() + dArrX * Vector3d.X_AX())
-      Dim nCrvId As Integer = EgtCreateCurveCompo( m_nNbrGrpId, nTmpId, True)
-      EgtAddCurveCompoLine( nCrvId, Point3d.ORIG() - dArrY * Vector3d.Y_AX())
+   Private Function AddMachiningDirection(ptStart As Point3d, vtDir As Vector3d, dLen As Double, bTwin As Boolean) As Integer
+      Dim dArrX As Double = dLen * Math.Cos(30 * Math.PI / 180)
+      Dim dArrY As Double = dLen * Math.Sin(30 * Math.PI / 180)
+      Dim nTmpId As Integer = EgtCreateLine(m_nNbrGrpId, Point3d.ORIG() + dArrY * Vector3d.Y_AX(), Point3d.ORIG() + dArrX * Vector3d.X_AX())
+      Dim nCrvId As Integer = EgtCreateCurveCompo(m_nNbrGrpId, nTmpId, True)
+      EgtAddCurveCompoLine(nCrvId, Point3d.ORIG() - dArrY * Vector3d.Y_AX())
       If bTwin Then
-         EgtAddCurveCompoLine( nCrvId, Point3d.ORIG() + 2 * dArrX * Vector3d.X_AX())
-         EgtCloseCurveCompo( nCrvId)
+         EgtAddCurveCompoLine(nCrvId, Point3d.ORIG() + 2 * dArrX * Vector3d.X_AX())
+         EgtCloseCurveCompo(nCrvId)
       End If
-      Dim frLoc As New Frame3d( ptStart, vtDir, Vector3d.Z_AX() ^ vtDir, Vector3d.Z_AX())
-      EgtTransform( nCrvId, frLoc)
+      Dim frLoc As New Frame3d(ptStart, vtDir, Vector3d.Z_AX() ^ vtDir, Vector3d.Z_AX())
+      EgtTransform(nCrvId, frLoc)
       Return nCrvId
    End Function
 
@@ -2338,35 +2390,35 @@ Public Class SplitPageUC
    Private Sub MarkNumberArrow(nI As Integer, bMark As Boolean)
       If nI < 0 Then Return
       Dim nNbrId As Integer = m_MachiningList(nI).m_nNbrId
-      Dim nArrId As Integer = m_MachiningList( nI).m_nArrId
+      Dim nArrId As Integer = m_MachiningList(nI).m_nArrId
       If bMark Then
-         EgtSetMark( nNbrId)
-         EgtSetMark( nArrId)
+         EgtSetMark(nNbrId)
+         EgtSetMark(nArrId)
       Else
-         EgtResetMark( nNbrId)
-         EgtResetMark( nArrId)
+         EgtResetMark(nNbrId)
+         EgtResetMark(nArrId)
       End If
    End Sub
 
-   Private Sub ColorNumberArrow( nI As Integer)
+   Private Sub ColorNumberArrow(nI As Integer)
       If nI < 0 Then Return
-      Dim nNbrId As Integer = m_MachiningList( nI).m_nNbrId
-      Dim nArrId As Integer = m_MachiningList( nI).m_nArrId
-      If m_MachiningList( nI).m_bEnabled Then
-         If m_MachiningList( nI).m_nInterf = FMI_TYPE.NONE Then
-            EgtSetColor( nNbrId, COL_MCH_FREE)
-            EgtSetColor( nArrId, COL_MCH_FREE)
+      Dim nNbrId As Integer = m_MachiningList(nI).m_nNbrId
+      Dim nArrId As Integer = m_MachiningList(nI).m_nArrId
+      If m_MachiningList(nI).m_bEnabled Then
+         If m_MachiningList(nI).m_nInterf = FMI_TYPE.NONE Then
+            EgtSetColor(nNbrId, COL_MCH_FREE)
+            EgtSetColor(nArrId, COL_MCH_FREE)
          Else
-            EgtSetColor( nNbrId, COL_MCH_INTERF)
-            EgtSetColor( nArrId, COL_MCH_INTERF)
+            EgtSetColor(nNbrId, COL_MCH_INTERF)
+            EgtSetColor(nArrId, COL_MCH_INTERF)
          End If
       Else
-         If m_MachiningList( nI).m_nInterf = FMI_TYPE.NONE Then
-            EgtResetColor( nNbrId)
-            EgtResetColor( nArrId)
-         ElseIf Not m_MachiningList( nI).m_bEnabled Then
-            EgtSetColor( nNbrId, COL_MCH_DIS_INTERF)
-            EgtSetColor( nArrId, COL_MCH_DIS_INTERF)
+         If m_MachiningList(nI).m_nInterf = FMI_TYPE.NONE Then
+            EgtResetColor(nNbrId)
+            EgtResetColor(nArrId)
+         ElseIf Not m_MachiningList(nI).m_bEnabled Then
+            EgtSetColor(nNbrId, COL_MCH_DIS_INTERF)
+            EgtSetColor(nArrId, COL_MCH_DIS_INTERF)
          End If
       End If
    End Sub
@@ -2392,38 +2444,38 @@ Public Class SplitPageUC
       EgtEnableModified()
    End Sub
 
-   Private Sub SwapStartEndData( nI As Integer)
+   Private Sub SwapStartEndData(nI As Integer)
       ' Swap angoli precedente e successivo
-      Dim dAng As Double = m_MachiningList( nI).m_dPrevAng
-      m_MachiningList( nI).m_dPrevAng = m_MachiningList( nI).m_dNextAng
-      m_MachiningList( nI).m_dNextAng = dAng
+      Dim dAng As Double = m_MachiningList(nI).m_dPrevAng
+      m_MachiningList(nI).m_dPrevAng = m_MachiningList(nI).m_dNextAng
+      m_MachiningList(nI).m_dNextAng = dAng
       ' Swap lunghezze libere
-      Dim dFreeLen As Double = m_MachiningList( nI).m_dStartFreeLen
-      m_MachiningList( nI).m_dStartFreeLen = m_MachiningList( nI).m_dEndFreeLen
-      m_MachiningList( nI).m_dEndFreeLen = dFreeLen
+      Dim dFreeLen As Double = m_MachiningList(nI).m_dStartFreeLen
+      m_MachiningList(nI).m_dStartFreeLen = m_MachiningList(nI).m_dEndFreeLen
+      m_MachiningList(nI).m_dEndFreeLen = dFreeLen
       ' Swap stato di allungamento
-      Dim bAll As Boolean = m_MachiningList( nI).m_bStartAll
-      m_MachiningList( nI).m_bStartAll = m_MachiningList( nI).m_bEndAll
-      m_MachiningList( nI).m_bEndAll = bAll
+      Dim bAll As Boolean = m_MachiningList(nI).m_bStartAll
+      m_MachiningList(nI).m_bStartAll = m_MachiningList(nI).m_bEndAll
+      m_MachiningList(nI).m_bEndAll = bAll
       ' Swap possibilità di allungamento
-      Dim bCanAll As Boolean = m_MachiningList( nI).m_bCanStartAll
-      m_MachiningList( nI).m_bCanStartAll = m_MachiningList( nI).m_bCanEndAll
-      m_MachiningList( nI).m_bCanEndAll = bCanAll
+      Dim bCanAll As Boolean = m_MachiningList(nI).m_bCanStartAll
+      m_MachiningList(nI).m_bCanStartAll = m_MachiningList(nI).m_bCanEndAll
+      m_MachiningList(nI).m_bCanEndAll = bCanAll
       ' Swap stato interferenza
-      if ( m_MachiningList( nI).m_nInterf And FMI_TYPE.LI) <> 0  And  ( m_MachiningList( nI).m_nInterf And FMI_TYPE.LO) = 0 Then
-         m_MachiningList( nI).m_nInterf -= FMI_TYPE.LI
-         m_MachiningList( nI).m_nInterf += FMI_TYPE.LO
-      ElseIf ( m_MachiningList( nI).m_nInterf And FMI_TYPE.LI) = 0  And  ( m_MachiningList( nI).m_nInterf And FMI_TYPE.LO) <> 0 Then
-         m_MachiningList( nI).m_nInterf += FMI_TYPE.LI
-         m_MachiningList( nI).m_nInterf -= FMI_TYPE.LO
+      If (m_MachiningList(nI).m_nInterf And FMI_TYPE.LI) <> 0 And (m_MachiningList(nI).m_nInterf And FMI_TYPE.LO) = 0 Then
+         m_MachiningList(nI).m_nInterf -= FMI_TYPE.LI
+         m_MachiningList(nI).m_nInterf += FMI_TYPE.LO
+      ElseIf (m_MachiningList(nI).m_nInterf And FMI_TYPE.LI) = 0 And (m_MachiningList(nI).m_nInterf And FMI_TYPE.LO) <> 0 Then
+         m_MachiningList(nI).m_nInterf += FMI_TYPE.LI
+         m_MachiningList(nI).m_nInterf -= FMI_TYPE.LO
       End If
       ' Swap Allungamento Utente 
       Dim dOrigUsal As Double = 0
-      EgtGetInfo( m_MachiningList( nI).m_nId, INFO_MCH_USER_SAL, dOrigUsal)
+      EgtGetInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_SAL, dOrigUsal)
       Dim dOrigUeal As Double = 0
-      EgtGetInfo( m_MachiningList( nI).m_nId, INFO_MCH_USER_EAL, dOrigUeal)
-      EgtSetInfo( m_MachiningList( nI).m_nId, INFO_MCH_USER_SAL, dOrigUeal)
-      EgtSetInfo( m_MachiningList( nI).m_nId, INFO_MCH_USER_EAL, dOrigUsal)
+      EgtGetInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_EAL, dOrigUeal)
+      EgtSetInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_SAL, dOrigUeal)
+      EgtSetInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_EAL, dOrigUsal)
    End Sub
 
    '-----------------------------------------------------------------------------------------------
@@ -2453,10 +2505,10 @@ Public Class SplitPageUC
             Return m_sName
          End Get
          Set(value As String)
-         If value <> m_sName Then
-            m_sName = value
-                  NotifyPropertyChanged("Name")
-         End If
+            If value <> m_sName Then
+               m_sName = value
+               NotifyPropertyChanged("Name")
+            End If
          End Set
       End Property
 
@@ -2465,10 +2517,10 @@ Public Class SplitPageUC
             Return m_bIsActive
          End Get
          Set(value As Boolean)
-         If value <> m_bIsActive Then
-            m_bIsActive = value
-            NotifyPropertyChanged("bIsActive")
-         End If
+            If value <> m_bIsActive Then
+               m_bIsActive = value
+               NotifyPropertyChanged("bIsActive")
+            End If
          End Set
       End Property
 

CadCuts/VacuumCups.vb

@@ -451,14 +451,14 @@ Module VacuumCups
          Dim dPreferredRot As Double = m_dPreferredRot
          ' -------------------- INIZIO GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
          ' verifico l'orientamento del pezzo
-         If bRotateVacuumNearExtraStrokeX And (Math.Abs(dRotAngDeg - 90) < 45 Or Math.Abs(dRotAngDeg - 270) < 45) Then
+         If bRotateVacuumNearExtraStrokeX And Not IsHorizontal(dAngOrizzDeg) Then
             ' se l'orientamento è verticale
             If frMinRect.Orig().x < b3Tab.Center().x Then
                dPreferredRot = m_dPrefVertRotXMinus
             Else
                dPreferredRot = m_dPrefVertRotXPlus
             End If
-         ElseIf bRotateVacuumNearExtraStrokeY And (Math.Abs(dRotAngDeg - 90) > 45 Or Math.Abs(dRotAngDeg - 270) > 45) Then
+         ElseIf bRotateVacuumNearExtraStrokeY And IsHorizontal(dAngOrizzDeg) Then
             ' se l'orientemanto è orizzontale e la macchina è stata abilitata
             If frMinRect.Orig().y < b3Tab.Center().y Then
                dPreferredRot = m_dPrefVertRotYPlus
@@ -467,8 +467,8 @@ Module VacuumCups
             End If
          End If
          ' -------------------- FINE GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
-         Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
-         While dRotAngDeg - dPreferredRot >= dAngDelta / 2 
+         Dim dAngDelta As Double = If(Math.Abs(b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
+         While dRotAngDeg - dPreferredRot >= dAngDelta / 2
             dRotAngDeg -= dAngDelta
          End While
          While dRotAngDeg - dPreferredRot <= -dAngDelta / 2
@@ -539,6 +539,13 @@ Module VacuumCups
       Return dDist
    End Function
 
+   Private Function IsHorizontal(dDegAng As Double) As Boolean
+      If (Math.Abs(dDegAng) > 45 And Math.Abs(dDegAng) < 135) Or (Math.Abs(dDegAng) > 225 And Math.Abs(dDegAng) < 315) Then
+         Return False
+      End If
+      Return True
+   End Function
+
    ' assegante le posizioni del centro delle ventose e l'angolo di posizionamento orizzontale verifica che la posizione sia raggiungibile
    Public Function VerifyOutOfStrokes(ptRef As Point3d, dRotAngDeg As Double) As Integer
       Dim dX, dY, dZ As Double

Constants/ConstIni.vb

@@ -328,6 +328,8 @@ Module ConstIni
    Public Const K_DC_TEST_LENGTH As String = "TestLength"
    Public Const K_DC_TEST_ANGH As String = "TestAngH"
    Public Const K_DC_TEST_OFFSET As String = "TestOffset"
+   Public Const K_DC_OFFSET_SQUARING As String = "OffsetSquaring"
+   Public Const K_DC_EXTRA_LEN_SQUARING As String = "ExtraLenSquaring"
 
    Public Const S_STATDATA As String = "StatData"
    Public Const K_SD_DAY As String = "Day"

Constants/ConstMachIni.vb

@@ -47,9 +47,7 @@
    Public Const K_PHOTODELEY As String = "PhotoDeley"
 
    Public Const S_EXECLUA As String = "ExecLua"
-   Public Const K_DIRSCRIPT_LUA As String = "DirScript"
    Public Const K_FILESCRIPT_LUA As String = "FileScript"
-   Public Const K_CALLFUNCTION As String = "CallFunction"
 
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
@@ -221,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_HOLES_OFFSETWJ As String = "HolesOffsetWJ"
+   Public Const K_MIN_RADIUSWJ As String = "MinRadiusWJ"
+   Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners"
    ' DrillMillC90
    ' CutLongDxSx
    ' AngRotMultiCut

DirectCuts/ControlsDirectCutUC.xaml.vb

@@ -108,8 +108,10 @@ Public Class ControlsDirectCutUC
       GridCutTxt.Text = EgtMsg(90204)
       'FlatteningCutBtn.Content = EgtMsg(90206)
       FlatteningCutTxt.Text = EgtMsg(90206)
-      SquaringTxt.Text = "Squaring"
-      ChangeUCTxBl.Text = "Others"
+      ' 90261=Squaring
+      SquaringTxt.Text = EgtMsg(90261)
+      ' 90409=Others
+      ChangeUCTxBl.Text = EgtMsg(90409)
 
    End Sub
 

DirectCuts/FlatteningCut.xaml.vb

@@ -624,7 +624,8 @@ Public Class FlatteningCut
          EgtTdbGetCurrToolParam(MCH_TP.THICK, dFootPrint)
       ElseIf Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrMilling) Then
          Dim sCurrMill = m_MainWindow.m_CurrentMachine.sCurrMill
-         GetDrillFromDrilling(sCurrMill, m_MainWindow.m_CurrentMachine.sCurrMilling)
+         'GetDrillFromDrilling(sCurrMill, m_MainWindow.m_CurrentMachine.sCurrMilling)
+         GetMillFromMilling(sCurrMill, m_MainWindow.m_CurrentMachine.sCurrMilling)
          ' recupero informazioni della fresa in uso
          EgtTdbSetCurrTool(sCurrMill)
          EgtTdbGetCurrToolParam(MCH_TP.DIAM, dFootPrint)

DirectCuts/Polishing.xaml.vb

@@ -63,7 +63,7 @@ Public Class Polishing
       If PolishingCmBx.SelectedIndex < 0 Then
          m_bPoliOk = False
          UpdateSimulOkBtn()
-      End If 
+      End If
       ' Rendo semitrasparente il grezzo
       Dim nRawSolidId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_RAW_SOLID)
       EgtSetAlpha( nRawSolidId, 60)

DirectCuts/SquaringUC.xaml.vb

@@ -52,11 +52,14 @@ Public Class SquaringUC
 
    Private Sub GridCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
-      ExtraLenTxBl.Text = "Extra length"
+      ' 90260=Extra length
+      ExtraLenTxBl.Text = EgtMsg(90260)
       SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
       OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
 
       ' Carico i dati dell'ultimo taglio
+      m_dOffsetSquaring = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_OFFSET_SQUARING, m_dOffsetSquaring, m_MainWindow.GetIniFile())
+      m_dExtraLength = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_EXTRA_LEN_SQUARING, m_dExtraLength, m_MainWindow.GetIniFile())
       m_dDepth = 0
       m_dAngO = 90
       m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
@@ -129,7 +132,9 @@ Public Class SquaringUC
 
    Friend Sub Squaring_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       ' Salvo i dati correnti
-      'WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DEPTH, DoubleToString(m_dDepth, 2), m_MainWindow.GetIniFile())
+      ' Salvo i dati correnti
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_OFFSET_SQUARING, DoubleToString(m_dOffsetSquaring, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_EXTRA_LEN_SQUARING, DoubleToString(m_dExtraLength, 2), m_MainWindow.GetIniFile())
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare

Machine/AlarmsPageUC.xaml.vb

@@ -29,7 +29,7 @@ Public Class AlarmsPageUC
 
    Private Sub AlarmsPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
 
-      'Assegno liste a combobox
+      ' Assegno liste a combobox
       CurrSawCmBx.ItemsSource = m_SawList
       CurrDrillCmBx.ItemsSource = m_DrillList
       CurrMillCmBx.ItemsSource = m_MillList
@@ -37,8 +37,11 @@ Public Class AlarmsPageUC
       CurrWJetCmBx.ItemsSource = m_WaterJetList
       AuxiliaryToolCmBx.ItemsSource = m_AuxToolTypeList
 
+      ' Variabile che accorcia il riferimento alla macchina corrente
+      m_CurrentMachine = m_MainWindow.m_CurrentMachine
+
       ' Assegno lista ad elenco materiali
-      MaterialsLstBx.ItemsSource = m_MainWindow.m_CurrentMachine.Materials
+      MaterialsLstBx.ItemsSource = m_CurrentMachine.Materials
 
       ' Se non è impostato il controllo numerico, nascondo il bottone di tastatura lama
       If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
@@ -88,7 +91,13 @@ 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"
+      MinRadiusWJTxBl.Text = "Min Radius"
+      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
@@ -123,8 +132,6 @@ Public Class AlarmsPageUC
    Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
 
       If m_bFirst Then
-         ' Variabile che accorcia il riferimento alla macchina corrente
-         m_CurrentMachine = m_MainWindow.m_CurrentMachine
 
          ' in assenza dell'uscita H1 nascondo i parametri lama
          If EgtGetHeadId("H1") = GDB_ID.NULL Then
@@ -195,8 +202,8 @@ Public Class AlarmsPageUC
          m_bFirst = False
       End If
 
-         ' Aggiorno lista delle lame per pagina macchina in cui scegliere quella corrente
-         CreateToolList(MCH_TF.SAWBLADE, m_SawList)
+      ' Aggiorno lista delle lame per pagina macchina in cui scegliere quella corrente
+      CreateToolList(MCH_TF.SAWBLADE, m_SawList)
       ' Seleziono lama corrente
       CurrSawCmBx.SelectedItem = m_CurrentMachine.sCurrSaw
 
@@ -332,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)
@@ -350,7 +367,7 @@ Public Class AlarmsPageUC
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_ENGRAVING_WIDTH, 0, m_MainWindow.GetMachIniFile())
       TmWidthTxBx.Text = LenToString(dVal, 2)
       ' Flag per movimento in home alla fine dei tagli diretti
-      FinalHomeChBx.IsChecked = m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome
+      FinalHomeChBx.IsChecked = m_CurrentMachine.bDirectCutsFinalHome
       ' Leggo tagli ridotti per interferenza in nesting
       CompleteCutsChBx.IsChecked =
              (GetPrivateProfileInt(S_MACH_NEST, K_MACH_REDUCEDCUT, 0, m_MainWindow.GetMachIniFile()) = 0)
@@ -372,7 +389,7 @@ Public Class AlarmsPageUC
          AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36) & " " & GetCurrentTable().ToString()
       End If
       ' Leggo altezza sovratavola
-      dVal = m_MainWindow.m_CurrentMachine.dAdditionalTable
+      dVal = m_CurrentMachine.dAdditionalTable
       AdditionalTableTxBx.Text = LenToString(dVal, 2)
       ' Leggo soglia e tolleranza per contorno grezzo da foto
       ThresholdTxBx.Text = m_MainWindow.m_Camera.Threshold.ToString()
@@ -390,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)
@@ -446,7 +463,7 @@ Public Class AlarmsPageUC
          CurrWaterJettingTxBx.Text = m_CurrentMachine.sCurrWaterJetting
          CurrWaterJettingTxBl.Visibility = Windows.Visibility.Visible
          CurrWaterJettingTxBx.Visibility = Windows.Visibility.Visible
-         If m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
+         If m_CurrentMachine.bFromDBWaterJet Then
             CurrWaterJettingTxBx.SetValue(Grid.ColumnSpanProperty, 1)
             CurrWaterJettingTxBx.SetValue(MarginProperty, New Thickness(CurrWaterJettingTxBx.Margin.Left,
                                                                         CurrWaterJettingTxBx.Margin.Top,
@@ -927,6 +944,35 @@ 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
+      Dim dVal As Double = 0
+      StringToLen(HolesDiameterWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_HOLES_DIAMITERWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   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_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(MinRadiusWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MIN_RADIUSWJ, DoubleToString(dVal, 2), 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_DRILLINGWJ_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "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())
@@ -949,9 +995,9 @@ Public Class AlarmsPageUC
 
    Private Sub FinalHomeChBx_Click(sender As Object, e As RoutedEventArgs) Handles FinalHomeChBx.Click
       If FinalHomeChBx.IsChecked() Then
-         m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome = True
+         m_CurrentMachine.bDirectCutsFinalHome = True
       Else
-         m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome = False
+         m_CurrentMachine.bDirectCutsFinalHome = False
       End If
    End Sub
 
@@ -993,7 +1039,7 @@ Public Class AlarmsPageUC
    Private Sub AdditionalTableTxBx_EgtClosed(sender As Object, e As EventArgs) Handles AdditionalTableTxBx.EgtClosed
       Dim dVal As Double = 0
       StringToLen(AdditionalTableTxBx.Text, dVal)
-      m_MainWindow.m_CurrentMachine.dAdditionalTable = dVal
+      m_CurrentMachine.dAdditionalTable = dVal
    End Sub
 
    Private Sub NewMatBtn_Click(sender As Object, e As RoutedEventArgs) Handles NewMatBtn.Click
@@ -1119,7 +1165,7 @@ Public Class AlarmsPageUC
             EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
       End Select
       ' Recupero file LUA
-      EgtLuaExecFile(m_MainWindow.m_CurrentMachine.sMachDir() & "\DirectCmd\SawProbing.lua")
+      EgtLuaExecFile(m_CurrentMachine.sMachDir() & "\DirectCmd\SawProbing.lua")
       ' Recupero utensile da tastare
       Dim ToolForProbing As ToolPos = ChooseToolForProbing()
       If IsNothing(ToolForProbing) OrElse String.IsNullOrWhiteSpace(ToolForProbing.m_ToolName) Then Return
@@ -1158,7 +1204,7 @@ Public Class AlarmsPageUC
       ' Modifico stringa per inserire i newline
       CmdString = CmdString.Replace("<br/>", Environment.NewLine)
       ' Creo file...
-      Dim FilePath As String = m_MainWindow.GetCncDir() & "\SawProbing" & m_MainWindow.m_CurrentMachine.sIsoFileExt
+      Dim FilePath As String = m_MainWindow.GetCncDir() & "\SawProbing" & m_CurrentMachine.sIsoFileExt
       ' ...e ci scrivo
       Dim Writer As New IO.StreamWriter(FilePath, False)
       Writer.Write(CmdString)
@@ -1286,9 +1332,9 @@ Public Class AlarmsPageUC
    End Sub
 
    Private Function ChooseToolForProbing() As ToolPos
-      Select Case m_MainWindow.m_CurrentMachine.MountedToolConfig
+      Select Case m_CurrentMachine.MountedToolConfig
          Case CurrentMachine.MountedToolConfigs.SAW
-            Return New ToolPos(m_MainWindow.m_CurrentMachine.sCurrSaw, "T100", True)
+            Return New ToolPos(m_CurrentMachine.sCurrSaw, "T100", True)
          Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL, CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER
             Dim ChooseTool As New ChooseToolWD(m_MainWindow)
             If ChooseTool.ShowDialog Then
@@ -1336,53 +1382,34 @@ Public Class AlarmsPageUC
 
    Private Sub ExecLuaBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExecLuaBtn.Click
       Dim sExecFile As String = GetExecLuaFile()
-      Dim sCallFunction As String = GetCallFunction()
-      ' Recupero file LUA
-      Dim bExec As Boolean = EgtLuaExecFile(sExecFile)
-      ' Lancio l'esecuzione della funzione principale
-      bExec = bExec And EgtLuaCallFunction(sCallFunction)
-      ' Leggo variabili
-      Dim nErr As Integer = 0
-      EgtLuaGetGlobIntVar("CMD.ERR", nErr)
+      ' Eseguo file LUA e recupero risultato
+      Dim nErr As Integer = 999
+      EgtLuaExecFile(sExecFile)
+      EgtLuaGetGlobIntVar("ELS.ERR", nErr)
       ' Reset lua
-      EgtLuaResetGlobVar("CMD")
+      EgtLuaResetGlobVar("ELS")
       ' Verifico condizioni di errore
-      If nErr <> 0 And bExec Then
-         ' Errore in tastatura lama
-         EgtOutLog("Error in execution file: " & sExecFile & ", calling function: " & sCallFunction & ", CMD.ERR=" & nErr.ToString)
-         ' Error in executing file FILENAME
-         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", 90259 & " '" & sExecFile & "'.", EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+      If nErr Then
+         ' Errore...
+         EgtOutLog("Error executing file: " & sExecFile & ", ELS.ERR=" & nErr.ToString)
+         ' Error executing script
+         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90259), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
          Return
       End If
    End Sub
 
    ' Recupero il percorso del file lua da eseguire
    Private Function GetExecLuaFile() As String
-      Dim sDir As String = String.Empty
       Dim sFile As String = String.Empty
-      If GetPrivateProfileString(S_EXECLUA, K_DIRSCRIPT_LUA, "", sDir, m_MainWindow.GetMachIniFile()) <> 0 And
-         GetPrivateProfileString(S_EXECLUA, K_FILESCRIPT_LUA, "", sFile, m_MainWindow.GetMachIniFile()) <> 0 Then
-         ' Formatto le stringhe lette
-         sDir = sDir.Trim
-         sFile = sFile.Trim
-         If sDir.EndsWith("\"c) Then
-            sDir = sDir.Remove(sDir.LastIndexOf("\"c))
-         End If
-         If Not sFile.EndsWith(".lua") Then
-            sFile = sFile & ".lua"
-         End If
-         If File.Exists(sDir & "\" & sFile) Then
-            Return sDir & "\" & sFile
-         End If
+      If GetPrivateProfileString(S_EXECLUA, K_FILESCRIPT_LUA, "", sFile, m_MainWindow.GetMachIniFile()) <> 0 Then
+         ' Sistemo nome file
+         sFile = sFile.Trim()
+         If Not sFile.EndsWith(".lua") Then sFile = sFile & ".lua"
+         ' Creo path
+         Dim sPath As String = m_CurrentMachine.sMachDir() & "\Scripts\" & sFile
+         If File.Exists(sPath) Then Return sPath
       End If
       Return String.Empty
    End Function
 
-   ' Recupera il nome della funzione che deve essere chiamata
-   Private Function GetCallFunction() As String
-      Dim sCallFunction As String = "CMD.CmdString"
-      GetPrivateProfileString(S_EXECLUA, K_CALLFUNCTION, sCallFunction, sCallFunction, m_MainWindow.GetMachIniFile())
-      Return sCallFunction
-   End Function
-
 End Class

MainWindow.xaml.vb

@@ -303,7 +303,7 @@ Class MainWindow
       GetPrivateProfileString(S_MACH, K_CURRMACH, "", m_sCurrMachine, m_sIniFile)
       ' Impostazione path MachIni file
       m_sMachIniFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & m_sCurrMachine & ".ini"
-      ' Impostazione path KitIni file
+      ' Impostazione path Kit file
       m_sKitsFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & MACHININGS_DIR & "\" & KITS_FILE
       ' Imposto tipo di chiave
 #If TRIAL Then
@@ -326,8 +326,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2411, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2411, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2412, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2412, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface

My Project/AssemblyInfo.vb

@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.11.2")>
-<Assembly: AssemblyFileVersion("2.4.11.2")>
+<Assembly: AssemblyVersion("2.4.12.1")>
+<Assembly: AssemblyFileVersion("2.4.12.1")>

OmagCUT.vbproj

@@ -1320,6 +1320,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Parking.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Quality.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

OmagCUTDictionary.xaml

@@ -221,6 +221,7 @@
     <BitmapImage x:Key="Inizio-Allunga-AccorciaImg" UriSource="Resources/NewIcons/Inizio-allunga-o-accorcia.png"></BitmapImage>
     <BitmapImage x:Key="PonticelliWJImg" UriSource="Resources/NewIcons/Ponticelli.png"></BitmapImage>
     <BitmapImage x:Key="PonticelliDeleteWJImg" UriSource="Resources/NewIcons/Ponticelli_delete.png"></BitmapImage>
+    <BitmapImage x:Key="QualityWJImg" UriSource="Resources/NewIcons/Quality.png"></BitmapImage>
     <BitmapImage x:Key="Fine-Allunga-AccorciaImg" UriSource="Resources/NewIcons/Fine-allunga-o-accorcia.png"></BitmapImage>
     <BitmapImage x:Key="ON_OFF-singolo-taglioImg" UriSource="Resources/NewIcons/ON_OFF-singolo-taglio.png"></BitmapImage>
     <BitmapImage x:Key="Tutti-ONImg" UriSource="Resources/NewIcons/Tutti-ON.png"></BitmapImage>

Utility/Utility.vb

@@ -373,4 +373,40 @@ Module Utility
       End If
    End Sub
 
+   Public Sub GetMillFromMilling(ByRef sCurrMill As String, ByVal sCurrMilling As String)
+      If String.IsNullOrEmpty(sCurrMill) Or String.IsNullOrWhiteSpace(sCurrMill) Then
+         ' creo l'elenco degli utensili di foratura
+         Dim sToolName As String = String.Empty
+         Dim nType As Integer = MCH_TY.NONE
+         Dim MillToolList As New ObservableCollection(Of String)
+         MillToolList.Clear()
+         If EgtTdbGetFirstTool(MCH_TF.MILL, sToolName, nType) Then
+            MillToolList.Add(sToolName)
+            While EgtTdbGetNextTool(MCH_TF.MILL, sToolName, nType)
+               MillToolList.Add(sToolName)
+            End While
+         End If
+         ' recupero l'utensile associato alla lavorazione
+         'Dim sCurrDrilling As String = m_MainWindow.m_CurrentMachine.sCurrDrilling
+         Dim ToolString As String = String.Empty
+         EgtMdbSetCurrMachining(sCurrMilling)
+         ' Recupero nome utensile tramite TUUID
+         Dim sTuuid As String = String.Empty
+         EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTuuid)
+         EgtTdbGetToolFromUUID(sTuuid, ToolString)
+         Dim bToolExist As Boolean = False
+         For Each CurrTool As IEnumerable In MillToolList
+            If CurrTool.ToString() = ToolString Then
+               bToolExist = True
+               Exit For
+            End If
+         Next
+         If bToolExist Then
+            sCurrMill = ToolString
+         Else
+            sCurrMill = String.Empty
+         End If
+      End If
+   End Sub
+
 End Module