Correzione angolo previlegiato di deposito

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,10 +9,14 @@ 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
 
@@ -21,11 +26,20 @@ Public Class EditValueWD
       Else
          m_sValue = DoubleToString(dVal, 3)
       End If
-
       ValueTxBx.Text = m_sValue
       Return True
    End Function
 
+   ' 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 GetVal(Optional ByVal bLen As Boolean = False) As Double
       Dim dVal As Double = 0
       If bLen Then
@@ -36,10 +50,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/MoveRawPartPage.xaml.vb

@@ -329,6 +329,8 @@ Public Class MoveRawPartPage
                   VacuumCups.SetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
                   VacuumCups.SetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
                   VacuumCups.SetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
+                  ' se su scarico frontale allora devo modificare la scelta delle ventose
+                  VacuumCups.bUnloadingOnAuxTab = m_SplitPage.m_bOnAuxTab
                   If PutVacuumCupsOnRaw(nId, rmData) Then
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
@@ -837,6 +839,7 @@ Public Class MoveRawPartPage
       EgtGetRawPartCenter(nRawId, ptRawCen)
       ' Sposto il grezzo in battuta sul corner
       Dim dAngRaw As Double = 0
+      Dim dNewAngRot As Double = 0
 
       Dim AngRotList As New List(Of Double)
 
@@ -877,12 +880,16 @@ Public Class MoveRawPartPage
             ' sposto il pezzo in questa posizione
             EgtMoveToCornerRawPart(nRawId, ptCorner, MCH_CR.BL)
             ' riprovo il movimento
-            If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw) Then
+            dNewAngRot = GetPrefRotAng(dAngRaw)
+            'dNewAngRot = DeltaAngC
+            If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dNewAngRot) Then
                If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Then
                   ' riposiziono il pezzo come era prima
-                  EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAngRaw)
+                  EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw)
+                  EgtDraw()
                   Return
                End If
+               dAngRaw = dNewAngRot
             Else
                Return
             End If
@@ -908,17 +915,18 @@ Public Class MoveRawPartPage
          End If
          nOtherRaw = EgtGetNextRawPart(nOtherRaw)
       End While
+
       ' Determino il movimento effettuato
       Dim ptNewRawCen As Point3d
       EgtGetRawPartCenter(nRawId, ptNewRawCen)
       ' Se tutto bene, aggiorno lista movimenti
       If bRawOk Then
          AddRawMoveData(nRawId, ptNewRawCen - ptRawCen, m_RawMoveDataList)
-         If dAngRaw <> 0 Then AddRawMoveData(nRawId, -dAngRaw, m_RawMoveDataList)
+         If dAngRaw <> 0 Then AddRawMoveData(nRawId, dAngRaw, m_RawMoveDataList)
          ' altrimenti annullo il movimento
       Else
          EgtMoveRawPart(nRawId, ptRawCen - ptNewRawCen)
-         EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAngRaw)
+         EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw)
          m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 3))    ' Posizione scelta già occupata
       End If
       ' Disabilito pezzo e nascondo le ventose
@@ -991,6 +999,15 @@ Public Class MoveRawPartPage
       Return True
    End Function
 
+   ' determino la migliore rotazione per portare il pezzo in orizzontale
+   Private Function GetPrefRotAng(ByVal dAngDeg As Double) As Double
+      Dim dNewAngDeg As Double = -dAngDeg
+      If dAngDeg > 90 And dAngDeg < 270 Then
+         dNewAngDeg = 180 - dAngDeg
+      End If
+      Return dNewAngDeg
+   End Function
+
    Private Sub PauseBtn_Click(sender As Object, e As RoutedEventArgs) Handles PauseBtn.Click
       ' verifico che ci sia almeno un elemto selezionato (dati di aggancio pezzo)
       If m_RawMoveDataList.Count = 0 Then Return

CadCuts/SplitPageUC.xaml

@@ -132,23 +132,31 @@
             <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="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="BridgesWJBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
                <Image Source="{DynamicResource PonticelliWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </ToggleButton>
 
+             <!--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>
 
-            <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Fine-Allunga-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
@@ -1960,7 +2008,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
@@ -1972,7 +2020,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
@@ -2034,6 +2082,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
@@ -2153,13 +2202,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
 
@@ -2181,7 +2233,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
@@ -2215,28 +2267,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
 
@@ -2298,18 +2350,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
 
@@ -2340,35 +2392,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
@@ -2394,38 +2446,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
 
    '-----------------------------------------------------------------------------------------------
@@ -2455,10 +2507,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
 
@@ -2467,10 +2519,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
 

OmagCUT.vbproj

@@ -1319,6 +1319,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>