Implementato flag FromDBWaterJet per utilizzo Materiali e Qualità WaterJet

CAM/CamAuto.vb

@@ -674,9 +674,6 @@ Friend Module CamAuto
       End If
       ' Lo sposto dalla lavorazione al pezzo
       Dim nId As Integer = EgtGetFirstInGroup(nMchPvId)
-
-      If nId = GDB_ID.NULL Then Return False
-
       While nId <> GDB_ID.NULL
          EgtRelocateGlob(nId, nPartPvId)
          nId = EgtGetFirstInGroup(nMchPvId)

CadCuts/SplitPageUC.xaml.vb

@@ -41,8 +41,6 @@ Public Class SplitPageUC
    Private m_nDragType As Integer = 0           '0=niente, 1=attacco, 2=uscita
    Private m_ptDragPrev As Point3d
    Private m_bDragging As Boolean = False
-   ' Selected cut
-   Private m_nSelected As Integer = GDB_ID.NULL
 
    Private Sub SplitPageUC_Initialized(sender As Object, e As EventArgs)
       PrevBtn.IsEnabled = False
@@ -206,8 +204,6 @@ Public Class SplitPageUC
       ' Reset drag
       m_nDragInd = -1
       m_nDragType = 0
-      ' Reset selection interface
-      m_nSelected = GDB_ID.NULL
       ' Verifico se selezionato estremo di taglio con lama
       EgtSetObjFilterForSelWin(False, True, False, False, False)
       Dim nSel As Integer
@@ -222,10 +218,8 @@ Public Class SplitPageUC
             nType = 1
          ElseIf String.Compare(sName, NAME_PV_POSTCUT) = 0 Then
             nType = 2
-         ElseIf String.Compare(sName, NAME_PV_CUT) = 0 Then
-            nType = 3
          End If
-         If nType = 1 Or nType = 2 Then
+         If nType <> 0 Then
             Dim nPvId As Integer = EgtGetParent(EgtGetParent(nId))
             Dim nMchId As Integer = GDB_ID.NULL
             If EgtGetInfo(nPvId, "MId", nMchId) Then
@@ -241,46 +235,19 @@ Public Class SplitPageUC
                         Exit For
                      End If
                   Next
-                  If m_nDragInd >= 0 Then
-                     ' Assegno l'id dell'elemnto selezionato
-                     m_nSelected = m_nDragInd
-                     Exit For
-                  End If
+                  If m_nDragInd >= 0 Then Exit For
                Next
             End If
-            If m_nDragInd >= 0 Then
-               ' Assegno l'id dell'elemnto selezionato
-               m_nSelected = m_nDragInd
-               Exit While
-            End If
-         ElseIf nType = 3 Then
-            Dim nPvId As Integer = EgtGetParent(EgtGetParent(nId))
-            Dim nMchId As Integer = GDB_ID.NULL
-            If EgtGetInfo(nPvId, "MId", nMchId) Then
-               For nInd As Integer = 0 To m_MachiningList.Count() - 1
-                  If m_MachiningList(nInd).m_nId = nMchId Then
-                     m_nSelected = nInd
-                  End If
-                  For nJ As Integer = 0 To m_MachiningList(nInd).m_vOthId.Count() - 1
-                     If m_MachiningList(nInd).m_vOthId(nJ) = nMchId Then
-                        m_nSelected = nInd
-                        Exit For
-                     End If
-                  Next
-                  If m_nSelected >= 0 Then Exit For
-               Next
-            End If
-            If m_nSelected >= 0 Then Exit While
+            If m_nDragInd >= 0 Then Exit While
          End If
          nId = EgtGetNextObjInSelWin()
       End While
       ' Sistemazioni per drag
-      If m_nSelected >= 0 AndAlso EgtUnProjectPoint(e.Location, m_ptDragPrev) Then
-         MachiningLsBx.SelectedIndex = m_nSelected
+      If m_nDragInd >= 0 AndAlso EgtUnProjectPoint(e.Location, m_ptDragPrev) Then
+         MachiningLsBx.SelectedIndex = m_nDragInd
       Else
          m_nDragInd = -1
          m_nDragType = 0
-         m_nSelected = GDB_ID.NULL
       End If
    End Sub
 
@@ -298,70 +265,54 @@ Public Class SplitPageUC
       Dim vtMove As Vector3d = ptCurr - m_ptDragPrev
       Dim dDelta = vtMove * m_MachiningList(m_nDragInd).m_vtDir
       If m_nDragType = 1 Then
-         Dim dOrigUsal As Double = 0
-         Dim dUsal As Double
-         ' ----------------------- REPEAT -----------------------
-         Do
-            dDelta = -dDelta
-            ' Leggo il valore salvato nella geometria
-            EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
-            dUsal = dOrigUsal + dDelta
-            ' Se c'è limite alla lunghezza libera
-            If m_MachiningList(m_nDragInd).m_dStartFreeLen < FREELEN_INF Then
-               ' Recupero sicurezza in corner interno
-               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-               ' Recupero lunghezza baffo del taglio
-               Dim nPvId As Integer = GDB_ID.NULL
-               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-               Dim dDT As Double = 0
-               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-               dUsal = Math.Min(dUsal, m_MachiningList(m_nDragInd).m_dStartFreeLen - dDT - dCornerSafety)
-            End If
-            ' Modifica della lavorazione
-            EgtSetCurrMachining(nOperId)
-            Dim dAddLen As Double = 0
-            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
-
-            If dAddLen - dOrigUsal < -10 * EPS_SMALL Then
-               m_bDragging = False
-               Return
-            End If
-            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
-            EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
-         Loop Until UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
-         ' ----------------------- REPEAT (solo se il segmento scompare) -----------------------
-      Else
-         Dim dOrigUeal As Double = 0
-         Dim dUeal As Double
          dDelta = -dDelta
-         Do
-            dDelta = -dDelta
-            ' Leggo il valore salvato nella geometria
-            EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
-            dUeal = dOrigUeal + dDelta
-            ' Se c'è limite alla lunghezza libera
-            If m_MachiningList(m_nDragInd).m_dEndFreeLen < FREELEN_INF Then
-               ' Recupero sicurezza in corner interno
-               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-               ' Recupero lunghezza baffo del taglio
-               Dim nPvId As Integer = GDB_ID.NULL
-               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-               Dim dDT As Double = 0
-               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-               dUeal = Math.Min(dUeal, m_MachiningList(m_nDragInd).m_dEndFreeLen - dDT - dCornerSafety)
-            End If
-            ' Modifica della lavorazione
-            EgtSetCurrMachining(nOperId)
-            Dim dAddLen As Double = 0
-            EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
-
-            If dAddLen - dOrigUeal < -10 * EPS_SMALL Then
-               m_bDragging = False
-               Return
-            End If
-            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
-            EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
-         Loop Until UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
+         ' Leggo il valore salvato nella geometria
+         Dim dOrigUsal As Double = 0
+         EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
+         Dim dUsal As Double = dOrigUsal + dDelta
+         ' Se c'è limite alla lunghezza libera
+         If m_MachiningList(m_nDragInd).m_dStartFreeLen < FREELEN_INF Then
+            ' Recupero sicurezza in corner interno
+            Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+            ' Recupero lunghezza baffo del taglio
+            Dim nPvId As Integer = GDB_ID.NULL
+            EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+            Dim dDT As Double = 0
+            EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+            dUsal = Math.Min(dUsal, m_MachiningList(m_nDragInd).m_dStartFreeLen - dDT - dCornerSafety)
+         End If
+         ' Modifica della lavorazione
+         EgtSetCurrMachining(nOperId)
+         Dim dAddLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
+         If dAddLen - dOrigUsal < -10 * EPS_SMALL Then Return
+         EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
+         EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
+         UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
+      Else
+         ' Leggo il valore salvato nella geometria
+         Dim dOrigUeal As Double = 0
+         EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
+         Dim dUeal As Double = dOrigUeal + dDelta
+         ' Se c'è limite alla lunghezza libera
+         If m_MachiningList(m_nDragInd).m_dEndFreeLen < FREELEN_INF Then
+            ' Recupero sicurezza in corner interno
+            Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+            ' Recupero lunghezza baffo del taglio
+            Dim nPvId As Integer = GDB_ID.NULL
+            EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+            Dim dDT As Double = 0
+            EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+            dUeal = Math.Min(dUeal, m_MachiningList(m_nDragInd).m_dEndFreeLen - dDT - dCornerSafety)
+         End If
+         ' Modifica della lavorazione
+         EgtSetCurrMachining(nOperId)
+         Dim dAddLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+         If dAddLen - dOrigUeal < -10 * EPS_SMALL Then Return
+         EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
+         EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
+         UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
       End If
       ' verifico interferenza
       EgtVerifyMachining(m_MachiningList(m_nDragInd).m_nId, m_MachiningList(m_nDragInd).m_nInterf)
@@ -406,8 +357,40 @@ Public Class SplitPageUC
          ItemList.Add(Item)
       Next
 
-      ' verifico che le lavorazioni siano dello stesso tipo
+      ' ------------------------ verifico che le lavorazioni siano dello stesso tipo ------------------------
       VerifyHomogenousMachining(ItemList)
+      'Dim nSawing As Integer = 0
+      'Dim nWaterjetting As Integer = 0
+      'Dim nOtherMachining As Integer = 0
+      '' conto il numero di tipi di lavprazioni
+      'For Each Item As NameIdLsBxItem In ItemList
+      '   If Item.Type = MCH_OY.SAWING Then
+      '      nSawing += 1
+      '   ElseIf Item.Type = MCH_OY.WATERJETTING Then
+      '      nWaterjetting += 1
+      '   Else
+      '      nOtherMachining += 1
+      '   End If
+      'Next
+      '' verifico se le lavorazioni sono omeogenee
+      'If nSawing > 0 And (nWaterjetting > 0 Or nOtherMachining > 0) Then
+      '   m_bAreHomogeneous = False
+      '   VisibilityButtonFromMachinig(MCH_OY.SAWING)
+      'ElseIf nSawing = 0 And nOtherMachining > 0 And nWaterjetting > 0 Then
+      '   m_bAreHomogeneous = False
+      '   VisibilityButtonFromMachinig(MCH_OY.WATERJETTING)
+      'Else
+      '   VisibilityButtonFromMachinig(ItemList(0).Type)
+      '   m_bAreHomogeneous = True
+      'End If
+      '' eventualmente stampo messaggio
+      'If Not m_bAreHomogeneous Then
+      '   m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+      '   m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Lavorazioni non omogenee")
+      'Else
+      '   m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+      'End If
+      ' -----------------------------------------------------------------------------------------------------
 
       ItemList.Sort(Function(x, y) Comparer(Of Integer).Default.Compare(m_ItemList.IndexOf(x), m_ItemList.IndexOf(y)))
       ' verifico che siano contigui
@@ -511,13 +494,16 @@ Public Class SplitPageUC
       EgtDraw()
       ' Imposto flag di modifica
       m_bModified = True
-
+      ' Abilitazione bottone Next
+      ' EnableButtons()
       ' recupero l'elenco degli elementi selezionati
       Dim ItemList As New List(Of NameIdLsBxItem)
       For Each Item As NameIdLsBxItem In MachiningLsBx.SelectedItems
          ItemList.Add(Item)
       Next
-
+      'For Each Item As NameIdLsBxItem In m_ItemList
+      '   If Item.bIsActive Then ItemList.Add(Item)
+      'Next
       VerifyHomogenousMachining(ItemList)
    End Sub
 
@@ -1002,37 +988,26 @@ Public Class SplitPageUC
                bFirstInd = False
             End If
             ' ------------------ FINE PREPARAZIONE TASTIERINO VIRTUALE ------------------
-            Dim bRepeat As Boolean = False
-            Do
-               ' Se c'è limite alla lunghezza libera
-               If m_MachiningList(nI).m_dStartFreeLen < FREELEN_INF Then
-                  ' Recupero sicurezza in corner interno
-                  Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-                  ' Recupero lunghezza baffo del taglio
-                  Dim nPvId As Integer = GDB_ID.NULL
-                  EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-                  Dim dDT As Double = 0
-                  EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-                  dUsal = Math.Min(dUsal, m_MachiningList(nI).m_dStartFreeLen - dDT - dCornerSafety)
-               End If
-               ' Modifica della lavorazione
-               EgtSetCurrMachining(nOperId)
-               Dim dAddLen As Double = 0
-               EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
-               ' verifico che non sia sull'angolo interno (altrimenti vieto la modifica)
-               If dAddLen - dOrigUsal < -10 * EPS_SMALL Then
-                  Return
-               End If
-               EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
-               EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
-               bRepeat = Not UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
-               If bRepeat Then
-                  EgtSetMachiningParam(MCH_MP.STARTADDLEN, dOrigUsal)
-                  EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
-                  dUsal = dOrigUsal
-               End If
-            Loop Until Not bRepeat
 
+            ' Se c'è limite alla lunghezza libera
+            If m_MachiningList(nI).m_dStartFreeLen < FREELEN_INF Then
+               ' Recupero sicurezza in corner interno
+               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+               ' Recupero lunghezza baffo del taglio
+               Dim nPvId As Integer = GDB_ID.NULL
+               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+               Dim dDT As Double = 0
+               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+               dUsal = Math.Min(dUsal, m_MachiningList(nI).m_dStartFreeLen - dDT - dCornerSafety)
+            End If
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            Dim dAddLen As Double = 0
+            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
+            If dAddLen - dOrigUsal < -10 * EPS_SMALL Then Return
+            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
+            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
             ' verifico interferenza
             EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
             ColorMachining(m_MachiningList(nI))
@@ -1165,38 +1140,26 @@ Public Class SplitPageUC
                bFirstInd = False
             End If
             ' ------------------ FINE PREPARAZIONE TASTIERINO VIRTUALE ------------------
-            Dim bRepeat As Boolean = False
-            Do
-               ' Se c'è limite alla lunghezza libera
-               If m_MachiningList(nI).m_dEndFreeLen < FREELEN_INF Then
-                  ' Recupero sicurezza in corner interno
-                  Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-                  ' Recupero lunghezza baffo del taglio
-                  Dim nPvId As Integer = GDB_ID.NULL
-                  EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-                  Dim dDT As Double = 0
-                  EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-                  dUeal = Math.Min(dUeal, m_MachiningList(nI).m_dEndFreeLen - dDT - dCornerSafety)
-               End If
-
-               ' Modifica della lavorazione
-               EgtSetCurrMachining(nOperId)
-               Dim dAddLen As Double = 0
-               EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
-               If dAddLen - dOrigUeal < -10 * EPS_SMALL Then
-                  Return
-               End If
-               EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
-               EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
-               UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
-               bRepeat = Not UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
-               If bRepeat Then
-                  EgtSetMachiningParam(MCH_MP.STARTADDLEN, dOrigUeal)
-                  EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUeal)
-                  dUeal = dOrigUeal
-               End If
-            Loop Until Not bRepeat
 
+            ' Se c'è limite alla lunghezza libera
+            If m_MachiningList(nI).m_dEndFreeLen < FREELEN_INF Then
+               ' Recupero sicurezza in corner interno
+               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+               ' Recupero lunghezza baffo del taglio
+               Dim nPvId As Integer = GDB_ID.NULL
+               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+               Dim dDT As Double = 0
+               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+               dUeal = Math.Min(dUeal, m_MachiningList(nI).m_dEndFreeLen - dDT - dCornerSafety)
+            End If
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            Dim dAddLen As Double = 0
+            EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+            If dAddLen - dOrigUeal < -10 * EPS_SMALL Then Return
+            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
+            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
             ' verifico interferenza
             EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
             ColorMachining(m_MachiningList(nI))

Constants/ConstMachIni.vb

@@ -282,5 +282,6 @@
    Public Const S_MATERIALS As String = "Materials"
    Public Const K_CURRMATERIAL As String = "CurrMaterial"
    Public Const K_MATERIAL As String = "Material"
+   Public Const K_FROMDBWATERJET As String = "FromDBWaterJet"
 
 End Module

Machine/AlarmsPageUC.xaml.vb

@@ -437,10 +437,24 @@ Public Class AlarmsPageUC
       End If
       If m_CurrentMachine.sCurrWaterJetting <> String.Empty Then
          CurrWaterJettingTxBx.Text = m_CurrentMachine.sCurrWaterJetting
-         CurrWaterJettingQualityTxBx.Text = m_CurrentMachine.sCurrWaterJettingQuality
          CurrWaterJettingTxBl.Visibility = Windows.Visibility.Visible
          CurrWaterJettingTxBx.Visibility = Windows.Visibility.Visible
-         CurrWaterJettingQualityTxBx.Visibility = Windows.Visibility.Visible
+         If m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
+            CurrWaterJettingTxBx.SetValue(Grid.ColumnSpanProperty, 1)
+            CurrWaterJettingTxBx.SetValue(MarginProperty, New Thickness(CurrWaterJettingTxBx.Margin.Left,
+                                                                        CurrWaterJettingTxBx.Margin.Top,
+                                                                        5,
+                                                                        CurrWaterJettingTxBx.Margin.Bottom))
+            CurrWaterJettingQualityTxBx.Text = m_CurrentMachine.sCurrWaterJettingQuality
+            CurrWaterJettingQualityTxBx.Visibility = Windows.Visibility.Visible
+         Else
+            CurrWaterJettingTxBx.SetValue(Grid.ColumnSpanProperty, 2)
+            CurrWaterJettingTxBx.SetValue(MarginProperty, New Thickness(CurrWaterJettingTxBx.Margin.Left,
+                                                                        CurrWaterJettingTxBx.Margin.Top,
+                                                                        10,
+                                                                        CurrWaterJettingTxBx.Margin.Bottom))
+            CurrWaterJettingQualityTxBx.Visibility = Windows.Visibility.Collapsed
+         End If
       Else
          CurrWaterJettingTxBl.Visibility = Windows.Visibility.Hidden
          CurrWaterJettingTxBx.Visibility = Windows.Visibility.Hidden

Machine/CurrentMachine.vb

@@ -77,6 +77,9 @@ Public Class CurrentMachine
    Private m_bPolishingWheel As Boolean = False
    Private m_bWaterJet As Boolean = False
 
+   ' Abilitazione DB WaterJet
+   Private m_bFromDBWaterJet As Boolean = False
+
    ' Flag per visualizzazione TcPos, Testa/uscita e Note utente
    Private m_nShowToolChanger As Integer = 0                 ' 0=no, 1=tutti utensili, 2=solo lame
    Private m_bShowHeadExit As Boolean = False
@@ -436,6 +439,12 @@ Public Class CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property bFromDBWaterJet As Boolean
+      Get
+         Return m_bFromDBWaterJet
+      End Get
+   End Property
+
    Friend ReadOnly Property ShowToolChanger As Integer
       Get
          Return m_nShowToolChanger
@@ -1006,7 +1015,7 @@ Public Class CurrentMachine
       End Get
       Set(value As Material)
          Dim CurrMatId As String = If(Not IsNothing(value), value.nId.ToString, "")
-         If bWaterJet Then
+         If bWaterJet And bFromDBWaterJet Then
             WritePrivateProfileString(S_MATERIALS, K_CURRMATERIAL, CurrMatId & If(Not IsNothing(value), "." & value.SubId, ""), sMachIniFile)
          Else
             WritePrivateProfileString(S_MATERIALS, K_CURRMATERIAL, CurrMatId, sMachIniFile)
@@ -1108,6 +1117,8 @@ Public Class CurrentMachine
       ' waterjet
       m_bWaterJet = (GetPrivateProfileInt(S_TOOLS, K_WATERJET, 0, sMachIniFile) > 0) And
                     m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.ENABLE_WJ)
+      ' Leggo abilitazione DB WaterJet
+      m_bFromDBWaterJet = (GetPrivateProfileInt(S_MATERIALS, K_FROMDBWATERJET, 0, sMachIniFile) > 0)
       ' Leggo abilitazione visualizzazione TcPos, Head/exit e Note utente
       m_nShowToolChanger = GetPrivateProfileInt(S_TOOLS, K_SHOWTOOLCHANGER, 0, sMachIniFile)
       m_bShowHeadExit = (GetPrivateProfileInt(S_TOOLS, K_SHOWHEADEXIT, 0, sMachIniFile) > 0)
@@ -1247,7 +1258,7 @@ Public Class CurrentMachine
       Dim Material As Material = Nothing
       Dim nIndex As Integer = 1
 
-      If m_bWaterJet Then
+      If m_bWaterJet And m_bFromDBWaterJet Then
          LoadWJMaterial(True)
       Else
          While (GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & nIndex, Material, sMachIniFile))
@@ -1262,7 +1273,7 @@ Public Class CurrentMachine
       ' Leggo materiale correntemente attivo
       Dim sCurrMatId As String = String.Empty
       EgtUILib.GetPrivateProfileString(S_MATERIALS, K_CURRMATERIAL, "0", sCurrMatId, sMachIniFile)
-      If bWaterJet Then
+      If bWaterJet And bFromDBWaterJet Then
          Dim sCurrMatIds As String()
          sCurrMatIds = sCurrMatId.Split("."c)
          If sCurrMatIds.Length > 1 Then

Machine/MachinePageUC.xaml.vb

@@ -64,7 +64,7 @@ Public Class MachinePageUC
          PolishingsBtn.IsEnabled = False
       End If
 
-      If Not m_MainWindow.m_CurrentMachine.bWaterJet Then
+      If Not m_MainWindow.m_CurrentMachine.bWaterJet Or Not m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
          WaterJetBtn.IsEnabled = False
       End If
 

Machine/MachiningDbPageUC.xaml.vb

@@ -705,7 +705,7 @@ Public Class MachiningDbPageUC
       ' Lista materiali
       m_MaterialsList.Clear()
       For Each Material As Material In m_MainWindow.m_CurrentMachine.Materials
-         If m_MainWindow.m_CurrentMachine.bWaterJet Then
+         If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
             m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName, Material.SubId))
          Else
             m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName))
@@ -720,7 +720,7 @@ Public Class MachiningDbPageUC
             Dim SubParam() As String = Param(0).Split(".".ToCharArray)
             Dim nParId As Integer = 0
             Dim nSubParId As Integer = 0
-            If m_MainWindow.m_CurrentMachine.bWaterJet Then
+            If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
                If StringToInt(SubParam(0), nParId) AndAlso nParId = Material.nId AndAlso SubParam.Count > 1 AndAlso
                   StringToInt(SubParam(1), nSubParId) AndAlso nSubParId = Material.nSubId Then
 
@@ -894,7 +894,7 @@ Public Class MachiningDbPageUC
       ' Scrivo stringa materiali da lista
       Dim sMaterialString As String = String.Empty
       For Each Material As MachiningMaterial In m_MaterialsList
-         If m_MainWindow.m_CurrentMachine.bWaterJet Then
+         If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
             If Material.bIsActive Then
                sMaterialString += Material.nId.ToString & "." & Material.nSubId.ToString & "," & DoubleToString(Material.dMinThickness, 0) & "," & DoubleToString(Material.dMaxThickness, 0) & ";"
             End If
@@ -2285,7 +2285,7 @@ Public Class MachiningDbPageUC
    Private Sub MaxThicknessTxBx_EgtClosed(sender As Object, e As EventArgs) Handles MaxThicknessTxBx.EgtClosed
       Dim SelectedMaterial As MachiningMaterial = MaterialsList.SelectedItem
       Dim dMaxThick As Double = 0
-      If m_MainWindow.m_CurrentMachine.bWaterJet Then
+      If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
          ' solo per water jet controllo lo spessore massimo ammissibile
          dMaxThick = m_MainWindow.m_CurrentMachine.GetMaxThicknessCurrMaterial(SelectedMaterial.Name)
          Dim dVal As Double

RawPhoto/ChooseMachining.xaml.vb

@@ -263,7 +263,7 @@ Public Class ChooseMachining
          If SysNotes <> String.Empty Then
             Dim MachiningMaterials() = SysNotes.Split(";".ToCharArray)
             SysNotes = String.Empty
-            If m_CurrentMachine.bWaterJet Then
+            If m_CurrentMachine.bWaterJet And m_CurrentMachine.bFromDBWaterJet Then
                For Each Material As Object In MachiningMaterials
                   Dim Param() As String = Material.Split(",".ToCharArray)
                   Dim SubParam() As String = Param(0).Split(".".ToCharArray)
@@ -589,18 +589,24 @@ Public Class ChooseMachining
             ' verifico che sia stato inserito veramente una lavorazione prima di comunicare una modifica
             If CurrMillingCmBx.SelectedItem <> m_CurrentMachine.sCurrWaterJetting Then m_MachIsModified = True
          End If
-         If String.IsNullOrEmpty(CurrWJettingQualityCmBx.SelectedItem) Then
-            CurrWJettingQualityCmBx.SelectedItem = m_CurrentMachine.sCurrWaterJettingQuality
-         End If
-         ' verifico che la selezione sia andata a buon fine, altrimenti comunico l'avvenuta modifica
-         If String.IsNullOrEmpty(CurrWJettingQualityCmBx.SelectedItem) Then
-            ' verifico che sia stato inserito veramente una lavorazione prima di comunicare una modifica
-            If CurrWJettingQualityCmBx.SelectedItem <> m_CurrentMachine.sCurrWaterJettingQuality Then m_MachIsModified = True
-         End If
-
-         CurrWJettingQualityCmBx.Visibility = Windows.Visibility.Visible
          CurrWJettingTxBl.Visibility = Windows.Visibility.Visible
          CurrWJettingCmBx.Visibility = Windows.Visibility.Visible
+         ' se DB WaterJet abilitato avrò anche la CmBx della Quality altrimenti espando la CmBx del Waterjetting corrente su tutta la riga
+         If m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
+            CurrWJettingCmBx.SetValue(Grid.ColumnSpanProperty, 1)
+            If String.IsNullOrEmpty(CurrWJettingQualityCmBx.SelectedItem) Then
+               CurrWJettingQualityCmBx.SelectedItem = m_CurrentMachine.sCurrWaterJettingQuality
+            End If
+            ' verifico che la selezione sia andata a buon fine, altrimenti comunico l'avvenuta modifica
+            If String.IsNullOrEmpty(CurrWJettingQualityCmBx.SelectedItem) Then
+               ' verifico che sia stato inserito veramente una lavorazione prima di comunicare una modifica
+               If CurrWJettingQualityCmBx.SelectedItem <> m_CurrentMachine.sCurrWaterJettingQuality Then m_MachIsModified = True
+            End If
+            CurrWJettingQualityCmBx.Visibility = Windows.Visibility.Visible
+         Else
+            CurrWJettingCmBx.SetValue(Grid.ColumnSpanProperty, 3)
+            CurrWJettingQualityCmBx.Visibility = Windows.Visibility.Collapsed
+         End If
       End If
 
       Me.Height = 42 * m_RowNumber

RawPhoto/RawPartPageUC.xaml.vb

@@ -167,7 +167,7 @@ Public Class RawPartPageUC
    Private Sub RawPartPage_Loaded(sender As Object, e As RoutedEventArgs)
       ' aggiorno la lista dei materiali
       Dim Index As Integer = 1
-      If m_CurrentMachine.bWaterJet Then
+      If m_CurrentMachine.bWaterJet And m_CurrentMachine.bFromDBWaterJet Then
          m_CurrentMachine.LoadWJMaterial()
       End If