Merge branch 'master' of https://gitlab.steamware.net/egaltech/OmagCUT

Merge commit '01a9ebf53b6146d3971178fd94b6810da557f58e'
Aggiornamento versione 2.4b2
2022-02-09 19:46:44 +01:00 · 2022-02-09 19:46:04 +01:00 · 2022-02-09 19:45:19 +01:00 · 2022-02-09 19:36:43 +01:00 · 2022-02-09 15:57:43 +01:00 · 2022-02-09 15:54:51 +01:00
44 changed files with 1671 additions and 481 deletions
@@ -674,6 +674,9 @@ 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)
@@ -19,6 +19,14 @@ Friend Module CSVFile
      Public m_dDimX As Double = 0
      Public m_dDimY As Double = 0
      Public m_dTh As Double = 0
+      Public m_dAng1 As Double = 0
+      Public m_dHeel1 As Double = 0
+      Public m_dAng2 As Double = 0
+      Public m_dHeel2 As Double = 0
+      Public m_dAng3 As Double = 0
+      Public m_dHeel3 As Double = 0
+      Public m_dAng4 As Double = 0
+      Public m_dHeel4 As Double = 0
      Public m_nOriInd As Integer = 0
      Public m_nId As Integer = GDB_ID.NULL
   End Class
@@ -62,6 +70,14 @@ Friend Module CSVFile
         EgtLuaGetGlobNumVar("CSV.DIMX" & sN, OnePart.m_dDimX)
         EgtLuaGetGlobNumVar("CSV.DIMY" & sN, OnePart.m_dDimY)
         EgtLuaGetGlobNumVar("CSV.TH" & sN, OnePart.m_dTh)
+         EgtLuaGetGlobNumVar("CSV.A1_" & sN, OnePart.m_dAng1)
+         EgtLuaGetGlobNumVar("CSV.H1_" & sN, OnePart.m_dHeel1)
+         EgtLuaGetGlobNumVar("CSV.A2_" & sN, OnePart.m_dAng2)
+         EgtLuaGetGlobNumVar("CSV.H2_" & sN, OnePart.m_dHeel2)
+         EgtLuaGetGlobNumVar("CSV.A3_" & sN, OnePart.m_dAng3)
+         EgtLuaGetGlobNumVar("CSV.H3_" & sN, OnePart.m_dHeel3)
+         EgtLuaGetGlobNumVar("CSV.A4_" & sN, OnePart.m_dAng4)
+         EgtLuaGetGlobNumVar("CSV.H4_" & sN, OnePart.m_dHeel4)
         OnePart.m_nOriInd = i
         ' inserisco in lista
         CsvPartList.Add(OnePart)
@@ -147,6 +163,22 @@ Friend Module CSVFile
                     StringToDouble(sItems(1), OnePart.m_dDimY)
                  ElseIf sItems(0) = "Th" Then
                     StringToDouble(sItems(1), OnePart.m_dTh)
+                  ElseIf sItems(0) = "A1" Then
+                     StringToDouble(sItems(1), OnePart.m_dAng1)
+                  ElseIf sItems(0) = "H1" Then
+                     StringToDouble(sItems(1), OnePart.m_dHeel1)
+                  ElseIf sItems(0) = "A2" Then
+                     StringToDouble(sItems(1), OnePart.m_dAng2)
+                  ElseIf sItems(0) = "H2" Then
+                     StringToDouble(sItems(1), OnePart.m_dHeel2)
+                  ElseIf sItems(0) = "A3" Then
+                     StringToDouble(sItems(1), OnePart.m_dAng3)
+                  ElseIf sItems(0) = "H3" Then
+                     StringToDouble(sItems(1), OnePart.m_dHeel3)
+                  ElseIf sItems(0) = "A4" Then
+                     StringToDouble(sItems(1), OnePart.m_dAng4)
+                  ElseIf sItems(0) = "H4" Then
+                     StringToDouble(sItems(1), OnePart.m_dHeel4)
                  ElseIf sItems(0) = "OIn" Then
                     StringToInt(sItems(1), OnePart.m_nOriInd)
                  End If
@@ -188,6 +220,14 @@ Friend Module CSVFile
            Writer.WriteLine("DX=" & DoubleToString(CurrPart.m_dDimX, 4))
            Writer.WriteLine("DY=" & DoubleToString(CurrPart.m_dDimY, 4))
            Writer.WriteLine("Th=" & DoubleToString(CurrPart.m_dTh, 4))
+            Writer.WriteLine("A1=" & DoubleToString(CurrPart.m_dAng1, 4))
+            Writer.WriteLine("H1=" & DoubleToString(CurrPart.m_dHeel1, 4))
+            Writer.WriteLine("A2=" & DoubleToString(CurrPart.m_dAng2, 4))
+            Writer.WriteLine("H2=" & DoubleToString(CurrPart.m_dHeel2, 4))
+            Writer.WriteLine("A3=" & DoubleToString(CurrPart.m_dAng3, 4))
+            Writer.WriteLine("H3=" & DoubleToString(CurrPart.m_dHeel3, 4))
+            Writer.WriteLine("A4=" & DoubleToString(CurrPart.m_dAng4, 4))
+            Writer.WriteLine("H4=" & DoubleToString(CurrPart.m_dHeel4, 4))
            Writer.WriteLine("OIn=" & CurrPart.m_nOriInd.ToString())
         Next
         ' Terminatore
@@ -424,10 +424,14 @@ Public Class CSVPage
         ' Definizione variabili
         Dim dDimX = CurrPart.m_dDimX
         Dim dDimY = CurrPart.m_dDimY
+         Dim dAng = New Double() {CurrPart.m_dAng1,CurrPart.m_dAng2,CurrPart.m_dAng3,CurrPart.m_dAng4}
+         Dim dHeel = New Double() {CurrPart.m_dHeel1,CurrPart.m_dHeel2,CurrPart.m_dHeel3,CurrPart.m_dHeel4}
         If bMaxDimOnX And dDimY > dDimX Then
            Dim dTemp As Double = dDimX
            dDimX = dDimY
            dDimY = dTemp
+            dAng = New Double() {CurrPart.m_dAng2,CurrPart.m_dAng3,CurrPart.m_dAng4,CurrPart.m_dAng1}
+            dHeel = New Double() {CurrPart.m_dHeel2,CurrPart.m_dHeel3,CurrPart.m_dHeel4,CurrPart.m_dHeel1}
         End If
         EgtLuaSetGlobNumVar("CMP.V1", dDimX)
         EgtLuaSetGlobNumVar("CMP.V2", dDimY)
@@ -439,7 +443,7 @@ Public Class CSVPage
         If nId = GDB_ID.NULL Then Continue For
         CurrPart.m_nId = nId
         ' Muovo la regione in Z per evitare problemi in visualizzazione
-         Dim nRegId = EgtGetFirstNameInGroup(nId, NAME_REGION)
+         Dim nRegId As Integer = EgtGetFirstNameInGroup(nId, NAME_REGION)
         EgtMove(nRegId, New Vector3d(0, 0, DELTAZ_REG), GDB_RT.GLOB)
         ' Eventuale testo per indicare il sopra
         If Not bMaxDimOnX Then
@@ -447,6 +451,31 @@ Public Class CSVPage
            Dim nText As Integer = EgtCreateTextAdv(nRegId, New Point3d(dDimX / 2, dDimY - 0.6 * dH, 0), 0, "*TOP*", "", 500, False, dH, 1, 0, INS_POS.MC)
            EgtSetColor(nText, New Color3d( 0, 0, 0))
         End If
+         ' Inserisco eventuali angoli di fianco
+         Dim bSideAngs As Boolean = False
+         Dim nOutLoopId As Integer = EgtGetFirstNameInGroup( nId, NAME_OUTLOOP)
+         For nSide As Integer = 1 To 4
+            Dim dSideAng As Double = dAng( nSide - 1)
+            Dim dSideHeel As Double = dHeel( nSide - 1)
+            If Math.Abs( dSideAng) > EPS_ANG_SMALL Then
+               Dim nEntId As Integer = EgtGetFirstNameInGroup( nOutLoopId, "A" & nSide.ToString())
+               If nEntId <> GDB_ID.NULL Then
+                  bSideAngs = True
+                  ' Assegno valori
+                  EgtSetInfo(nEntId, INFO_SIDE_ANGLE, dSideAng)
+                  EgtSetInfo(nEntId, INFO_ORIG_SIDE_ANGLE, dSideAng)
+                  EgtSetInfo(nEntId, INFO_HEEL, dSideHeel)
+               End If
+            End If
+         Next
+         ' Creo layer per testi nesting
+         If bSideAngs Then
+            Dim TextLayId As Integer = EgtCreateGroup(nId)
+            EgtSetName(TextLayId, SIDE_ANGLE_LAYER)
+            EgtSetColor(TextLayId, New Color3d(0, 0, 128))
+            ' Opero su geometria esterna pezzo
+            SideAngle.WriteSideAngleOnLoop(nOutLoopId, TextLayId)
+         End If
         ' Aggiusto per lavorazioni
         EgtAdjustFlatPart(nId)
         ' Se Csv completo, aggiungo info su CSV di origine
@@ -196,7 +196,7 @@ Public Class CadCutPageUC
      m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
      EgtDeselectObj(m_NestPage.m_CurrSelectedCurv)
      m_ProjectMgr.TestBtn.IsChecked = False
-      m_CurrProjPage.m_bSelectCurv = False
+      m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
      Select Case m_CadCutMode
         Case CadCutModes.Nest, CadCutModes.FastGrid
            ' Passo alla pagina Split
@@ -12,6 +12,8 @@ Public Class NestPageUC
   Friend m_bRegister As Boolean = False
   ' Flag per pezzi selezionati in tavola o fuori
   Private m_nPartPos As Integer = PART_POS.NONE_TABLE
+   ' Flag per impostata per selezionare di una curva
+   Friend m_bSelectCurv As Boolean = False

   Friend m_CurrSelectedCurv As Integer = GDB_ID.NULL
   Friend m_CurrSelectedSawCurv As Integer = GDB_ID.NULL
@@ -124,14 +126,16 @@ Public Class NestPageUC
      End If
   End Sub

-   Private Sub OnMyMouseDownSceneSelCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownSceneSelCurv
+   Private Sub OnMyMouseDownSceneSelCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs)
      ' Verifico di essere il gestore attivo e non in modalità registrazione
      If Not m_bActive Or m_bRegister Then Return
      ' Si può selezionare solo con il tasto sinistro e se il bottone TEST Attivo
      If e.Button <> Windows.Forms.MouseButtons.Left Or
-         Not m_CurrProjPage.m_bSelectCurv Then
+         Not m_bSelectCurv Then
         Return
      End If
+      ' Se esiste un elemento selezionato
+      EgtResetMark(m_CurrSelectedSawCurv)
      ' provo a riconoscere il valore medio del segmento 
      ' Verifico se selezionato indicativo di pezzo
      EgtSetObjFilterForSelWin(False, True, False, False, False)
@@ -164,6 +168,7 @@ Public Class NestPageUC
                  m_CurrSelectedSawCurv = nIdSaw
                  m_CurrSelectedCurv = nIdMy
                  EgtSelectObj(nIdSaw)
+                  EgtSetMark(nIdSaw)
                  EgtSelectObj(nIdMy)
                  EgtDraw()
                  Exit While
@@ -184,6 +189,12 @@ Public Class NestPageUC
         Not m_CurrProjPage.CurrentProjectScene.IsStatusNull() Then
         Return
      End If
+      ' se in modalità slezione tagli
+      If m_bSelectCurv Then
+         OnMyMouseDownSceneSelCurv(sender, e)
+         Return
+      End If
+
      ' Per default no drag
      m_bDrag = False
      ' Verifico se selezionato indicativo di pezzo
@@ -402,6 +413,8 @@ Public Class NestPageUC
   Private Sub OnMyMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseUpScene
      ' Verifico di essere il gestore attivo
      If Not m_bActive Then Return
+      ' verifico che non sia attivo il comando Test
+      If m_bSelectCurv Then Return
      ' Se eseguito drag
      If Not m_bDragToStart Then
         ' Se movimento con sola verifica finale
@@ -1168,7 +1181,7 @@ Public Class NestPageUC
         nLayId = EgtGetNextName(nLayId, NAME_INLOOP)
      End While
      ' Aggiorno le entità con tallone e quelle con angolo esterno
-      Const AGG_DEPTH As Double = 2.0
+      Const AGG_DEPTH As Double = 0.75
      Dim bSizeOnTop As Boolean = ( GetPrivateProfileInt( S_SIDES, K_SIZEALWAYSONTOP, 0, m_MainWindow.GetIniFile()) <> 0) 
      For Each nEnt As Integer In vEnt
         ' Se aggiornamento vietato, vado oltre
@@ -1194,12 +1207,14 @@ Public Class NestPageUC
                     EgtSetInfo(nEnt, INFO_OFFSET2, 0)
                  End If
                  EgtSetInfo(nEnt, INFO_DEPTH2, (dTh - dHeel) + AGG_DEPTH)
+                  EgtSetInfo(nEnt, INFO_AGG2, AGG_DEPTH)
               ' altrimenti, tallone superiore a spessore -> non c'è taglio inclinato
               Else
                  EgtSetInfo(nEnt, INFO_SIDE_ANGLE, 0.0)
                  EgtSetInfo(nEnt, INFO_SIDE_ANGLE2, 0.0)
                  EgtRemoveInfo(nEnt, INFO_OFFSET2)
                  EgtRemoveInfo(nEnt, INFO_DEPTH2)
+                  EgtRemoveInfo(nEnt, INFO_AGG2)
               End If
            ' Inclinazione interna
            Else
@@ -1208,12 +1223,14 @@ Public Class NestPageUC
                  EgtSetInfo(nEnt, INFO_OFFSET, dHeel * Math.Tan(-dSideAng * Math.PI / 180))
                  EgtSetInfo(nEnt, INFO_SIDE_ANGLE2, 0.0)
                  EgtSetInfo(nEnt, INFO_DEPTH2, dHeel + AGG_DEPTH)
+                  EgtSetInfo(nEnt, INFO_AGG2, AGG_DEPTH)
               ' altrimenti, tallone superiore a spessore -> non c'è taglio inclinato
               Else
                  EgtSetInfo(nEnt, INFO_SIDE_ANGLE, 0.0)
                  EgtRemoveInfo(nEnt, INFO_OFFSET)
                  EgtRemoveInfo(nEnt, INFO_SIDE_ANGLE2)
                  EgtRemoveInfo(nEnt, INFO_DEPTH2)
+                  EgtRemoveInfo(nEnt, INFO_AGG2)
               End If
            End If
         ' Se altrimenti inclinazione esterna
@@ -166,6 +166,17 @@ Public Module SplitAuto
   End Function

   '-----------------------------------------------------------------------------------------------
+   ' calcolo il numero di tipi di lavorazioni
+   Friend Sub CountMachiningType(MachSplit As SplitMach, ByRef nCountSawing As Integer, ByRef nCountWaterjetting As Integer, ByRef nCountOtherMachining As Integer)
+      If MachSplit.m_nType = MCH_OY.SAWING Then
+         nCountSawing += 1
+      ElseIf MachSplit.m_nType = MCH_OY.WATERJETTING Then
+         nCountWaterjetting += 1
+      Else
+         nCountOtherMachining += 1
+      End If
+   End Sub
+
   Friend Sub ColorMachining(MachSplit As SplitMach, Optional bReset As Boolean = False)
      EgtDisableModified()
      ' Assegno stato
@@ -6,6 +6,9 @@ Public Class SplitPageUC

   ' Riferimento alla MainWindow
   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   ' Flag di pagina attiva
+   Private m_bActive As Boolean = False
   ' Tipo movimento dei grezzi (manuale o con testa ventosa)
   Private m_bByHand As Boolean = True
   ' Abilitazione movimento finale pezzi su tavola ausiliaria
@@ -13,6 +16,16 @@ Public Class SplitPageUC
   ' Stato
   Private m_nCurrPhase As Integer = 0
   Private m_MachiningList As New List(Of SplitMach)
+
+   ' numero di lavorazioni di tipo lama
+   Private m_nCountSawing As Integer = 0
+   ' numero di lavprazioni di tipo waterjet
+   Private m_nCountWaterjetting As Integer = 0
+   ' altri tipi di lavorazioni (Foro/Fresa)
+   Private m_nCountOtherMachining As Integer = 0
+   ' verifico che le lavorazioni selezionate siano omogenee (con lo stesso utensile)
+   Private m_bAreHomogeneous As Boolean = False
+
   Private m_ItemList As New ObservableCollection(Of NameIdLsBxItem)
   'Private m_CurrInd As Integer = -1
   'Private m_CurrItems As New List(Of NameIdLsBxItem)
@@ -23,6 +36,13 @@ Public Class SplitPageUC
   Private m_nNbrGrpId As Integer = GDB_ID.NULL
   Private m_bToNext As Boolean = False
   Friend m_bOnAuxTab As Boolean = False
+   ' Drag
+   Private m_nDragInd As Integer = -1
+   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
@@ -53,6 +73,10 @@ Public Class SplitPageUC
   End Sub

   Private Sub SplitPageUC_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
+      m_bActive = True
+      m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_nDragInd = -1
+      m_nDragType = 0
      ' Leggo tipo movimento grezzi
      m_bByHand = (EgtGetHeadId(VACUUM_HEAD) = GDB_ID.NULL Or
                  Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.AUTO_MANIP) Or
@@ -79,7 +103,7 @@ Public Class SplitPageUC
      If Not m_bShow Then
         If m_MainWindow.m_CurrentMachine.WaterJettingActive Then ResetAllMachinings()
         If SortAllMachinings() Then m_MainWindow.m_CurrentProjectPageUC.SetOrderMachiningFlag()
-         If m_MainWindow.m_CurrentMachine.WaterJettingActive Then         
+         If m_MainWindow.m_CurrentMachine.WaterJettingActive Then
            Dim bModif As Boolean = TestAllMachiningsForStrict()
            If bModif Then m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(90321)) 'Ridotte alcune lavorazioni per evitare interferenze
         End If
@@ -97,12 +121,18 @@ Public Class SplitPageUC
      ShowOnePhaseMachiningPreview(m_nCurrPhase)
      ' Preparo la lista delle lavorazioni
      CalculateSplitMachList(m_nCurrPhase, m_MachiningList)
+      ' azzero i contatori delle lavorazioni
+      m_nCountSawing = 0
+      m_nCountWaterjetting = 0
+      m_nCountOtherMachining = 0
      ' Aggiorno visualizzazione delle lavorazioni
      For nI As Integer = 0 To m_MachiningList.Count() - 1
         ' sistemo colore
         ColorMachining(m_MachiningList(nI))
         ' assegno numerazione
         NumberDirectionMachining(nI)
+         ' conto il numero di tipi di lavorazioni
+         CountMachiningType(m_MachiningList(nI), m_nCountSawing, m_nCountWaterjetting, m_nCountOtherMachining)
      Next
      ' Preparo la lista degli Item
      ShowMachiningList()
@@ -138,33 +168,222 @@ Public Class SplitPageUC
            Dim sText As String = String.Empty
            If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL Then
               sText = EgtMsg(90791) & " " & i.ToString()
-               If Mach.m_sLay = NAME_ONPATH Then AddTopText( sText)
+               If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
            Else
-               sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString( Mach.m_dSideAng, 2) & "°"
+               sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
            End If
            If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.SAWING))
         ElseIf Mach.m_nType = MCH_OY.DRILLING Then       ' Foratura
            Dim sText As String = EgtMsg(90792) & " " & i.ToString()
            If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.DRILLING))
         ElseIf Mach.m_nType = MCH_OY.MILLING Then        ' Fresatura
            Dim sText As String = EgtMsg(90793) & " " & i.ToString()
-            If Mach.m_sLay = NAME_ONPATH Then AddTopText( sText)
-            If Mach.m_bPause Then AddPauseText( sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
+            If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
+            If Mach.m_bPause Then AddPauseText(sText)
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.MILLING))
         ElseIf Mach.m_nType = MCH_OY.POCKETING Then      ' Svuotatura
            Dim sText As String = EgtMsg(90796) & " " & i.ToString()
            If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.POCKETING))
         ElseIf Mach.m_nType = MCH_OY.WATERJETTING Then   ' Waterjet
            Dim sText As String = EgtMsg(90797) & " " & i.ToString()
            If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.WATERJETTING))
         End If
      Next
   End Sub

+   Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
+      ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
+      If Not m_bActive OrElse m_bShow Then Return
+      ' Si può selezionare solo con il tasto sinistro e se stato NULL
+      If e.Button <> Windows.Forms.MouseButtons.Left Or
+         Not m_CurrProjPage.CurrentProjectScene.IsStatusNull() Then
+         Return
+      End If
+      ' 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
+      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
+      Dim nId As Integer = EgtGetFirstObjInSelWin()
+      While nId <> GDB_ID.NULL
+         ' Verifico sia un attacco o uscita di taglio con lama
+         Dim nType As Integer = 0
+         Dim sName As String = ""
+         EgtGetName(nId, sName)
+         If String.Compare(sName, NAME_PV_PRECUT) = 0 Then
+            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
+            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_nDragInd = nInd
+                     m_nDragType = nType
+                  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_nDragInd = nInd
+                        m_nDragType = nType
+                        Exit For
+                     End If
+                  Next
+                  If m_nDragInd >= 0 Then
+                     ' Assegno l'id dell'elemnto selezionato
+                     m_nSelected = m_nDragInd
+                     Exit For
+                  End If
+               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
+         End If
+         nId = EgtGetNextObjInSelWin()
+      End While
+      ' Sistemazioni per drag
+      If m_nSelected >= 0 AndAlso EgtUnProjectPoint(e.Location, m_ptDragPrev) Then
+         MachiningLsBx.SelectedIndex = m_nSelected
+      Else
+         m_nDragInd = -1
+         m_nDragType = 0
+         m_nSelected = GDB_ID.NULL
+      End If
+   End Sub
+
+   Private Sub OnMyMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseMoveScene
+      ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
+      If Not m_bActive OrElse m_bShow Then Return
+      ' Se drag non abilitato o in corso
+      If m_nDragInd = -1L Or m_bDragging Then Return
+      m_bDragging = True
+      Dim nOperId As Integer = m_MachiningList(m_nDragInd).m_nId
+      ' Ricavo il punto corrente in coordinate mondo
+      Dim ptCurr As Point3d
+      EgtUnProjectPoint(e.Location, ptCurr)
+      ' Ricavo il vettore di movimento e la variazione di lunghezza
+      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)
+      End If
+      ' verifico interferenza
+      EgtVerifyMachining(m_MachiningList(m_nDragInd).m_nId, m_MachiningList(m_nDragInd).m_nInterf)
+      ColorMachining(m_MachiningList(m_nDragInd))
+      ColorNumberArrow(m_nDragInd)
+      ' Aggiorno visualizzazione
+      EgtDraw()
+      m_bModified = True
+      ' Aggiorno punto e stato di drag
+      m_ptDragPrev = ptCurr
+      m_bDragging = False
+   End Sub
+
+   Private Sub OnMyMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseUpScene
+      ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
+      If Not m_bActive OrElse m_bShow Then Return
+      ' Se drag in corso
+      If m_nDragInd >= 0 Then
+         m_nDragInd = -1
+      End If
+   End Sub
+
   Private Sub AddPauseText(ByRef sName As String)
      sName &= "  " & EgtMsg(MSG_SPLITPAGEUC + 32) ' Pausa
   End Sub
@@ -180,11 +399,16 @@ Public Class SplitPageUC

   Private Sub MachiningLsBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles MachiningLsBx.SelectionChanged
      If MachiningLsBx.SelectedItems.Count = 0 Then Return
+      If MachiningLsBx.SelectedItems.Count = 1 Then m_bAreHomogeneous = True
      ' creo lista ordinata dei selezionati
      Dim ItemList As New List(Of NameIdLsBxItem)
      For Each Item As NameIdLsBxItem In MachiningLsBx.SelectedItems
         ItemList.Add(Item)
      Next
+
+      ' verifico che le lavorazioni siano dello stesso tipo
+      VerifyHomogenousMachining(ItemList)
+
      ItemList.Sort(Function(x, y) Comparer(Of Integer).Default.Compare(m_ItemList.IndexOf(x), m_ItemList.IndexOf(y)))
      ' verifico che siano contigui
      Dim bContigus As Boolean = False
@@ -287,8 +511,14 @@ 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
+
+      VerifyHomogenousMachining(ItemList)
   End Sub

   Private Sub AllOnBtn_Click(sender As Object, e As RoutedEventArgs) Handles AllOnBtn.Click
@@ -772,26 +1002,37 @@ 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))
@@ -903,7 +1144,7 @@ Public Class SplitPageUC
      ' Recupero la lavorazione corrente
      If m_CurrFirstInd = -1 Then Return
      Dim bGenModif As Boolean = False
-      For Index As integer = m_CurrFirstInd To m_CurrLastInd
+      For Index As Integer = m_CurrFirstInd To m_CurrLastInd
         Dim nI As Integer = m_ItemList(Index).Ind
         Dim nOperId As Integer = m_MachiningList(nI).m_nId
         Dim nMachiningType As Integer = EgtGetOperationType(nOperId)
@@ -924,26 +1165,38 @@ 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.ENDADDLEN, dOrigUeal)
+                  EgtSetInfo(nOperId, INFO_MCH_USER_EAL, 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))
@@ -1027,40 +1280,40 @@ Public Class SplitPageUC
      For Index As Integer = m_CurrFirstInd To m_CurrLastInd
         Dim nI As Integer = m_ItemList(Index).Ind
         ' Si possono invertire solo i tagli di lama
-         If m_MachiningList( nI).m_nType <> MCH_OY.SAWING Then Continue For
+         If m_MachiningList(nI).m_nType <> MCH_OY.SAWING Then Continue For
         ' Non si possono invertire i tagli di lama inclinati
-         If Math.Abs( m_MachiningList(nI).m_dSideAng) > 0.1 Then Continue For
+         If Math.Abs(m_MachiningList(nI).m_dSideAng) > 0.1 Then Continue For
         ' Se abilitata inversione automatica e quindi non invertito
-         If m_MachiningList( nI).m_bEnableInvert Then
+         If m_MachiningList(nI).m_bEnableInvert Then
            ' Inverto e disabilito inversione automatica
-            If CamAuto.InvertVerticalCut( m_MachiningList( nI).m_nId) Then
-               m_MachiningList( nI).m_bInvert = True
-               m_MachiningList( nI).m_vtDir = - m_MachiningList( nI).m_vtDir
-               m_MachiningList( nI).m_bEnableInvert = False
-               SwapStartEndData( nI)
-               ResetEnableInvert( m_MachiningList( nI).m_nEntId)
-               EgtErase( m_MachiningList( nI).m_nArrId)
-               NumberDirectionMachining( nI, False)
+            If CamAuto.InvertVerticalCut(m_MachiningList(nI).m_nId) Then
+               m_MachiningList(nI).m_bInvert = True
+               m_MachiningList(nI).m_vtDir = -m_MachiningList(nI).m_vtDir
+               m_MachiningList(nI).m_bEnableInvert = False
+               SwapStartEndData(nI)
+               ResetEnableInvert(m_MachiningList(nI).m_nEntId)
+               EgtErase(m_MachiningList(nI).m_nArrId)
+               NumberDirectionMachining(nI, False)
               EgtDraw()
            End If
-         ' se altrimenti disabilitata inversione automatica e invertito
-         ElseIf m_MachiningList( nI).m_bInvert Then
+            ' se altrimenti disabilitata inversione automatica e invertito
+         ElseIf m_MachiningList(nI).m_bInvert Then
            ' Tolgo inversione e lascio disabilitazione inv. autom.
-            If CamAuto.InvertVerticalCut( m_MachiningList( nI).m_nId) Then
-               m_MachiningList( nI).m_bInvert = False
-               m_MachiningList( nI).m_vtDir = - m_MachiningList( nI).m_vtDir
-               SwapStartEndData( nI)
-               EgtErase( m_MachiningList( nI).m_nArrId)
-               NumberDirectionMachining( nI, False)
+            If CamAuto.InvertVerticalCut(m_MachiningList(nI).m_nId) Then
+               m_MachiningList(nI).m_bInvert = False
+               m_MachiningList(nI).m_vtDir = -m_MachiningList(nI).m_vtDir
+               SwapStartEndData(nI)
+               EgtErase(m_MachiningList(nI).m_nArrId)
+               NumberDirectionMachining(nI, False)
               EgtDraw()
            End If
-         ' altrimenti disabilitata inversione automatica e non invertito
+            ' altrimenti disabilitata inversione automatica e non invertito
         Else
            ' Abilito inversione automatica e lascio non invertito
-            m_MachiningList( nI).m_bEnableInvert = True
-            SetEnableInvert( m_MachiningList( nI).m_nEntId)
-            EgtErase( m_MachiningList( nI).m_nArrId)
-            NumberDirectionMachining( nI, False)
+            m_MachiningList(nI).m_bEnableInvert = True
+            SetEnableInvert(m_MachiningList(nI).m_nEntId)
+            EgtErase(m_MachiningList(nI).m_nArrId)
+            NumberDirectionMachining(nI, False)
            EgtDraw()
         End If
      Next
@@ -1122,7 +1375,7 @@ Public Class SplitPageUC
      ' Se fase corrente è la prima, imposto partenza normale
      If m_nCurrPhase = 1 Then
         m_MainWindow.m_CurrentProjectPageUC.ResetProjectNcRestart()
-      ' Altrimenti, imposto la ripartenza dalla fase corrente
+         ' Altrimenti, imposto la ripartenza dalla fase corrente
      Else
         m_MainWindow.m_CurrentProjectPageUC.SetProjectNcRestart(m_nCurrPhase)
         m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(MSG_SPLITPAGEUC + 19) & " (" & m_nCurrPhase.ToString() & ")")
@@ -1141,7 +1394,7 @@ Public Class SplitPageUC
      ' Aggiorno le lavorazioni (eliminato sort per lasciare ordine immutato)
      If m_MainWindow.m_CurrentMachine.WaterJettingActive Then ResetAllMachinings()
      m_MainWindow.m_CurrentProjectPageUC.SetOrderMachiningFlag()
-      If m_MainWindow.m_CurrentMachine.WaterJettingActive Then         
+      If m_MainWindow.m_CurrentMachine.WaterJettingActive Then
         Dim bModif As Boolean = TestAllMachiningsForStrict()
         If bModif Then m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(90321)) 'Ridotte alcune lavorazioni per evitare interferenze
      End If
@@ -1151,8 +1404,13 @@ Public Class SplitPageUC
      HideAllMachinings()
      ' Preparo la lista delle lavorazioni e le disabilito
      CalculateSplitMachList(m_nCurrPhase, m_MachiningList)
+      m_nCountSawing = 0
+      m_nCountWaterjetting = 0
+      m_nCountOtherMachining = 0
      For nI As Integer = 0 To m_MachiningList.Count() - 1
         m_MachiningList(nI).m_bEnabled = False
+         ' conto il numero di tipi di lavorazioni
+         CountMachiningType(m_MachiningList(nI), m_nCountSawing, m_nCountWaterjetting, m_nCountOtherMachining)
      Next
      ' Aggiorno visualizzazione delle lavorazioni
      EgtEmptyGroup(m_nNbrGrpId)
@@ -1171,6 +1429,7 @@ Public Class SplitPageUC
   End Sub

   Private Sub SplitPageUC_Unloaded(sender As Object, e As EventArgs) Handles Me.Unloaded
+      m_bActive = False
      m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
      ExitSplit(Not m_bToNext)
      EgtDraw()
@@ -1338,6 +1597,86 @@ Public Class SplitPageUC
      ModifEndBtn.IsEnabled = Not m_bShow
      InvertBtn.IsEnabled = Not m_bShow
      PauseBtn.IsEnabled = Not m_bShow And m_MainWindow.m_CurrentMachine.bEnablePause
+
+      ' 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
+         VisibilityButtonFromMachinig(MCH_OY.WATERJETTING)
+      Else
+         VisibilityButtonFromMachinig(MCH_OY.SAWING)
+      End If
+
+   End Sub
+
+   Private Sub VerifyHomogenousMachining(ItemList As List(Of NameIdLsBxItem))
+      If IsNothing(ItemList) OrElse ItemList.Count = 0 Then
+         m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+         Return
+      End If
+      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
+   End Sub
+
+   Private Sub VisibilityButtonFromMachinig(ByVal Type As Integer)
+      If Type <> MCH_OY.SAWING Then
+         CutBtn.Visibility = Visibility.Hidden
+         CutStartBtn.Visibility = Visibility.Hidden
+         CutEndBtn.Visibility = Visibility.Hidden
+
+         OutCenStartBtn.Visibility = Visibility.Hidden
+         OutCenEndBtn.Visibility = Visibility.Hidden
+         InvertBtn.Visibility = Visibility.Hidden
+         PauseBtn.Visibility = Visibility.Hidden
+         AllOutStartBtn.Visibility = Visibility.Hidden
+         AllCenStartBtn.Visibility = Visibility.Hidden
+         AllOutEndBtn.Visibility = Visibility.Hidden
+         AllCenEndBtn.Visibility = Visibility.Hidden
+         AllExtendBtn.Visibility = Visibility.Hidden
+         AllReduceBtn.Visibility = Visibility.Hidden
+      Else
+         CutBtn.Visibility = Visibility.Visible
+         CutStartBtn.Visibility = Visibility.Visible
+         CutEndBtn.Visibility = Visibility.Visible
+
+         OutCenStartBtn.Visibility = Visibility.Visible
+         OutCenEndBtn.Visibility = Visibility.Visible
+         InvertBtn.Visibility = Visibility.Visible
+         PauseBtn.Visibility = Visibility.Visible
+         AllOutStartBtn.Visibility = Visibility.Visible
+         AllCenStartBtn.Visibility = Visibility.Visible
+         AllOutEndBtn.Visibility = Visibility.Visible
+         AllCenEndBtn.Visibility = Visibility.Visible
+         AllExtendBtn.Visibility = Visibility.Visible
+         AllReduceBtn.Visibility = Visibility.Visible
+      End If
   End Sub

   Private Function ModifyOtherLeadIn(nI As Integer, nLiOthType As Integer) As Boolean
@@ -1572,6 +1911,7 @@ Public Class SplitPageUC
      Private m_nInd As Integer
      Private m_sName As String
      Private m_bIsActive As Boolean
+      Private m_nType As Integer

      Public Property Ind As Integer
         Get
@@ -1606,10 +1946,20 @@ Public Class SplitPageUC
         End Set
      End Property

-      Sub New(Name As String, Ind As Integer, bIsActive As Boolean)
+      Public Property Type As Integer
+         Get
+            Return m_nType
+         End Get
+         Set(value As Integer)
+            m_nType = value
+         End Set
+      End Property
+
+      Sub New(Name As String, Ind As Integer, bIsActive As Boolean, nType As Integer)
         Me.m_sName = Name
         Me.m_nInd = Ind
         Me.m_bIsActive = bIsActive
+         Me.m_nType = nType
      End Sub

      Public Sub NotifyPropertyChanged(propName As String)
@@ -8,6 +8,8 @@ Module VacuumCups
   Private m_nVacId As Integer = GDB_ID.NULL
   Private m_nRefId As Integer = GDB_ID.NULL
   Private m_dPreferredRot As Double = 0
+   Private m_dPrefVertRotXMinus As Double = 0
+   Private m_dPrefVertRotXPlus As Double = 0
   Private m_dDripRefAng As Double = 0

   ' Nome del gruppo temporaneo per le ventose
@@ -74,6 +76,9 @@ Module VacuumCups
      If m_nVacId = GDB_ID.NULL Then Return False
      ' Angolo di rotazione preferito
      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
+      ' Angoli di rotazione preferiti per ventosa in verticale (lungo Y) a sinistra e a destra del centro tavola
+      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXMINUS, m_dPrefVertRotXMinus)
+      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXPLUS, m_dPrefVertRotXPlus)
      ' Direzione di riferimento per tagli Drip
      EgtGetInfo( m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
      ' Nascondo il gruppo ma rendo visibili le curve di contorno delle ventose
@@ -363,6 +368,9 @@ Module VacuumCups
      If b3Vac.IsEmpty() Then Return INFINITO
      ' Se box maggiore di quello del pezzo, scarto soluzione
      If b3Vac.Radius() > b3Raw.Radius() Then Return INFINITO
+      ' Recupero l'area della tavola
+      Dim b3Tab As New BBox3d
+      EgtGetTableArea(1, b3Tab)
      ' Determino il movimento
      vtMove = ptRawCen - b3Vac.Center()
      b3Vac.Move(vtMove)
@@ -374,11 +382,19 @@ Module VacuumCups
         frMinRect.VersX().ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
         dRotAngDeg = dAngOrizzDeg
         If b3Vac.DimY() > b3Vac.DimX() + EPS_SMALL Then dRotAngDeg -= 90
+         Dim dPreferredRot As Double = m_dPreferredRot
+         If Math.Abs( dRotAngDeg - 90) < 45  Or  Math.Abs( dRotAngDeg - 270) < 45 Then
+            If frMinRect.Orig().x < b3Tab.Center().x Then
+               dPreferredRot = m_dPrefVertRotXMinus
+            else
+               dPreferredRot = m_dPrefVertRotXPlus
+            End If
+         End If 
         Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
-         While dRotAngDeg - m_dPreferredRot >= dAngDelta / 2 
+         While dRotAngDeg - dPreferredRot >= dAngDelta / 2 
            dRotAngDeg -= dAngDelta
         End While
-         While dRotAngDeg - m_dPreferredRot <= -dAngDelta / 2
+         While dRotAngDeg - dPreferredRot <= -dAngDelta / 2
            dRotAngDeg += dAngDelta
         End While
      Else
@@ -431,8 +447,6 @@ Module VacuumCups
      ptRef.Move(vtMove)
      ptRef.Rotate(ptRotCen, Vector3d.Z_AX(), dRotAngDeg)
      ' Ne calcolo la distanza dal centro della tavola
-      Dim b3Tab As New BBox3d
-      EgtGetTableArea(1, b3Tab)
      Dim dDist As Double = Point3d.DistXY(ptRef, b3Tab.Center())
      Return dDist
   End Function
@@ -92,6 +92,8 @@ Module ConstGen
   Public Const KEY_VACLAY_SEL As String = "Sel"
   ' Info in gruppo layout per angolo di rotazione preferito
   Public Const KEY_VACLAY_PREFROT As String = "PreferredRot"
+   Public Const KEY_VACLAY_PREFVROTXMINUS As String = "PrefVertRotXMinus"
+   Public Const KEY_VACLAY_PREFVROTXPLUS As String = "PrefVertRotXPlus"
   ' Info in gruppo layout per direzione di riferimento ventose per tagli da sotto
   Public Const KEY_VACLAY_DRIPREFDIR As String = "DripRefDir"
   ' Info in asse rotante ventosa per step discreti
@@ -205,6 +207,7 @@ Module ConstGen
   Public Const INFO_DEPTH As String = "Depth"
   Public Const INFO_WIDTH As String = "Width"
   Public Const INFO_DEPTH2 As String = "Depth2"
+   Public CONST INFO_AGG2 As String = "Agg2"
   ' Info in entità da tagliare per taglio ristretto
   Public Const INFO_STRICT As String = "Strict"
   ' Info in entità da tagliare per angolo di lato e tallone
@@ -11,9 +11,18 @@
   Public Const K_ZIGZAGX As String = "ZigZagX"
   Public Const K_OFFZIGZAGX As String = "OffZigZagX"
   Public Const K_STEPX As String = "StepX"
+   Public Const K_RADIUSX As String = "RadiusX"
+   Public Const K_DISTANCEX As String = "DistanceX"
   Public Const K_ZIGZAGY As String = "ZigZagY"
   Public Const K_OFFZIGZAGY As String = "OffZigZagY"
   Public Const K_STEPY As String = "StepY"
+   Public Const K_RADIUSY As String = "RadiusY"
+   Public Const K_DISTANCEY As String = "DistanceY"
+   Public Const K_SPIRAL As String = "Spiral"
+   Public Const K_OFFSPIRAL As String = "OffSpiral"
+   Public Const K_STEPSPIRAL As String = "StepSpiral"
+   Public Const K_RADIUSSPIRAL As String = "RadiusSpiral"
+   Public Const K_DISTANCESPIRAL As String = "DistanceSpiral"
   Public Const K_LILEN As String = "LiLen"
   Public Const K_LIHEIGHT As String = "LiHeight"
   Public Const K_LILOAD As String = "LiLoad"
@@ -44,6 +44,7 @@
   Public Const S_NCNUM As String = "NcNUM"
   Public Const K_RESETSENDDELAY As String = "ResetSendDelay"
   Public Const K_THREADSLEEP As String = "ThreadSleep"
+   Public Const K_PHOTODELEY As String = "PhotoDeley"

   Public Const S_NCDATA As String = "NcData"
   Public Const K_NEWVARIABLE As String = "NewVariable"
@@ -76,6 +77,9 @@
   Public Const K_DOORCLOSED As String = "DoorClosed"
   Public Const K_LIMITZ As String = "LimitZ"
   Public Const K_POWEROVR As String = "PowerOvr"
+   Public Const K_PARKING As String = "Parking"
+   Public Const K_ENABLEZONE As String = "EnableZone"
+   Public Const K_ENABLEPC As String = "EnablePC"
   Public Const K_HSM As String = "Hsm"
   Public Const K_VACUUMUP As String = "VacuumUp"
   Public Const K_VACUUMDOWN As String = "VacuumDown"
@@ -103,6 +107,8 @@
   Public Const K_VACUUMOFF As String = "VacuumOff"
   Public Const K_BYPASSTATE As String = "BypassState"
   Public Const K_FEEDHOLD As String = "FeedHold"
+   Public Const K_SPOTLIGHT1 As String = "SpotLight1"
+   Public Const K_SPOTLIGHT2 As String = "SpotLight2"
   ' Nuove variabili
   Public Const K_SPEEDHOLD As String = "SpeedHold"
   Public Const K_XYJOG As String = "XYJog"
@@ -282,5 +288,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
@@ -330,6 +330,18 @@ Public Class ControlsMachineButtonUC
      End If
   End Sub

+   Friend Sub ParkingStateChanged(ParkingState As Boolean)
+      Dim ParkingButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_PARKING Then
+            ParkingButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(ParkingButton) Then
+         ParkingButton.SetIsChecked(ParkingState)
+      End If
+   End Sub
+
   Public Function GetPrivateProfileMachineButtons(
                         ByVal lpAppName As String,
                         ByVal lpKeyName As String,
@@ -647,6 +659,7 @@ Public Class TwoStateButton
         Return m_IsChecked
      End Get
      Set(value As Boolean)
+         ' accendo il comando, anche se dovrei aspettare di leggere lo stato da PLC
         m_IsChecked = value
         If value Then
            ExecuteMDICommand(TLuaScriptName)
@@ -201,8 +201,8 @@
            <ColumnDefinition Width="1*"/>
            <ColumnDefinition Width="1*"/>
            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5*"/>
+            <!--<ColumnDefinition Width="1*"/>-->
            <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>

@@ -239,9 +239,11 @@
               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
            <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
         </ToggleButton>
-         <Button Name="ManualModeBtn" Grid.Column="8"
-               Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+
+         <!--Comando Manula/MDI-->
+         <Button Name="ManualModeBtn" Grid.Column="7"
+                Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+             <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
         </Button>

      </Grid>
@@ -133,25 +133,6 @@ Public Class DirectCutPageUC
      ' leggo il numero di assi attivi nella macchina
      Dim AxesNumber = GetPrivateProfileInt(S_AXES, K_AXESNUM, 5, m_MainWindow.GetMachIniFile())

-      '' leggo se è stata configurata la nuova conole
-      'If GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile()) = 1 And Not bCollapsedNewBottonsConsole Then
-      '   XYBtn.Content = "X - Y"
-      '   XYBtn.Foreground = Brushes.White
-      '   ZCBtn.Content = "Z - C"
-      '   ZCBtn.Foreground = Brushes.White
-      '   If AxesNumber < 5 Then
-      '      ZBBtn.Visibility = Windows.Visibility.Collapsed
-      '   End If
-      '   ZBBtn.Content = "Z - B"
-      '   ZBBtn.Foreground = Brushes.White
-      '   RemoteBtn.Content = "Remote"
-      '   RemoteBtn.Foreground = Brushes.White
-      'Else
-      '   XYBtn.Visibility = Windows.Visibility.Collapsed
-      '   ZCBtn.Visibility = Windows.Visibility.Collapsed
-      '   ZBBtn.Visibility = Windows.Visibility.Collapsed
-      'End If
-
   End Sub

   Private Sub DirectCutPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -228,8 +209,12 @@ Public Class DirectCutPageUC
      ' Se macchina fotografica abilitata
      PhotoBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO)

-      ' Attivo le lavorazioni solo se esiste il grezzo
+      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
+      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+
+      ManualBtn.IsEnabled = bH1Exists
+      ' sviluppo rimasto in sospeso
      If m_bManulaCut Then
         ' anche se non è presente un grezzo mantengo abilitato il bottone
         SingleCutBtn.IsEnabled = True
@@ -238,10 +223,14 @@ Public Class DirectCutPageUC
      End If
      MultipleCutBtn.IsEnabled = bRawOk
      GridCutBtn.IsEnabled = bRawOk
-      SingleDrillBtn.IsEnabled = bRawOk
-      FlatteningCutBtn.IsEnabled = bRawOk
+      SingleDrillBtn.IsEnabled = (bRawOk And bH1Exists)
+      FlatteningCutBtn.IsEnabled = (bRawOk And bH1Exists)
      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
-      SawTestBtn.IsEnabled = bRawOk
+      SawTestBtn.IsEnabled = (bRawOk And bH1Exists)
+      CopyTemplateBtn.IsEnabled = bH1Exists
+
+      ' aggiorno la visualizzazione dei parametri
+      ReloadParam()

      ' Nascondo i pezzi in parcheggio
      HideParkedParts()
@@ -249,6 +238,20 @@ Public Class DirectCutPageUC

   End Sub

+   Public Sub ReloadParam()
+      Dim sCurrSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
+      Dim sCurrSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      Dim bSaw As Boolean = False
+
+      ' se esiste una lavorazione di lama corrente vuol dire che deve essere preferita
+      If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
+         bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
+      End If
+      m_SingleCut.SetEnableParam(bSaw)
+      m_MultipleCut.SetEnableParam(bSaw)
+      m_GridCut.SetEnableParam(bSaw)
+   End Sub
+
   Private Sub SetVisibilityJogButtuns()
      XYBtn.Visibility = Visibility.Collapsed
      ZCBtn.Visibility = Visibility.Collapsed
@@ -152,6 +152,7 @@ Public Class GridCut
      EgtDraw()
   End Sub

+
   Friend Sub GridCut_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())
@@ -185,6 +186,11 @@ Public Class GridCut
      m_bActive = False
   End Sub

+   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
+      ' se macchina solo WaterJet Disabilito/Nascondo parametri della lama
+      DepthTxBx.IsEnabled = bIsSaw
+   End Sub
+
   Private Sub UpdateSimulOkBtn()
      If m_bCutOk Then
         SimulBtn.IsEnabled = True
@@ -242,6 +248,12 @@ Public Class GridCut
      ' Verifico configurazione tavola e grezzo
      If Not m_bRawOk Then Return

+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
      ' Se acquisizone lama o laser
      If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then

@@ -256,12 +268,12 @@ Public Class GridCut
            If Not EgtSetCalcTool("", "H3", 1) Then Return
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
            ' Altrimenti da lama
         Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
         End If
@@ -285,10 +297,8 @@ Public Class GridCut
         ' Porto il tip nell'origine tavola
         m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
         m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
      End If

      ' Disegno il taglio
@@ -317,6 +327,12 @@ Public Class GridCut
      ' Verifico configurazione tavola e grezzo
      If Not m_bRawOk Then Return

+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
      ' Se acquisizone lama o laser
      If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then

@@ -331,12 +347,12 @@ Public Class GridCut
            If Not EgtSetCalcTool("", "H3", 1) Then Return
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
            ' Altrimenti da lama
         Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
         End If
@@ -358,10 +374,8 @@ Public Class GridCut
         ' Porto il tip nell'origine tavola
         m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
         m_bPointP2Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
      End If

      ' Se il secondo punto non coincide con il primo, disegno il taglio
@@ -19,7 +19,8 @@
         <ColumnDefinition Width="1*"/>
         <ColumnDefinition Width="1*"/>
         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>

      <ToggleButton Name="MachineButton1" Grid.Column="0" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
         <Image Name="ImageButton1" Style="{StaticResource OmagCut_ButtonIcon}"/>
@@ -61,6 +62,10 @@
         <Image Name="ImageButton10" Style="{StaticResource OmagCut_ButtonIcon}"/>
      </ToggleButton>

-   </Grid>
+        <ToggleButton Name="MachineButton11" Grid.Column="10" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+            <Image Name="ImageButton11" Style="{StaticResource OmagCut_ButtonIcon}"/>
+        </ToggleButton>
+
+    </Grid>

 </UserControl>
@@ -10,7 +10,8 @@ Public Class MachineButtonsUC
   Private m_bOnlyLaser As Boolean = False
   Private m_bFirst As Boolean = True

-   Private Const MAX_BUTTONS As Integer = 10
+   ' 9/2 aggiunto spazio per un nuovo bottone
+   Private Const MAX_BUTTONS As Integer = 11
   Private m_nCount As Integer = 0
   Private ImageArrayY(MAX_BUTTONS - 1) As String
   Private ImageArrayN(MAX_BUTTONS - 1) As String
@@ -31,6 +32,10 @@ Public Class MachineButtonsUC
   Private Const BTN_STATE_NOTHING As String = "Nothing"
   Private Const BTN_STATE_DOOR_OPENED As String = "DoorOpened"
   Private Const BTN_STATE_DOOR_CLOSED As String = "DoorClosed"
+   Private Const BTN_STATE_PARKING As String = "Parking"
+   Private Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
+   Private Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
+   Private Const BTN_ENABLE_PC As String = "EnablePC"

   Public Sub New(Optional bOnlyLaser As Boolean = False)
      ' This call is required by the designer.
@@ -75,7 +80,10 @@ Public Class MachineButtonsUC
      For nIndex As Integer = 0 To m_nCount - 1
         If StateFlagArray(nIndex) = BTN_STATE_NOTHING OrElse
            StateFlagArray(nIndex) = BTN_STATE_DOOR_OPENED OrElse
-            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED Then
+            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED OrElse
+            StateFlagArray(nIndex) = BTN_ENABLE_PC OrElse
+            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_1 OrElse
+            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_2 Then
            ' mostra immagine fissa
            Try
               Dim s As String
@@ -134,7 +142,8 @@ Public Class MachineButtonsUC
   End Sub

   Private Sub MachineButton_Click(sender As Object, e As RoutedEventArgs) Handles MachineButton1.Click, MachineButton2.Click, MachineButton3.Click, MachineButton4.Click, MachineButton5.Click,
-                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click
+                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click,
+                                                                                   MachineButton11.Click
      Dim CurrentBtn As Primitives.ToggleButton = e.Source
      ' recupero l'inidce del bottone selezionato
      Dim nIndex As Integer = GetToggleButtonIndex(CurrentBtn) - 1
@@ -153,6 +162,18 @@ Public Class MachineButtonsUC
         Return
      End If

+      ' Se il bottone chiamantè quello per la selezione del pannello di controllo
+      If nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC) Then
+         Dim sTLuaFile As String = sBaseDir & CommandArrayY(nIndex)
+         Dim sFLuaFile As String = sBaseDir & CommandArrayN(nIndex)
+         If m_CN.nEnablePc = 1 Then
+            ExecuteMDICommand(CurrentBtn, sTLuaFile)
+         ElseIf m_CN.nEnablePc = 2 Then
+            ExecuteMDICommand(CurrentBtn, sFLuaFile)
+         End If
+         Return
+      End If
+
      If CurrentBtn.IsChecked() Then
         'EgtLuaExecFile(sBaseDir & CommandArrayY(nIndex))
         sLuaFileName = sBaseDir & CommandArrayY(nIndex)
@@ -344,6 +365,7 @@ Public Class MachineButtonsUC
                " EType2=" & If(Not String.IsNullOrEmpty(EType2), CInt(EType2).ToString, ""))
   End Sub

+#Region "STATE CHANGED"

   Friend Sub SpindleStateChanged(SpindleState As Boolean)
      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_SPINDLE)
@@ -584,6 +606,135 @@ Public Class MachineButtonsUC
      End If
   End Sub

+   Friend Sub ParkingStateChanged(ParkingState As Boolean)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_PARKING)
+      If nIndex = -1 Then Return
+      If ParkingState Then
+         GetToggleButton(nIndex + 1).IsChecked = True
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
+         End Try
+      Else
+         GetToggleButton(nIndex + 1).IsChecked = False
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
+         End Try
+      End If
+   End Sub
+
+   Friend Sub EnableZoneStateChanged(ZoneState As Integer)
+      Dim sFlag As String = String.Empty
+      If ZoneState = 1 Then
+         sFlag = BTN_ENABLE_ZONE_1
+      ElseIf ZoneState = 2 Then
+         sFlag = BTN_ENABLE_ZONE_2
+      End If
+      ' recupero il bottone che deve essere acceso (quindi spengo l'altro)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, sFlag)
+
+      ' se non trovo nessun riferimento allora spengo entrambi i comandi
+      If nIndex = -1 Then
+         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
+         GetToggleButton(nIndex + 1).IsChecked = False
+         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
+         GetToggleButton(nIndex + 1).IsChecked = False
+         Return
+      End If
+
+      If ZoneState = 1 Then
+         GetToggleButton(nIndex + 1).IsChecked = True
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
+         End Try
+         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
+         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
+         GetToggleButton(nIndex + 1).IsChecked = False
+
+      ElseIf ZoneState = 2 Then
+         GetToggleButton(nIndex + 1).IsChecked = True
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
+         End Try
+         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
+         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
+         GetToggleButton(nIndex + 1).IsChecked = False
+      End If
+   End Sub
+
+   Friend Sub EnablePcStateChanged(PcState As Integer)
+      ' il comando ButtonY accendo il Pannello_1, il comando ButtonN accendo il Pannello_2 (uno è la negazione dell'altro)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC)
+      If nIndex = -1 Then Return
+      If PcState = 1 Then
+         GetToggleButton(nIndex + 1).IsChecked = True
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
+         End Try
+      ElseIf PcState = 2 Then
+         GetToggleButton(nIndex + 1).IsChecked = True
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
+         End Try
+      Else
+         ' nessuno dei due pannelli attivo
+         GetToggleButton(nIndex + 1).IsChecked = False
+      End If
+   End Sub
+
   '----------------- Queste funzioni determina lo stato del bottone direttamente dalla lettura delle variabili CN
   Friend Sub XYJogChanged(ByVal bXYAxes As Boolean)
      ' recupero le asscociazioni con i bottoni
@@ -619,78 +770,86 @@ Public Class MachineButtonsUC

   '-----------------------------------------------------------------------------------------------------------------

+#End Region    ' State changed
+
   Private Function GetToggleButton(ByVal nIndex As Integer) As Primitives.ToggleButton
      Select Case nIndex
-      Case 1
-         Return MachineButton1
-      Case 2
-         Return MachineButton2
-      Case 3
-         Return MachineButton3
-      Case 4
-         Return MachineButton4
-      Case 5
-         Return MachineButton5
-      Case 6
-         Return MachineButton6
-      Case 7
-         Return MachineButton7
-      Case 8
-         Return MachineButton8
-      Case 9
-         Return MachineButton9
-      Case Else
-         Return MachineButton10
+         Case 1
+            Return MachineButton1
+         Case 2
+            Return MachineButton2
+         Case 3
+            Return MachineButton3
+         Case 4
+            Return MachineButton4
+         Case 5
+            Return MachineButton5
+         Case 6
+            Return MachineButton6
+         Case 7
+            Return MachineButton7
+         Case 8
+            Return MachineButton8
+         Case 9
+            Return MachineButton9
+         Case 10
+            Return MachineButton10
+         Case Else
+            Return MachineButton11
      End Select
   End Function

   Private Function GetToggleButtonIndex(ByVal nBtnName As Primitives.ToggleButton) As Integer
      Select Case nBtnName.Name
-      Case MachineButton1.Name
-         Return 1
-      Case MachineButton2.Name
-         Return 2
-      Case MachineButton3.Name
-         Return 3
-      Case MachineButton4.Name
-         Return 4
-      Case MachineButton5.Name
-         Return 5
-      Case MachineButton6.Name
-         Return 6
-      Case MachineButton7.Name
-         Return 7
-      Case MachineButton8.Name
-         Return 8
-      Case MachineButton9.Name
-         Return 9
-      Case Else
-         Return 10
+         Case MachineButton1.Name
+            Return 1
+         Case MachineButton2.Name
+            Return 2
+         Case MachineButton3.Name
+            Return 3
+         Case MachineButton4.Name
+            Return 4
+         Case MachineButton5.Name
+            Return 5
+         Case MachineButton6.Name
+            Return 6
+         Case MachineButton7.Name
+            Return 7
+         Case MachineButton8.Name
+            Return 8
+         Case MachineButton9.Name
+            Return 9
+         Case MachineButton10.Name
+            Return 10
+         Case Else
+            Return 11
      End Select
   End Function

   Private Function GetImage(ByVal nInd As Integer) As Image
      Select Case nInd
-      Case 1
-         Return ImageButton1
-      Case 2
-         Return ImageButton2
-      Case 3
-         Return ImageButton3
-      Case 4
-         Return ImageButton4
-      Case 5
-         Return ImageButton5
-      Case 6
-         Return ImageButton6
-      Case 7
-         Return ImageButton7
-      Case 8
-         Return ImageButton8
-      Case 9
-         Return ImageButton9
-      Case Else
-         Return ImageButton10
+         Case 1
+            Return ImageButton1
+         Case 2
+            Return ImageButton2
+         Case 3
+            Return ImageButton3
+         Case 4
+            Return ImageButton4
+         Case 5
+            Return ImageButton5
+         Case 6
+            Return ImageButton6
+         Case 7
+            Return ImageButton7
+         Case 8
+            Return ImageButton8
+         Case 9
+            Return ImageButton9
+         Case 10
+            Return ImageButton10
+         Case Else
+            Return ImageButton11
      End Select
   End Function

@@ -213,6 +213,10 @@ Public Class MultipleCut
      m_bActive = False
   End Sub

+   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
+      DepthTxBx.IsEnabled = bIsSaw
+   End Sub
+
   Private Sub UpdateSimulOkBtn()
      If m_bCutOk Then
         SimulBtn.IsEnabled = True
@@ -270,6 +274,12 @@ Public Class MultipleCut
      ' Verifico configurazione tavola e grezzo
      If Not m_bRawOk Then Return

+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
      ' Se acquisizone lama o laser
      If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then

@@ -284,12 +294,14 @@ Public Class MultipleCut
            If Not EgtSetCalcTool("", "H3", 1) Then Return
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
+            ' Altrimenti da lama
         Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
         End If
@@ -312,10 +324,9 @@ Public Class MultipleCut
         ' Porto il tip nell'origine tavola
         m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
         m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
+
      End If
      ' Disegno il taglio
      CreateMultipleCut()
@@ -343,6 +354,12 @@ Public Class MultipleCut
      ' Verifico configurazione tavola e grezzo
      If Not m_bRawOk Then Return

+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
      ' Se acquisizone lama o laser
      If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then

@@ -357,12 +374,12 @@ Public Class MultipleCut
            If Not EgtSetCalcTool("", "H3", 1) Then Return
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Altrimenti da lama
         Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
         End If
@@ -383,10 +400,9 @@ Public Class MultipleCut
         ' Porto il tip nell'origine tavola
         m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
         m_bPointP2Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
+
      End If

      ' Se il secondo punto non coincide con il primo, disegno il taglio
@@ -137,6 +137,9 @@ Public Class SingleCutUC
      Point2Btn.IsEnabled = False
      ' Deseleziono bottone primo punto
      Point1Btn.IsChecked = False
+
+      ' la visualizzazione dei comandi è gestira dalla DirectCutPageUC richiamando la funzione ReloadParam
+
      ' Aggiorno visualizzazione
      EgtDraw()
   End Sub
@@ -172,6 +175,12 @@ Public Class SingleCutUC
      m_bActive = False
   End Sub

+   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
+      ' se macchina solo WaterJet Disabilito/Nascondo parametri della lama
+      DepthTxBx.IsEnabled = bIsSaw
+      SawThChBx.IsEnabled = bIsSaw
+   End Sub
+
   Private Sub UpdateSimulOkBtn()
      If m_bCutOk Then
         SimulBtn.IsEnabled = True
@@ -229,6 +238,12 @@ Public Class SingleCutUC
      ' Verifico configurazione tavola e grezzo
      If Not m_bRawOk Then Return

+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
      ' Se acquisizione lama o laser
      If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
         ' Recupero la posizione macchina
@@ -242,12 +257,12 @@ Public Class SingleCutUC
            If Not EgtSetCalcTool("", "H3", 1) Then Return
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Altrimenti da lama
         Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
         End If
@@ -271,10 +286,9 @@ Public Class SingleCutUC
         ' Porto il tip nell'origine tavola
         m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
         m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
+
      End If

      ' Disegno il taglio
@@ -303,6 +317,12 @@ Public Class SingleCutUC
      ' Verifico configurazione tavola e grezzo
      If Not m_bRawOk Then Return

+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
      ' Se acquisizone lama o laser
      If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
         ' Recupero la posizione macchina
@@ -316,12 +336,14 @@ Public Class SingleCutUC
            If Not EgtSetCalcTool("", "H3", 1) Then Return
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
+            ' Altrimenti da lama
         Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
            ' Trasformo in posizione punta utensile in basso
            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
         End If
@@ -343,10 +365,8 @@ Public Class SingleCutUC
         ' Porto il tip nell'origine tavola
         m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
         m_bPointP2Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
      End If

      ' Se il secondo punto non coincide con il primo, disegno il taglio
@@ -559,9 +579,13 @@ Public Class SingleCutUC
      Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
      ' Recupero spessore lama corrente
      Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
      EgtTdbSetCurrTool(sSaw)
      Dim dThick As Double = 0
-      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      ' se è impostata una lavorazione di lama
+      If Not String.IsNullOrEmpty(sSawing) Then
+         EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      End If
      ' Rimuovo eventuale vecchio pezzo per taglio diretto
      EraseDirectCutPart()
      ' Disattivo eventuali lavorazioni presenti
@@ -281,32 +281,14 @@ Public Class AlzFrontUC

   ' restituisce vero se il lato possiede delle info legate al sideangle
   Private Function VerifyIsThereSideAngle(nCurrLine As Integer) As Boolean
-      Dim sInfoSideAngle As String = String.Empty
-      EgtGetInfo(nCurrLine, INFO_SIDE_ANGLE, sInfoSideAngle)
-      If Not String.IsNullOrWhiteSpace(sInfoSideAngle) Or Not String.IsNullOrEmpty(sInfoSideAngle) Then
-         ' verifico che il dato salvato sia un double
-         Try
-            Dim dSideAngle As Double = 0
-            StringToDouble(sInfoSideAngle, dSideAngle)
-            If dSideAngle <> 0 Then
-               Return True
-            End If
-         Catch ex As Exception
-         End Try
-      End If
-      Return False
+      Dim dSideAngle As Double
+      return EgtGetInfo(nCurrLine, INFO_SIDE_ANGLE, dSideAngle)
   End Function

   ' restituisce vero se il lato possiede delle info legate alle alette
   Private Function VerifyIsThereAlzFront(nCurrLine As Integer) As Boolean
-      Dim sInfoAlzFront As String = String.Empty
-      EgtGetInfo(nCurrLine, INFO_ALZFRONT, sInfoAlzFront)
-      If Not String.IsNullOrWhiteSpace(sInfoAlzFront) Or Not String.IsNullOrEmpty(sInfoAlzFront) Then
-         If sInfoAlzFront.Trim <> "0" Then
-            Return True
-         End If
-      End If
-      Return False
+      Dim nAlzFront As Integer
+      return EgtGetInfo(nCurrLine, INFO_ALZFRONT, nAlzFront) AndAlso nAlzFront <> 0
   End Function

   ' approvo la costruzione dell'aletta sul lato indicato
@@ -159,7 +159,7 @@ Module SideAngle
      Return True
   End Function

-   Private Function WriteSideAngleOnLoop(LoopId As Integer, TextLayId As Integer) As Boolean
+   Friend Function WriteSideAngleOnLoop(LoopId As Integer, TextLayId As Integer) As Boolean
      ' Verifiche
      If LoopId = GDB_ID.NULL Or TextLayId = GDB_ID.NULL Then Return False
      ' Calcolo dimensione ingombro Loop
@@ -755,6 +755,10 @@ Public Class SideAngleUC
            vJoint.Add(False)
         End If
      Next
+
+      ' se non riesco a generare un elenco allora esco
+      If vJoint.Count < 1 Then Return
+
      If vJoint(0) And vJoint(vJoint.Count - 1) Then
         bJointStart = True
      End If
@@ -809,6 +809,7 @@
                    <Image Source="{DynamicResource SawProbeImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
                </Button>

+                
                <TextBlock Name="UseLaserOriginTxBl" Grid.Column="1"
                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="2"
@@ -119,6 +119,14 @@ Public Class AlarmsPageUC
         ' 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
+            SawGpBx.Visibility = Visibility.Hidden
+            TopMillGpBx.Visibility = Visibility.Hidden
+            CurrSawTxBl.Visibility = Visibility.Hidden
+            CurrSawCmBx.Visibility = Visibility.Hidden
+         End If
+
         ' Verifico la configurazione della macchina per creare i combobox
         Select Case m_CurrentMachine.MountedToolConfig
            Case CurrentMachine.MountedToolConfigs.SAW
@@ -133,7 +141,7 @@ Public Class AlarmsPageUC
               ' Disattivo il gruppo dei parametri fori
               HolesGpBx.Visibility = Windows.Visibility.Hidden
            Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
-               'Non faccio alcunchè
+            'Non faccio alcunchè
            Case CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER
               'Da implementare
         End Select
@@ -152,7 +160,7 @@ Public Class AlarmsPageUC

         ' Se non previsti tagli waterjet, disabilito relativo box
         If Not m_CurrentMachine.bWaterJetting Then
-            WJsParamGpBx.Visibility = Visibility.Hidden
+            WjsParamGpBx.Visibility = Visibility.Hidden
         End If

         ' Abilitazione box per contorni grezzo da foto
@@ -165,7 +173,7 @@ Public Class AlarmsPageUC
         End If

         ' Abilitazione Feed ridotta su inizio/fine tagli
-         If m_CurrentMachine.bFsevEnable Then
+         If m_CurrentMachine.bFsevEnable And EgtGetHeadId("H1") <> GDB_ID.NULL Then
            CutFredGpBx.Visibility = Windows.Visibility.Visible
         Else
            CutFredGpBx.Visibility = Windows.Visibility.Hidden
@@ -180,8 +188,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

@@ -429,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
@@ -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
@@ -1303,7 +1314,6 @@ Public Class CurrentMachine
      Local_MaterialList = EgtWPFLib5.WaterjetDbWindowVM.LoadWjMaterials(sFilePath)
      ' definisco la lista delle qualità (solo se è vuota)
      If m_Qualities.Count < 1 Then
-         m_Qualities.Add("")
         m_Qualities.Add("Q1")
         m_Qualities.Add("Q2")
         m_Qualities.Add("Q3")
@@ -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

@@ -552,12 +552,15 @@ Public Class MachiningDbPageUC
      HeadSideCmBx.SelectedIndex = ToolInt - 1
      EgtMdbGetCurrMachiningParam(MCH_MP.LEADINTYPE, ToolInt)
      If LeadInTypeCmBx.Items.Count > 0 Then
-         LeadInTypeCmBx.SelectedItem =  LeadInTypeCmBx.Items(0)
+         LeadInTypeCmBx.SelectedItem = LeadInTypeCmBx.Items(0)
      Else
         LeadInTypeCmBx.SelectedItem = Nothing
      End If
      For Each LInType As IdNameStruct In LeadInTypeCmBx.Items
-         If ToolInt = LInType.Id Then LeadInTypeCmBx.SelectedItem = LInType
+         If ToolInt = LInType.Id Then
+            LeadInTypeCmBx.SelectedItem = LInType
+            Exit For
+         End If
      Next
      EgtMdbGetCurrMachiningParam(MCH_MP.EXTLINKTYPE, ToolInt)
      ExtLinkTypeCmBx.SelectedIndex = ToolInt
@@ -705,7 +708,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 +723,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

@@ -819,13 +822,13 @@ Public Class MachiningDbPageUC
      ' Parmetri nascosti di svuotatura
      If nMachiningType = MCH_MY.POCKETING Then
         EgtMdbSetCurrMachiningParam(MCH_MP.SUBTYPE, MCH_POCK_SUB.SPIRALOUT)
-         EgtMdbSetCurrMachiningParam( MCH_MP.LEADINTYPE, MCH_POCK_LI.HELIX)
+         ' EgtMdbSetCurrMachiningParam( MCH_MP.LEADINTYPE, MCH_POCK_LI.HELIX)
         Dim dToolDiam As Double = 100
         If Not IsNothing(ToolCmBx.SelectedItem) Then
            EgtTdbSetCurrTool( ToolCmBx.SelectedItem.ToString())
            EgtTdbGetCurrToolParam( MCH_TP.DIAM, dToolDiam)
         End If
-         EgtMdbSetCurrMachiningParam( MCH_MP.LITANG, 0.495 * dToolDiam)
+         EgtMdbSetCurrMachiningParam(MCH_MP.LITANG, 0.99 * dToolDiam)
         EgtMdbSetCurrMachiningParam( MCH_MP.LIELEV, 2.0)
      End If
      ' Parametri WaterJetting
@@ -894,7 +897,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
@@ -1138,30 +1141,26 @@ Public Class MachiningDbPageUC
            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
            If RowNum > 2 Then
+               ' elimino eventuali righe in eccesso
               For Index As Integer = RowNum - 1 To 2 Step -1
                  TypeGrd.RowDefinitions.RemoveAt(Index)
               Next
-               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               TypeBrd.SetValue(Grid.RowProperty, 12)
-               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
            ElseIf RowNum < 2 Then
               ' costruiso una riga in più da inserire
               Dim Row As New RowDefinition
               TypeGrd.RowDefinitions.Add(Row)
-               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               TypeBrd.SetValue(Grid.RowProperty, 12)
-               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
            End If
+            LeadInTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 0)
+            LeadInTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+            LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+            TypeBrd.SetValue(Grid.RowProperty, 12)
+            TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+
            LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
            LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
            ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1779,7 +1778,7 @@ Public Class MachiningDbPageUC
            StepTypeTxBl.Visibility = Windows.Visibility.Hidden
            StepTypeCmBx.Visibility = Windows.Visibility.Hidden
            SideBrd.SetValue(Grid.RowProperty, 9)
-            SideBrd.Visibility = Windows.Visibility.Visible
+            SideBrd.Visibility = Windows.Visibility.Hidden
            WorkSideTxBl.Visibility = Windows.Visibility.Hidden
            WorkSideCmBx.Visibility = Windows.Visibility.Hidden
            HeadSideTxBl.Visibility = Windows.Visibility.Hidden
@@ -1791,15 +1790,22 @@ Public Class MachiningDbPageUC
               For Index As Integer = RowNum - 1 To 2 Step -1
                  TypeGrd.RowDefinitions.RemoveAt(Index)
               Next
-               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               TypeBrd.SetValue(Grid.RowProperty, 12)
-               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+            ElseIf RowNum < 2 Then
+               ' costruiso una riga in più da inserire
+               Dim Row As New RowDefinition
+               TypeGrd.RowDefinitions.Add(Row)
            End If
+            LeadInTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 0)
+            LeadInTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+            LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+            TypeBrd.SetValue(Grid.RowProperty, 12)
+            TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+
            LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
            LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
            ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -2285,7 +2291,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
@@ -2369,7 +2375,6 @@ Public Class MachiningDbPageUC
         Case MCH_MY.POCKETING
            LeadInTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
                                          {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
-                                           New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48)),
                                           New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(MSG_COMBOBOXPARAM + 38)),
                                           New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(MSG_COMBOBOXPARAM + 49))})
            LeadOutTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
@@ -158,6 +158,9 @@
                                <ColumnDefinition Width="2*"/>
                                <ColumnDefinition Width="2*"/>
                                <ColumnDefinition Width="2*"/>
+                                <ColumnDefinition Width="2*"/>
+                                <ColumnDefinition Width="2*"/>
+                                
                            </Grid.ColumnDefinitions>
                            <Grid.RowDefinitions>
                                <RowDefinition Height="0.5*"/>
@@ -165,10 +168,12 @@
                                <RowDefinition Height="1*"/>
                                <RowDefinition Height="1*"/>
                                <RowDefinition Height="1*"/>
+                                <RowDefinition Height="1*"/>
                                <RowDefinition Height="0.5*"/>

                            </Grid.RowDefinitions>

+                    <!--Decrizione immagini-->        
                    <Border Grid.Row="1" Grid.Column="1" Margin="10">
                        <Image Source="../Resources/Contour.png" Stretch="Uniform"/>
                    </Border>
@@ -178,24 +183,45 @@
                    <Border Grid.Row="3" Grid.Column="1" Margin="10">
                        <Image Source="../Resources/ZigZagY.png" Stretch="Uniform"/>
                    </Border>
+                    <Border Grid.Row="4" Grid.Column="1" Margin="10">
+                        <Image Source="../Resources/Spiral.png" Stretch="Uniform"/>
+                    </Border>

-                    <TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="RepeatTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="OffSetTxBl" Grid.Row="0" Grid.Column="4" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
+                            <!--Titolazione colonne-->
+                    <TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="RepeatTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="OffSetTxBl" Grid.Row="0" Grid.Column="4" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="RadiusTxBl" Grid.Row="0" Grid.Column="5" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="DistanceTxBl" Grid.Row="0" Grid.Column="6" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>

-                    <EgtWPFLib:EgtTextBox Name="ContourTxBx" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffContourTxBx" Grid.Row="1" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                    <!--Contornatura-->
+                    <EgtWPFLib:EgtTextBox Name="ContourTxBx" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="OffContourTxBx" Grid.Row="1" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                            
-                    <EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
-                    <EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffZigZagXTxBx" Grid.Row="2" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
-
-                    <EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
-                    <EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffZigZagYTxBx" Grid.Row="3" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                    <!--Cammino orizzontale X-->
+                    <EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="OffZigZagXTxBx" Grid.Row="2" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="RadiusXTxBx" Grid.Row="2" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
+                    <EgtWPFLib:EgtTextBox Name="DistanceXTxBx" Grid.Row="2" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
                            
-                    <GroupBox Name="LiLoGpBx" Grid.Row="4" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_GroupBox}">
+                    <!--Cammino verticale Y-->
+                    <EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="OffZigZagYTxBx" Grid.Row="3" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="RadiusYTxBx" Grid.Row="3" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
+                    <EgtWPFLib:EgtTextBox Name="DistanceYTxBx" Grid.Row="3" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
+                            
+                    <!--Cammino a spirale-->
+                    <EgtWPFLib:EgtTextBox Name="SpiralTxBx" Grid.Row="4" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="StepSpiralTxBx" Grid.Row="4" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="OffSpiralTxBx" Grid.Row="4" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="RadiusSpiralTxBx" Grid.Row="4" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="DistanceSpiralTxBx" Grid.Row="4" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+
+                            <!--Parametri di lavoro condivisi-->
+                    <GroupBox Name="LiLoGpBx" Grid.Row="5" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="5" Style="{DynamicResource OmagCut_GroupBox}">
                        <Grid Name="LiLoGrd">
                            <Grid.ColumnDefinitions>
                                <ColumnDefinition Width="2*"/>
@@ -212,11 +238,11 @@
                           </Grid.RowDefinitions>

                            <TextBlock Name="LiLenTxBl" Grid.Row="1" Grid.Column="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="LiLenTxBx" Grid.Row="1" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                            <EgtWPFLib:EgtTextBox Name="LiLenTxBx" Grid.Row="1" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                            <TextBlock Name="LiHeightTxBl" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="LiHeightTxBx" Grid.Row="1" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                            <EgtWPFLib:EgtTextBox Name="LiHeightTxBx" Grid.Row="1" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                            <TextBlock Name="LiLoadTxBl" Grid.Row="3" Grid.Column="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="LiLoadTxBx" Grid.Row="3" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                            <EgtWPFLib:EgtTextBox Name="LiLoadTxBx" Grid.Row="3" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>

                        </Grid>
                    </GroupBox>
@@ -61,6 +61,8 @@ Public Class PolishingsPageUC
      RepeatTxBl.Text = EgtMsg(91093)             ' Ripetizioni
      StepTxBl.Text = EgtMsg(90787)               ' Passo
      OffSetTxBl.Text = EgtMsg(91089)             ' Offset
+      RadiusTxBl.Text = "Raggio"
+      DistanceTxBl.Text = "Distanza"
      LiLoGpBx.Header = EgtMsg(91094)             ' Attacco/Uscita
      LiLenTxBl.Text = EgtMsg(91097)              ' Lunghezza
      LiHeightTxBl.Text = EgtMsg(91095)           ' Altezza
@@ -452,7 +454,9 @@ Public Class PolishingsPageUC
                  If KitMachItem.m_IsModifiedId OrElse KitMachItem.m_IsModifiedToolUUID OrElse KitMachItem.m_IsModifiedToolName OrElse KitMachItem.m_IsModifiedSelTool OrElse
                     KitMachItem.m_IsModifiedActive OrElse KitMachItem.m_IsModifiedContour OrElse KitMachItem.m_IsModifiedOffCnt OrElse KitMachItem.m_IsModifiedZigZagX OrElse
                     KitMachItem.m_IsModifiedOffZigZagX OrElse KitMachItem.m_IsModifiedZigZagY OrElse KitMachItem.m_IsModifiedStepX OrElse KitMachItem.m_IsModifiedStepY OrElse
-                     KitMachItem.m_IsModifiedOffZigZagY OrElse KitMachItem.m_IsModifiedLiLen OrElse KitMachItem.m_IsModifiedLiHeight OrElse KitMachItem.m_IsModifiedLiLoad Then
+                     KitMachItem.m_IsModifiedOffZigZagY OrElse KitMachItem.m_IsModifiedSpiral OrElse KitMachItem.m_IsModifiedOffSpiral OrElse KitMachItem.m_IsModifiedStepSpiral OrElse
+                     KitMachItem.m_IsModifiedRadiusSpiral OrElse KitMachItem.m_IsModifiedDistanceSpiral OrElse KitMachItem.m_IsModifiedLiLen OrElse KitMachItem.m_IsModifiedLiHeight OrElse
+                     KitMachItem.m_IsModifiedLiLoad Then
                     Return True
                  End If
               Next
@@ -476,10 +480,19 @@ Public Class PolishingsPageUC
            KitMachItem.m_IsModifiedOffCnt = False
            KitMachItem.m_IsModifiedZigZagX = False
            KitMachItem.m_IsModifiedOffZigZagX = False
+            KitMachItem.m_IsModifiedRadiusX = False
+            KitMachItem.m_IsModifiedDistanceX = False
            KitMachItem.m_IsModifiedZigZagY = False
            KitMachItem.m_IsModifiedOffZigZagY = False
+            KitMachItem.m_IsModifiedRadiusY = False
+            KitMachItem.m_IsModifiedDistanceY = False
+            KitMachItem.m_IsModifiedSpiral = False
+            KitMachItem.m_IsModifiedOffSpiral = False
+            KitMachItem.m_IsModifiedRadiusSpiral = False
+            KitMachItem.m_IsModifiedDistanceSpiral = False
            KitMachItem.m_IsModifiedStepX = False
            KitMachItem.m_IsModifiedStepY = False
+            KitMachItem.m_IsModifiedStepSpiral = False
            KitMachItem.m_IsModifiedLiLen = False
            KitMachItem.m_IsModifiedLiHeight = False
            KitMachItem.m_IsModifiedLiLoad = False
@@ -493,20 +506,29 @@ Public Class PolishingsPageUC
      OffContourTxBx.Text = LenToString(kmShow.dOffsetCnt, 3)
      ZigZagXTxBx.Text = kmShow.nZigZagX.ToString()
      OffZigZagXTxBx.Text = LenToString(kmShow.dOffZigZagX, 3)
-      StepXTxBx.Text = LenToString( kmShow.dStepX, 3)
+      StepXTxBx.Text = LenToString(kmShow.dStepX, 3)
+      RadiusXTxBx.Text = LenToString(kmShow.dRadiusX, 3)
+      DistanceXTxBx.Text = LenToString(kmShow.dDistanceX, 3)
      ZigZagYTxBx.Text = kmShow.nZigZagY.ToString()
      OffZigZagYTxBx.Text = LenToString(kmShow.dOffZigZagY, 3)
-      StepYTxBx.Text = LenToString( kmShow.dStepY, 3)
-      LiLenTxBx.Text = LenToString( kmShow.dLiLen, 3)
-      LiHeightTxBx.Text = LenToString( kmShow.dLiHeight, 3)
-      LiLoadTxBx.Text = LenToString( kmShow.dLiLoad, 3)
+      StepYTxBx.Text = LenToString(kmShow.dStepY, 3)
+      RadiusYTxBx.Text = LenToString(kmShow.dRadiusY, 3)
+      DistanceYTxBx.Text = LenToString(kmShow.dDistanceY, 3)
+      SpiralTxBx.Text = kmShow.nSpiral.ToString()
+      StepSpiralTxBx.Text = LenToString(kmShow.dStepSpiral, 3)
+      OffSpiralTxBx.Text = LenToString(kmShow.dOffSpiral, 3)
+      RadiusSpiralTxBx.Text = LenToString(kmShow.dRadiusSpiral, 3)
+      DistanceSpiralTxBx.Text = LenToString(kmShow.dDistanceSpiral, 3)
+      LiLenTxBx.Text = LenToString(kmShow.dLiLen, 3)
+      LiHeightTxBx.Text = LenToString(kmShow.dLiHeight, 3)
+      LiLoadTxBx.Text = LenToString(kmShow.dLiLoad, 3)
   End Sub

   Private Sub KitMachsLstBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles KitMachsLstBx.SelectionChanged
      Dim SelectedKitMach As KitMach = KitMachsLstBx.SelectedItem
      If Not IsNothing(SelectedKitMach) Then
         ' visualizzo i parametri relativi al KitMach selezionato
-         ShowKitMach( SelectedKitMach)
+         ShowKitMach(SelectedKitMach)
      End If
   End Sub

@@ -520,14 +542,16 @@ Public Class PolishingsPageUC
   End Sub

   Private Sub OffContourTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffContourTxBx.EgtClosed
-      Dim nTemp As Integer = 0
+      Dim dTemp As Double = 0
      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         nTemp = OffContourTxBx.Text
-         KitMachsLstBx.SelectedItem.dOffsetCnt = nTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffsetCnt = nTemp
+         StringToLen(OffContourTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dOffsetCnt = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffsetCnt = dTemp
      End If
   End Sub

+#Region "ZigZag X"
+
   Private Sub ZigZagXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ZigZagXTxBx.EgtClosed
      Dim nTemp As Integer = 0
      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
@@ -538,11 +562,11 @@ Public Class PolishingsPageUC
   End Sub

   Private Sub OffZigZagXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffZigZagXTxBx.EgtClosed
-      Dim nTemp As Integer = 0
+      Dim dTemp As Double = 0
      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         nTemp = OffZigZagXTxBx.Text
-         KitMachsLstBx.SelectedItem.dOffZigZagX = nTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagX = nTemp
+         StringToLen(OffZigZagXTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dOffZigZagX = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagX = dTemp
      End If
   End Sub

@@ -555,6 +579,28 @@ Public Class PolishingsPageUC
      End If
   End Sub

+   Private Sub RadiusXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RadiusXTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(RadiusXTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dRadiusX = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dRadiusX = dTemp
+      End If
+   End Sub
+
+   Private Sub DistanceXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DistanceXTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(DistanceXTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dDistanceX = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dDistanceX = dTemp
+      End If
+   End Sub
+
+#End Region  ' ZigZag X
+
+#Region "ZizZag Y"
+
   Private Sub ZigZagYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ZigZagYTxBx.EgtClosed
      Dim nTemp As Integer = 0
      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
@@ -565,11 +611,11 @@ Public Class PolishingsPageUC
   End Sub

   Private Sub OffZigZagYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffZigZagYTxBx.EgtClosed
-      Dim nTemp As Integer = 0
+      Dim dTemp As Double = 0
      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         nTemp = OffZigZagYTxBx.Text
-         KitMachsLstBx.SelectedItem.dOffZigZagY = nTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagY = nTemp
+         StringToLen(OffZigZagYTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dOffZigZagY = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagY = dTemp
      End If
   End Sub

@@ -582,6 +628,75 @@ Public Class PolishingsPageUC
      End If
   End Sub

+   Private Sub RadiusYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RadiusYTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(RadiusYTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dRadiusY = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dRadiusY = dTemp
+      End If
+   End Sub
+
+   Private Sub DistanceYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DistanceYTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(DistanceYTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dDistanceY = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dDistanceY = dTemp
+      End If
+   End Sub
+
+#End Region    ' ZigZagY
+
+#Region "Spirale"
+
+   Private Sub SpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles SpiralTxBx.EgtClosed
+      Dim nTemp As Integer = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         nTemp = SpiralTxBx.Text
+         KitMachsLstBx.SelectedItem.nSpiral = nTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).nSpiral = nTemp
+      End If
+   End Sub
+
+   Private Sub OffSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffSpiralTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(OffSpiralTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dOffSpiral = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffSpiral = dTemp
+      End If
+   End Sub
+
+   Private Sub StepSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles StepSpiralTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(StepSpiralTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dStepSpiral = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dStepSpiral = dTemp
+      End If
+   End Sub
+
+   Private Sub RadiusSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RadiusSpiralTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(RadiusSpiralTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dRadiusSpiral = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dRadiusSpiral = dTemp
+      End If
+   End Sub
+
+   Private Sub DistanceSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DistanceSpiralTxBx.EgtClosed
+      Dim dTemp As Double = 0
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+         StringToLen(DistanceSpiralTxBx.Text, dTemp)
+         KitMachsLstBx.SelectedItem.dDistanceSpiral = dTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dDistanceSpiral = dTemp
+      End If
+   End Sub
+
+#End Region  ' Spirale
+
   Private Sub LiLenTxBx_EgtClosed(sender As Object, e As EventArgs) Handles LiLenTxBx.EgtClosed
      Dim dTemp As Double = 0
      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
@@ -616,11 +731,11 @@ Public Class PolishingsPageUC
   End Sub

   Private Sub ToolCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs)
-      If Not IsNothing( KitMachsLstBx.SelectedItem) Then
+      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).SelTool = KitMachsLstBx.SelectedItem.SelTool
-         If KitMachsLstBx.SelectedItem.SelTool >= 0 then
-            KitMachsLstBx.SelectedItem.sToolName = m_ToolList( KitMachsLstBx.SelectedItem.SelTool)
-            KitMachsLstBx.SelectedItem.sToolUUID = m_ToolUuidList( KitMachsLstBx.SelectedItem.SelTool)
+         If KitMachsLstBx.SelectedItem.SelTool >= 0 Then
+            KitMachsLstBx.SelectedItem.sToolName = m_ToolList(KitMachsLstBx.SelectedItem.SelTool)
+            KitMachsLstBx.SelectedItem.sToolUUID = m_ToolUuidList(KitMachsLstBx.SelectedItem.SelTool)
         Else
            KitMachsLstBx.SelectedItem.sToolName = "---"
            KitMachsLstBx.SelectedItem.sToolUUID = "---"
@@ -630,143 +745,176 @@ Public Class PolishingsPageUC
      End If
   End Sub

-   Private Function ReadKitName( nKitIndex As Integer) As String
+   Private Function ReadKitName(nKitIndex As Integer) As String
      ' Leggo il nome del kit
      Dim sKey As String = K_KIT & nKitIndex.ToString("D2")
      Dim sName As String = ""
-      GetPrivateProfileString( S_HEADER, sKey, "", sName, m_sKitFile)
+      GetPrivateProfileString(S_HEADER, sKey, "", sName, m_sKitFile)
      Return sName
   End Function
-   
-   Private Function ReadKit( nKitIndex As Integer, removeFlag As Boolean, ByRef Kit As Kit) As Boolean
+
+   Private Function ReadKit(nKitIndex As Integer, removeFlag As Boolean, ByRef Kit As Kit) As Boolean
      ' Leggo il nome del kit
-      Dim sName As String = ReadKitName( nKitIndex)
-      If String.IsNullOrWhiteSpace( sName) Then Return False
+      Dim sName As String = ReadKitName(nKitIndex)
+      If String.IsNullOrWhiteSpace(sName) Then Return False
      ' Creo il kit
-      Kit = New Kit( If( removeFlag, nKitIndex - 1, nKitIndex), sName)
+      Kit = New Kit(If(removeFlag, nKitIndex - 1, nKitIndex), sName)
      ' Leggo le sue lavorazioni
      For nkitMachIndex As Integer = 1 To 100
         Dim kmItem As KitMach = Nothing
-         if ReadKitMach( sName, nkitMachIndex, kmItem) Then
-            Kit.AddKitMach( kmItem)
+         If ReadKitMach(sName, nkitMachIndex, kmItem) Then
+            Kit.AddKitMach(kmItem)
         Else
            Exit For
         End If
      Next
      ' Se non sono state trovate lavorazioni, ne aggiungo una standard
      If Kit.KitMachList.Count() = 0 Then
-         Kit.AddKitMach( New KitMach( 1))
+         Kit.AddKitMach(New KitMach(1))
      End If
      Return True
   End Function

-   Private Function ReadKitMach( sKitName As String, nKitMachIndex As Integer, ByRef kmItem As KitMach) As Boolean
+   Private Function ReadKitMach(sKitName As String, nKitMachIndex As Integer, ByRef kmItem As KitMach) As Boolean
      ' Verifico esistenza lavorazione del kit
      Dim sSect As String = S_KIT & "." & sKitName
-      Dim sKeyInd As String = nkitMachIndex.ToString("D2") & "."
+      Dim sKeyInd As String = nKitMachIndex.ToString("D2") & "."
      Dim sName As String = ""
-      If GetPrivateProfileString( sSect, sKeyInd & K_TOOLNAME, "", sName, m_sKitFile) = 0 Then Return False
+      If GetPrivateProfileString(sSect, sKeyInd & K_TOOLNAME, "", sName, m_sKitFile) = 0 Then Return False
      ' Lettura completa
      kmItem = New KitMach
      kmItem.sToolName = sName
-      kmItem.nId = nkitMachIndex
-      GetPrivateProfileString( sSect, sKeyInd & K_TOOL, "", kmItem.sToolUUID, m_sKitFile)
-      kmItem.bActive = ( GetPrivateProfileInt( sSect, sKeyInd & K_ACTIVE, 0, m_sKitFile) = 1)
+      kmItem.nId = nKitMachIndex
+      GetPrivateProfileString(sSect, sKeyInd & K_TOOL, "", kmItem.sToolUUID, m_sKitFile)
+      kmItem.bActive = (GetPrivateProfileInt(sSect, sKeyInd & K_ACTIVE, 0, m_sKitFile) = 1)
      kmItem.nContour = GetPrivateProfileInt(sSect, sKeyInd & K_CONTOUR, 0, m_sKitFile)
-      kmItem.dOffsetCnt = GetPrivateProfileInt(sSect, sKeyInd & K_OFFSETCNT, 0, m_sKitFile)
+      kmItem.dOffsetCnt = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFSETCNT, 0, m_sKitFile)
      kmItem.nZigZagX = GetPrivateProfileInt(sSect, sKeyInd & K_ZIGZAGX, 0, m_sKitFile)
-      kmItem.dOffZigZagX = GetPrivateProfileInt(sSect, sKeyInd & K_OFFZIGZAGX, 0, m_sKitFile)
+      kmItem.dOffZigZagX = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFZIGZAGX, 0, m_sKitFile)
      kmItem.dStepX = GetPrivateProfileDouble(sSect, sKeyInd & K_STEPX, 0, m_sKitFile)
+      kmItem.dRadiusX = GetPrivateProfileDouble(sSect, sKeyInd & K_RADIUSX, 0, m_sKitFile)
+      kmItem.dDistanceX = GetPrivateProfileDouble(sSect, sKeyInd & K_DISTANCEX, 0, m_sKitFile)
      kmItem.nZigZagY = GetPrivateProfileInt(sSect, sKeyInd & K_ZIGZAGY, 0, m_sKitFile)
-      kmItem.dOffZigZagY = GetPrivateProfileInt(sSect, sKeyInd & K_OFFZIGZAGY, 0, m_sKitFile)
-      kmItem.dStepY = GetPrivateProfileDouble( sSect, sKeyInd & K_STEPY, 0, m_sKitFile)
-      kmItem.dLiLen = GetPrivateProfileDouble( sSect, sKeyInd & K_LILEN, 0, m_sKitFile)
-      kmItem.dLiHeight = GetPrivateProfileDouble( sSect, sKeyInd & K_LIHEIGHT, 0, m_sKitFile)
-      kmItem.dLiLoad = GetPrivateProfileDouble( sSect, sKeyInd & K_LILOAD, 0, m_sKitFile)
+      kmItem.dOffZigZagY = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFZIGZAGY, 0, m_sKitFile)
+      kmItem.dStepY = GetPrivateProfileDouble(sSect, sKeyInd & K_STEPY, 0, m_sKitFile)
+      kmItem.dRadiusY = GetPrivateProfileDouble(sSect, sKeyInd & K_RADIUSY, 0, m_sKitFile)
+      kmItem.dDistanceY = GetPrivateProfileDouble(sSect, sKeyInd & K_DISTANCEY, 0, m_sKitFile)
+
+      kmItem.nSpiral = GetPrivateProfileInt(sSect, sKeyInd & K_SPIRAL, 0, m_sKitFile)
+      kmItem.dOffSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFSPIRAL, 0, m_sKitFile)
+      kmItem.dStepSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_STEPSPIRAL, 0, m_sKitFile)
+      kmItem.dRadiusSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_RADIUSSPIRAL, 0, m_sKitFile)
+      kmItem.dDistanceSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_DISTANCESPIRAL, 0, m_sKitFile)
+
+      kmItem.dLiLen = GetPrivateProfileDouble(sSect, sKeyInd & K_LILEN, 0, m_sKitFile)
+      kmItem.dLiHeight = GetPrivateProfileDouble(sSect, sKeyInd & K_LIHEIGHT, 0, m_sKitFile)
+      kmItem.dLiLoad = GetPrivateProfileDouble(sSect, sKeyInd & K_LILOAD, 0, m_sKitFile)
      Return True
   End Function

-   Friend Function WriteKitName( nKitIndex As Integer, sKitName As String) As Boolean
+   Friend Function WriteKitName(nKitIndex As Integer, sKitName As String) As Boolean
      Dim sKey As String = K_KIT & nKitIndex.ToString("D2")
-      Return WritePrivateProfileString( S_HEADER, sKey, sKitName, m_sKitFile)
+      Return WritePrivateProfileString(S_HEADER, sKey, sKitName, m_sKitFile)
   End Function

-   Private Function WriteKitMach( nKitIndex As Integer, nKitMachIndex As Integer, kmItem As KitMach) As Boolean
+   Private Function WriteKitMach(nKitIndex As Integer, nKitMachIndex As Integer, kmItem As KitMach) As Boolean
      ' Leggo il nome del kit
-      Dim sKitName As String = ReadKitName( nKitIndex)
-      If String.IsNullOrWhiteSpace( sKitName) Then Return False
+      Dim sKitName As String = ReadKitName(nKitIndex)
+      If String.IsNullOrWhiteSpace(sKitName) Then Return False
      ' Sezione
      Dim sSect As String = S_KIT & "." & sKitName
      ' Indice
      Dim sKeyInd As String = nKitMachIndex.ToString("D2") & "."
      ' Scrivo i dati della lavorazione
-      If Not IsNothing( kmItem) Then
-         WritePrivateProfileString( sSect, sKeyInd & K_TOOL, kmItem.sToolUUID, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_TOOLNAME, kmItem.sToolName, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_ACTIVE, If( kmItem.bActive, "1", "0"), m_sKitFile)
+      If Not IsNothing(kmItem) Then
+         WritePrivateProfileString(sSect, sKeyInd & K_TOOL, kmItem.sToolUUID, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_TOOLNAME, kmItem.sToolName, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_ACTIVE, If(kmItem.bActive, "1", "0"), m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_CONTOUR, kmItem.nContour.ToString(), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFSETCNT, kmItem.dOffsetCnt.ToString(), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFSETCNT, DoubleToString(kmItem.dOffsetCnt, 3), m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGX, kmItem.nZigZagX.ToString(), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGX, kmItem.dOffZigZagX.ToString(), m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_STEPX, DoubleToString( kmItem.dStepX, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGX, DoubleToString(kmItem.dOffZigZagX.ToString, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_STEPX, DoubleToString(kmItem.dStepX, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSX, DoubleToString(kmItem.dRadiusX, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEX, DoubleToString(kmItem.dDistanceX, 3), m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGY, kmItem.nZigZagY.ToString(), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGY, kmItem.dOffZigZagY.ToString(), m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_STEPY, DoubleToString( kmItem.dStepY, 3), m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_LILEN, DoubleToString( kmItem.dLiLen, 3), m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_LIHEIGHT, DoubleToString( kmItem.dLiHeight, 3), m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_LILOAD, DoubleToString( kmItem.dLiLoad, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGY, DoubleToString(kmItem.dOffZigZagY, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_STEPY, DoubleToString(kmItem.dStepY, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSY, DoubleToString(kmItem.dRadiusY, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEY, DoubleToString(kmItem.dDistanceY, 3), m_sKitFile)
+
+         WritePrivateProfileString(sSect, sKeyInd & K_SPIRAL, kmItem.nSpiral.ToString(), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFSPIRAL, DoubleToString(kmItem.dOffSpiral.ToString, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_STEPSPIRAL, DoubleToString(kmItem.dStepSpiral, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSSPIRAL, DoubleToString(kmItem.dRadiusSpiral, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCESPIRAL, DoubleToString(kmItem.dDistanceSpiral, 3), m_sKitFile)
+
+         WritePrivateProfileString(sSect, sKeyInd & K_LILEN, DoubleToString(kmItem.dLiLen, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_LIHEIGHT, DoubleToString(kmItem.dLiHeight, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_LILOAD, DoubleToString(kmItem.dLiLoad, 3), m_sKitFile)
      Else
-         WritePrivateProfileString( sSect, sKeyInd & K_TOOL, Nothing, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_TOOLNAME, Nothing, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_ACTIVE, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_TOOL, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_TOOLNAME, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_ACTIVE, Nothing, m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_CONTOUR, Nothing, m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_OFFSETCNT, Nothing, m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGX, Nothing, m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGX, Nothing, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_STEPX, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_STEPX, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSX, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEX, Nothing, m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGY, Nothing, m_sKitFile)
         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGY, Nothing, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_STEPY, Nothing, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_LILEN, Nothing, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_LIHEIGHT, Nothing, m_sKitFile)
-         WritePrivateProfileString( sSect, sKeyInd & K_LILOAD, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_STEPY, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSY, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEY, Nothing, m_sKitFile)
+
+         WritePrivateProfileString(sSect, sKeyInd & K_SPIRAL, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFSPIRAL, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_STEPSPIRAL, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSSPIRAL, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCESPIRAL, Nothing, m_sKitFile)
+
+         WritePrivateProfileString(sSect, sKeyInd & K_LILEN, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_LIHEIGHT, Nothing, m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_LILOAD, Nothing, m_sKitFile)
      End If
      Return True
   End Function

-   Private Function EraseKit( nKitIndex As Integer) As Boolean
+   Private Function EraseKit(nKitIndex As Integer) As Boolean
      ' Leggo il nome del kit
-      Dim sKitName As String = ReadKitName( nKitIndex)
-      If String.IsNullOrWhiteSpace( sKitName) Then Return False
+      Dim sKitName As String = ReadKitName(nKitIndex)
+      If String.IsNullOrWhiteSpace(sKitName) Then Return False
      ' Lo elimino dalla lista dei kit scalando tutti di una posizione e eliminando l'ultimo
      Dim nNextKitIndex As Integer = nKitIndex + 1
-      Dim sNextKitName As String = ReadKitName( nNextKitIndex) 
-      while Not String.IsNullOrWhiteSpace( sNextKitName)
-         WriteKitName( nNextKitIndex - 1, sNextKitName)
+      Dim sNextKitName As String = ReadKitName(nNextKitIndex)
+      While Not String.IsNullOrWhiteSpace(sNextKitName)
+         WriteKitName(nNextKitIndex - 1, sNextKitName)
         nNextKitIndex += 1
-         sNextKitName = ReadKitName( nNextKitIndex) 
+         sNextKitName = ReadKitName(nNextKitIndex)
      End While
-      WriteKitName( nNextKitIndex - 1, Nothing)
+      WriteKitName(nNextKitIndex - 1, Nothing)
      ' Sezione
      Dim sSect As String = S_KIT & "." & sKitName
      ' Cancello tutte le lavorazioni del kit
-      WritePrivateProfileString( sSect, Nothing, Nothing, m_sKitFile)
+      WritePrivateProfileString(sSect, Nothing, Nothing, m_sKitFile)
      Return True
   End Function

-   Private Function EraseKitMach( nKitIndex As Integer, nKitMachIndex As Integer) As Boolean
+   Private Function EraseKitMach(nKitIndex As Integer, nKitMachIndex As Integer) As Boolean
      ' Leggo il nome del kit
-      Dim sKitName As String = ReadKitName( nKitIndex)
-      If String.IsNullOrWhiteSpace( sKitName) Then Return False
+      Dim sKitName As String = ReadKitName(nKitIndex)
+      If String.IsNullOrWhiteSpace(sKitName) Then Return False
      ' Lo elimino dali KitMach scalando tutti di una posizione e eliminando l'ultimo
      Dim kmCurr As KitMach = Nothing
      Dim nNextKitMachIndex As Integer = nKitMachIndex + 1
-      While ReadKitMach( sKitName, nNextKitMachIndex, kmCurr)
+      While ReadKitMach(sKitName, nNextKitMachIndex, kmCurr)
         kmCurr.nId = nNextKitMachIndex - 1
-         WriteKitMach( nKitIndex, nNextKitMachIndex - 1, kmCurr)
+         WriteKitMach(nKitIndex, nNextKitMachIndex - 1, kmCurr)
         nNextKitMachIndex += 1
      End While
-      WriteKitMach( nKitIndex, nNextKitMachIndex - 1, Nothing)
+      WriteKitMach(nKitIndex, nNextKitMachIndex - 1, Nothing)
      Return True
   End Function

@@ -804,7 +952,7 @@ Class Kit
      Get
         Return m_nId
      End Get
-      Set( value As Integer) 
+      Set(value As Integer)
         m_nId = value
      End Set
   End Property
@@ -824,7 +972,7 @@ Class Kit
      End Set
   End Property

-   Sub New( nId As Integer, sName As String)
+   Sub New(nId As Integer, sName As String)
      m_nId = nId
      m_sName = sName

@@ -832,21 +980,21 @@ Class Kit

   End Sub

-   Sub New( nId As Integer, sName As String, kitSou As Kit)
+   Sub New(nId As Integer, sName As String, kitSou As Kit)
      m_nId = nId
      m_sName = sName

      m_KitMachList = New List(Of KitMach)

-      If IsNothing( kitSou) Then Return
+      If IsNothing(kitSou) Then Return

      For Each kmItem As KitMach In kitSou.m_KitMachList
-         AddKitMach( kmItem)
+         AddKitMach(kmItem)
      Next

   End Sub

-   Sub AddKitMach( kitMachItem As KitMach)
+   Sub AddKitMach(kitMachItem As KitMach)
      m_KitMachList.Add(kitMachItem)
   End Sub

@@ -862,15 +1010,29 @@ Class KitMach
   Private m_sToolName As String
   Private m_SelTool As Integer
   Friend Shared m_ToolList As List(Of String)
+
   Private m_bActive As Boolean
   Private m_nContour As Integer
   Private m_dOffsetCnt As Double
+
   Private m_nZigZagX As Integer
   Private m_dStepX As Double
   Private m_dOffZigZagX As Double
+   Private m_dRadiusX As Double
+   Private m_dDistanceX As Double
+
   Private m_nZigZagY As Integer
   Private m_dStepY As Double
   Private m_dOffZigZagY As Double
+   Private m_dRadiusY As Double
+   Private m_dDistanceY As Double
+
+   Private m_nSpiral As Integer
+   Private m_dOffSpiral As Double
+   Private m_dStepSpiral As Double
+   Private m_dRadiusSpiral As Double
+   Private m_dDistanceSpiral As Double
+
   Private m_dLiLen As Double
   Private m_dLiHeight As Double
   Private m_dLiLoad As Double
@@ -958,6 +1120,8 @@ Class KitMach
      End Set
   End Property

+#Region "Contorno"
+
   Public m_IsModifiedActive As Boolean = False
   Public Property bActive As Boolean
      Get
@@ -985,11 +1149,11 @@ Class KitMach
   End Property

   Public m_IsModifiedOffCnt As Boolean = False
-   Public Property dOffsetCnt As Integer
+   Public Property dOffsetCnt As Double
      Get
         Return m_dOffsetCnt
      End Get
-      Set(value As Integer)
+      Set(value As Double)
         If value <> m_dOffsetCnt Then
            m_dOffsetCnt = value
            m_IsModifiedOffCnt = True
@@ -997,6 +1161,10 @@ Class KitMach
      End Set
   End Property

+#End Region    ' Contorno
+
+#Region "ZigZag X"
+
   Public m_IsModifiedZigZagX As Boolean = False
   Public Property nZigZagX As Integer
      Get
@@ -1011,11 +1179,11 @@ Class KitMach
   End Property

   Public m_IsModifiedOffZigZagX As Boolean = False
-   Public Property dOffZigZagX As Integer
+   Public Property dOffZigZagX As Double
      Get
         Return m_dOffZigZagX
      End Get
-      Set(value As Integer)
+      Set(value As Double)
         If value <> m_dOffZigZagX Then
            m_dOffZigZagX = value
            m_IsModifiedOffZigZagX = True
@@ -1036,6 +1204,36 @@ Class KitMach
      End Set
   End Property

+   Public m_IsModifiedRadiusX As Boolean = False
+   Public Property dRadiusX As Double
+      Get
+         Return m_dRadiusX
+      End Get
+      Set(value As Double)
+         If value <> m_dRadiusX Then
+            m_dRadiusX = value
+            m_IsModifiedRadiusX = True
+         End If
+      End Set
+   End Property
+
+   Public m_IsModifiedDistanceX As Boolean = False
+   Public Property dDistanceX As Double
+      Get
+         Return m_dDistanceX
+      End Get
+      Set(value As Double)
+         If value <> m_dDistanceX Then
+            m_dDistanceX = value
+            m_IsModifiedDistanceX = True
+         End If
+      End Set
+   End Property
+
+#End Region    ' ZigZag X
+
+#Region "ZigZag Y"
+
   Public m_IsModifiedZigZagY As Boolean = False
   Public Property nZigZagY As Integer
      Get
@@ -1050,11 +1248,11 @@ Class KitMach
   End Property

   Public m_IsModifiedOffZigZagY As Boolean = False
-   Public Property dOffZigZagY As Integer
+   Public Property dOffZigZagY As Double
      Get
         Return m_dOffZigZagY
      End Get
-      Set(value As Integer)
+      Set(value As Double)
         If value <> m_dOffZigZagY Then
            m_dOffZigZagY = value
            m_IsModifiedOffZigZagY = True
@@ -1075,6 +1273,105 @@ Class KitMach
      End Set
   End Property

+   Public m_IsModifiedRadiusY As Boolean = False
+   Public Property dRadiusY As Double
+      Get
+         Return m_dRadiusY
+      End Get
+      Set(value As Double)
+         If value <> m_dRadiusY Then
+            m_dRadiusY = value
+            m_IsModifiedRadiusY = True
+         End If
+      End Set
+   End Property
+
+   Public m_IsModifiedDistanceY As Boolean = False
+   Public Property dDistanceY As Double
+      Get
+         Return m_dDistanceY
+      End Get
+      Set(value As Double)
+         If value <> m_dDistanceY Then
+            m_dDistanceY = value
+            m_IsModifiedDistanceY = True
+         End If
+      End Set
+   End Property
+
+#End Region    ' ZigZag Y
+
+#Region "Spirale"
+
+   Public m_IsModifiedSpiral As Boolean = False
+   Public Property nSpiral As Integer
+      Get
+         Return m_nSpiral
+      End Get
+      Set(value As Integer)
+         If value <> m_nSpiral Then
+            m_nSpiral = value
+            m_IsModifiedSpiral = True
+         End If
+      End Set
+   End Property
+
+   Public m_IsModifiedOffSpiral As Boolean = False
+   Public Property dOffSpiral As Double
+      Get
+         Return m_dOffSpiral
+      End Get
+      Set(value As Double)
+         If value <> m_dOffSpiral Then
+            m_dOffSpiral = value
+            m_IsModifiedOffSpiral = True
+         End If
+      End Set
+   End Property
+
+   Public m_IsModifiedStepSpiral As Boolean = False
+   Public Property dStepSpiral As Double
+      Get
+         Return m_dStepSpiral
+      End Get
+      Set(value As Double)
+         If value <> m_dStepSpiral Then
+            m_dStepSpiral = value
+            m_IsModifiedStepSpiral = True
+         End If
+      End Set
+   End Property
+
+   Public m_IsModifiedRadiusSpiral As Boolean = False
+   Public Property dRadiusSpiral As Double
+      Get
+         Return m_dRadiusSpiral
+      End Get
+      Set(value As Double)
+         If value <> m_dRadiusSpiral Then
+            m_dRadiusSpiral = value
+            m_IsModifiedRadiusSpiral = True
+         End If
+      End Set
+   End Property
+
+   Public m_IsModifiedDistanceSpiral As Boolean = False
+   Public Property dDistanceSpiral As Double
+      Get
+         Return m_dDistanceSpiral
+      End Get
+      Set(value As Double)
+         If value <> m_dDistanceSpiral Then
+            m_dDistanceSpiral = value
+            m_IsModifiedDistanceSpiral = True
+         End If
+      End Set
+   End Property
+
+#End Region    ' Spirale
+
+#Region "Parametri lavorazione"
+
   Public m_IsModifiedLiLen As Boolean = False
   Public Property dLiLen As Double
      Get
@@ -1114,6 +1411,8 @@ Class KitMach
      End Set
   End Property

+#End Region    ' Parametri lavorazione
+
   Sub New()
      m_nId = 0
      m_SelTool = 0
@@ -1125,15 +1424,24 @@ Class KitMach
      m_nZigZagX = 0
      m_dOffZigZagX = 0
      m_dStepX = 0
+      m_dRadiusX = 0
+      m_dDistanceX = 0
      m_nZigZagY = 0
      m_dOffZigZagY = 0
      m_dStepY = 0
+      m_dRadiusY = 0
+      m_dDistanceY = 0
+      m_nSpiral = 0
+      m_dOffSpiral = 0
+      m_dStepSpiral = 0
+      m_dRadiusSpiral = 0
+      m_dDistanceSpiral = 0
      m_dLiLen = 0
      m_dLiHeight = 0
      m_dLiLoad = 0
   End Sub

-   Sub New( nId As Integer)
+   Sub New(nId As Integer)
      m_nId = nId
      m_SelTool = 0
      m_sToolUUID = "---"
@@ -1144,17 +1452,26 @@ Class KitMach
      m_nZigZagX = 0
      m_dOffZigZagX = 0
      m_dStepX = 0
+      m_dRadiusX = 0
+      m_dDistanceX = 0
      m_nZigZagY = 0
      m_dOffZigZagY = 0
      m_dStepY = 0
+      m_dRadiusY = 0
+      m_dDistanceY = 0
+      m_nSpiral = 0
+      m_dOffSpiral = 0
+      m_dStepSpiral = 0
+      m_dRadiusSpiral = 0
+      m_dDistanceSpiral = 0
      m_dLiLen = 0
      m_dLiHeight = 0
      m_dLiLoad = 0
   End Sub

-   Sub New( kmSou As KitMach) 
+   Sub New(kmSou As KitMach)
      m_nId = kmSou.nId
-      m_SelTool = kmSou.selTool
+      m_SelTool = kmSou.SelTool
      m_sToolUUID = kmSou.sToolUUID
      m_sToolName = kmSou.sToolName
      m_bActive = kmSou.bActive
@@ -1163,9 +1480,18 @@ Class KitMach
      m_nZigZagX = kmSou.nZigZagX
      m_dOffZigZagX = kmSou.dOffZigZagX
      m_dStepX = kmSou.dStepX
+      m_dRadiusX = kmSou.dRadiusX
+      m_dDistanceX = kmSou.dDistanceX
      m_nZigZagY = kmSou.nZigZagY
      m_dOffZigZagY = kmSou.dOffZigZagY
      m_dStepY = kmSou.dStepY
+      m_dRadiusY = kmSou.dRadiusY
+      m_dDistanceY = kmSou.dDistanceY
+      m_nSpiral = kmSou.nSpiral
+      m_dOffSpiral = kmSou.dOffSpiral
+      m_dStepSpiral = kmSou.dStepSpiral
+      m_dRadiusSpiral = kmSou.dRadiusSpiral
+      m_dDistanceSpiral = kmSou.dDistanceSpiral
      m_dLiLen = kmSou.dLiLen
      m_dLiHeight = kmSou.dLiHeight
      m_dLiLoad = kmSou.m_dLiLoad
@@ -323,8 +323,8 @@ Class MainWindow
      ' Verifico abilitazione nesting automatico
      m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
      ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2312, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2312, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2402, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2402, 1, m_nKeyOptions)
      ' Verifico abilitazione prodotto
      Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
      ' Inizializzazione generale di EgtInterface
@@ -1139,7 +1139,8 @@ Class MainWindow
      Dim nPrjType As Integer = m_CurrentProjectPageUC.GetCurrentProjectType()
      ' Aggiorno interfaccia
      CadCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FRAMES)
-      FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS)
+      FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS) AndAlso (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      ' DirectCutBtn.IsEnabled = (EgtGetHeadId("H1") <> GDB_ID.NULL)
   End Sub

   ' Nomi dei file per OmagVIEW
@@ -1884,8 +1885,9 @@ Class MainWindow
      ' deseleziono gli oggetti e spengo il bottone
      EgtDeselectObj(m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
      EgtDeselectObj(m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
+      EgtResetMark(m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
      m_CadCutPageUC.m_ProjectMgr.TestBtn.IsChecked = False
-      m_CurrentProjectPageUC.m_bSelectCurv = False
+      Me.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
   End Sub

 End Class
@@ -22,7 +22,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("EgalTech s.r.l.")>
 <Assembly: AssemblyProduct("OmagCUT")>
-<Assembly: AssemblyCopyright("Copyright ©  2015-2021 by EgalTech s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2015-2022 by EgalTech s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(False)>

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

-<Assembly: AssemblyVersion("2.3.12.1")>
-<Assembly: AssemblyFileVersion("2.3.12.1")>
+<Assembly: AssemblyVersion("2.4.2.2")>
+<Assembly: AssemblyFileVersion("2.4.2.2")>
@@ -281,6 +281,14 @@ Public Class CNCommunication
         m_CN.SetCnDataVar(CN_generico.CnData.LimitZ, sVal)
         GetPrivateProfileString(S_NCDATA, K_POWEROVR, "", sVal, m_MainWindow.GetMachIniFile())
         m_CN.SetCnDataVar(CN_generico.CnData.PowerOvr, sVal)
+
+         GetPrivateProfileString(S_NCDATA, K_PARKING, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.Parking, sVal)
+         GetPrivateProfileString(S_NCDATA, K_ENABLEZONE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.EnableZone, sVal)
+         GetPrivateProfileString(S_NCDATA, K_ENABLEPC, "", sVal, m_MainWindow.GetMachIniFile())
+         m_CN.SetCnDataVar(CN_generico.CnData.EnablePC, sVal)
+
         GetPrivateProfileString(S_NCDATA, K_VACUUMUP, "", sVal, m_MainWindow.GetMachIniFile())
         m_CN.SetCnDataVar(CN_generico.CnData.VacuumUp, sVal)
         GetPrivateProfileString(S_NCDATA, K_VACUUMDOWN, "", sVal, m_MainWindow.GetMachIniFile())
@@ -539,6 +547,8 @@ Public Class CNCommunication
            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.DoorClosedChanged(m_CN.nDoorClosedState)
            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.LimitZChanged(m_CN.bLimitZState)
            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.FiveAxisStateChanged(m_CN.Is_G24_active())
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ParkingStateChanged(m_CN.bParkingState)
+            'm_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ZoneStateChanged(m_CN.nEnableZone)
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumUpChanged(m_CN.bVacuumUp)
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumDownChanged(m_CN.bVacuumDown)
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum2UpChanged(m_CN.bVacuum2Up)
@@ -583,7 +593,10 @@ Public Class CNCommunication
               m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ThreeAxisStateChanged(True)
               m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(False)
            End If
-            m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)

            ' Nuovi bottoni (uso joystick) per Area4
            If m_IsNewConsole Then
@@ -619,6 +632,9 @@ Public Class CNCommunication
            m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.FiveAxisStateChanged(False)
         End If
         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
      End If

   End Sub
@@ -8,7 +8,7 @@ Public MustInherit Class CN_generico
   Public Const MAX_VAR As Short = 100
   Public Const MAX_VALUES As Short = 9           ' Max. index to read the data from the FXServer array
   Public Const MAX_TOOLS As Short = 100
-   Public Const NUM_DATA = 52                     ' Numero di dati del CN (Speed,Feed,...)
+   Public Const NUM_DATA = 55                     ' Numero di dati del CN (Speed,Feed,...)

   Public m_NewVariable As Boolean = False        ' per scrittura delle vairbaili Apllication del PLC

@@ -66,6 +66,10 @@ Public MustInherit Class CN_generico
      ZBJog = 49
      PowerON = 50
      Remote = 51
+
+      Parking = 52
+      EnableZone = 53
+      EnablePC = 54
   End Enum

 #End Region
@@ -173,6 +177,9 @@ Public MustInherit Class CN_generico
   Public nDoorClosedState As Integer
   Public bLimitZState As Boolean
   Public bPowerOvr As Double
+   Public bParkingState As Boolean
+   Public nEnableZone As Integer
+   Public nEnablePc As Integer
   Public bHsm As Double
   Public bVacuumUp As Boolean
   Public bVacuumDown As Boolean
@@ -1077,17 +1077,24 @@ Namespace Num
               Case CnData.VacuumOff     ' (45) Stato aspirazione ventose spento
                  bVacuumOff = CBool(values(n))

-               Case CnData.XYJog     ' (46) 
+               Case CnData.XYJog     ' (47) 
                  bXYJog = CBool(values(n))
-               Case CnData.ZCJog     ' (47)
+               Case CnData.ZCJog     ' (48)
                  bZCJog = CBool(values(n))
-               Case CnData.ZBJog     ' (48)
+               Case CnData.ZBJog     ' (49)
                  bZBCJog = CBool(values(n))
-               Case CnData.PowerON     ' (49)
+               Case CnData.PowerON     ' (50)
                  bPowerON = CBool(values(n))
-               Case CnData.Remote     ' (50)
+               Case CnData.Remote     ' (51)
                  bRemote = CBool(values(n))

+               Case CnData.Parking     ' (52)
+                  bParkingState = CBool(values(n))
+               Case CnData.EnableZone     ' (53)
+                  nEnableZone = CInt(values(n))
+               Case CnData.EnablePC     ' (54)
+                  nEnablePc = CInt(values(n))
+
            End Select
         Next

@@ -1238,6 +1238,9 @@
  <ItemGroup>
    <Resource Include="Resources\NewIcons\Acquisisci-P.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Spiral.png" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe
@@ -1209,6 +1209,14 @@
        <Setter Property="Width" Value="80"/>
        <Setter Property="Keyboard" Value="Calculator"/>
        <Setter Property="KeyboardDimension" Value="300"/>
+        <Setter Property="IsHitTestVisible" Value="False" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, 
+                                                                                      AncestorType={x:Type ListBoxItem}, AncestorLevel=1}}"
+                         Value="True">
+                <Setter Property="IsHitTestVisible" Value="True" />
+            </DataTrigger>
+        </Style.Triggers>
    </Style>

    <Style x:Key="OmagCut_MachToolCalculatorTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
@@ -18,7 +18,7 @@ Class CicloStartWD
      Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
      Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
      ' imopposto il messaggio di avvio
-      CicloStartTxbl.Text = "Avvio Ciclo-Start"
+      CicloStartTxbl.Text = EgtMsg(91130)   ' Esegui programma?
   End Sub

   ' creo un progetto nuovo
@@ -6,7 +6,6 @@ Imports EgtWPFLib5

 Public Class CurrentProjectPageUC
   ' Dichiarazione eventi
-   Friend Event OnMouseDownSceneSelCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs)
   Friend Event OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
   Friend Event OnMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
   Friend Event OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
@@ -24,8 +23,8 @@ Public Class CurrentProjectPageUC
   ' Dati del grezzo
   Friend m_nRawId As Integer = GDB_ID.NULL
   Friend m_dRawHeight As Double
-   ' pagina impostata per selezionare una lavorazione
-   Friend m_bSelectCurv As Boolean = False
+   '' Flag per impostata per selezionare di una curva
+   'Friend m_bSelectCurv As Boolean = False
   ' Costanti tipo progetto
   Friend Enum PRJ_TYPE As Integer
      EMPTY = 0
@@ -328,12 +327,7 @@ Public Class CurrentProjectPageUC
   End Sub

   Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles CurrentProjectScene.OnMouseDownScene
-      If m_bSelectCurv Then
-         RaiseEvent OnMouseDownSceneSelCurv(sender, e)
-      Else
-         RaiseEvent OnMouseDownScene(sender, e)
-      End If
-
+      RaiseEvent OnMouseDownScene(sender, e)
   End Sub

   Private Sub OnMyMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles CurrentProjectScene.OnMouseMoveScene
@@ -622,6 +616,8 @@ Public Class CurrentProjectPageUC
               File.Copy(sPhoto, sNewPhoto, True)
            Catch ex As FileNotFoundException
               ' non è un problema
+            Catch ex As DirectoryNotFoundException
+               ' non è un problema
            Catch ex As Exception
               Return False
            End Try
@@ -276,7 +276,7 @@ Public Class ProjectMgrUC
      m_CurrProjPage.SetWarningMessage("Trial Version")
 #Else
      ' se sono in modalità Test allora eseguo solo il posizionamento della lama
-      If m_CurrProjPage.m_bSelectCurv Then
+      If m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv Then
         ' Verifico non sia versione Ufficio
         If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
            m_CurrProjPage.SetWarningMessage("Office Version")
@@ -336,7 +336,7 @@ Public Class ProjectMgrUC
         ' verifica assi lineari
         EgtVerifyOutstroke(dX, dY, dZ, dC1, dB1, nStat)
         If nStat <> 0 Then
-            vtDirT = - vtDirT
+            vtDirT = -vtDirT
            ptMid -= vtDirT * dThick
            EgtGetCalcAngles(vtDirT, Vector3d.Z_AX(), nStat, dC1, dB1, dC2, dB2)
            ' calcolo la posizione degli assi lineari X, Y, Z ( correggere il punto ptMid.z sommando il raggio utensile)
@@ -736,11 +736,11 @@ Public Class ProjectMgrUC

   Private Sub TestBtn_Click(sender As Object, e As RoutedEventArgs) Handles TestBtn.Click
      If TestBtn.IsChecked Then
-         m_CurrProjPage.m_bSelectCurv = True
+         m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = True
         ' deseleziono tutto
         EgtDeselectAll()
      Else
-         m_CurrProjPage.m_bSelectCurv = False
+         m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
         EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
         EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
      End If
@@ -287,7 +287,6 @@ Public Class Camera
   Public Function CameraClick() As Boolean
      ' Verifiche preliminari
      Dim nInd As Integer = PrepareCamera()
-      If nInd = 0 Then Return False
      ' Visualizzo progressbar
      m_bBusy = True
      m_MainWindow.m_CurrentProjectPageUC.PhotoProgress.Visibility = Visibility.Visible
@@ -308,6 +307,30 @@ Public Class Camera
         End If
      Catch ex As Exception
      End Try
+
+      ' ------------------------------------ accensione riflettori ------------------------------------
+      Dim sPLCVarSpotLight1 As String = String.Empty
+      GetPrivateProfileString(S_NCDATA, K_SPOTLIGHT1, "", sPLCVarSpotLight1, m_MainWindow.GetMachIniFile())
+      Dim sPLCVarSpotLight2 As String = String.Empty
+      GetPrivateProfileString(S_NCDATA, K_SPOTLIGHT2, "", sPLCVarSpotLight2, m_MainWindow.GetMachIniFile())
+      Dim nPhotoDeley As Integer = GetPrivateProfileInt(S_NCNUM, K_PHOTODELEY, "100", m_MainWindow.GetMachIniFile())
+
+      Select Case m_MainWindow.m_CNCommunication.m_nNCType
+         Case 1, 2
+            If m_MainWindow.m_CNCommunication.m_nNCType = 2 Then
+               ' solo per Flexium
+               m_MainWindow.m_CNCommunication.m_CN.DPlcVariables_WriteVariables(If(nInd <> 2, sPLCVarSpotLight1, sPLCVarSpotLight2), "1")
+               ' altrimenti scrittura delle variabili E
+            Else
+               m_MainWindow.m_CNCommunication.m_CN.DVariables_WriteVariables2(If(nInd <> 2, sPLCVarSpotLight1, sPLCVarSpotLight2), "1")
+            End If
+            System.Threading.Thread.Sleep(nPhotoDeley)
+         Case 3
+            ' SIEMENS
+      End Select
+
+      ' ------------------------------------ accensione riflettori ------------------------------------
+
      ' Scatto una foto con eventuale riconoscimento del contorno (il programma deve essere già attivo)
      Dim bOk As Boolean = False
      Dim sArgs As String = "2 0"
@@ -60,6 +60,12 @@ Public Class ChooseMachining

   Private Sub InitializeMachiningLists()

+      ' in assenza dell'uscita H1 nascondo i parametri lama
+      If EgtGetHeadId("H1") = GDB_ID.NULL Then
+         CurrSawingTxBl.Visibility = Visibility.Hidden
+         CurrSawingCmBx.Visibility = Visibility.Hidden
+      End If
+
      ' -- TAGLIO --
      CreateMachiningList(MCH_MY.SAWING, m_CurrentMachine.sCurrSaw, m_SawingList)
      ' aggiungo un campo vuoto
@@ -257,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)
@@ -583,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
@@ -627,10 +639,14 @@ Public Class ChooseMachining

   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
      DialogResult = True
+      ' Aggiorno i parametri dei tagli diretti
+      m_MainWindow.m_DirectCutPageUC.ReloadParam()
   End Sub

   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
      DialogResult = False
+      ' Aggiorno i parametri dei tagli diretti
+      m_MainWindow.m_DirectCutPageUC.ReloadParam()
   End Sub

 End Class
@@ -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

@@ -964,13 +964,21 @@ Public Class RawPartPageUC
            m_nPtMode = If(AddBtn.IsChecked, PTMODE.ADD, PTMODE.MOVE)
         Case RAWMODE.FROM_LASER
            Dim ptAcquired As Point3d
-            '----------------------------------------- INIZIO ------------------ se decido di inserire i punti laser manualmente --------------------------------------------------
-            If m_bFromDraw And Not IsNothing(m_ptPrev) Then
-               ptAcquired = m_ptPrev
-               ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
-               '-----------------------------------------  FINE  ------------------- se decido di inserire i punti laser manualmente --------------------------------------------------
-            ElseIf Not AcquireLaserPoint(ptAcquired) Then
-               m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 32))
+            ' Se inserimento manuale dei punti laser
+            If m_bFromDraw Then
+               If Not IsNothing(m_ptPrev) Then
+                  ptAcquired = m_ptPrev
+                  ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
+               Else
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
+               ' altrimenti da macchina
+            Else
+               If Not AcquireLaserPoint(ptAcquired) Then
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
            End If
            ' Limito il punto a stare nella tavola con franco pari al kerf
            If ptAcquired.x < m_RawKerf Then ptAcquired.x = m_RawKerf + SAFE_RAW_DIST
@@ -1014,13 +1022,21 @@ Public Class RawPartPageUC
            m_nPtDmgMode = DMGMODE.NONE
         Case RAWMODE.DAMAGED_BY_LASER
            Dim ptAcquired As Point3d
-            '----------------------------------------- INIZIO ------------------ se decido di inserire i punti laser manualmente --------------------------------------------------
-            If m_bFromDraw And Not IsNothing(m_ptPrev) Then
-               ptAcquired = m_ptPrev
-               ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
-               '-----------------------------------------  FINE  ------------------- se decido di inserire i punti laser manualmente --------------------------------------------------
-            ElseIf Not AcquireLaserPoint(ptAcquired) Then
-               m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 32))
+            ' Se inserimento manuale dei punti laser
+            If m_bFromDraw Then
+               If Not IsNothing(m_ptPrev) Then
+                  ptAcquired = m_ptPrev
+                  ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
+               Else
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
+               ' altrimenti da macchina
+            Else
+               If Not AcquireLaserPoint(ptAcquired) Then
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
            End If
            ' Limito il punto a stare nella tavola con franco pari al kerf
            If ptAcquired.x < m_RawKerf Then ptAcquired.x = m_RawKerf + SAFE_RAW_DIST
@@ -1062,8 +1078,11 @@ Public Class RawPartPageUC
      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then
         Return False
      End If
-      ' Ricavo dati lama corrente
-      Dim sSaw As String = m_CurrentMachine.sCurrSaw
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
      ' Imposto come testa corrente il laser (senza utensile ovviamente)
      If Not EgtSetCalcTool("", "H3", 1) Then
         Return False
@@ -1072,10 +1091,8 @@ Public Class RawPartPageUC
      If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, ptTipP1) Then
         Return False
      End If
-      ' Ora imposto la lama corrente
-      If Not EgtSetCalcTool(sSaw, "H1", 1) Then
-         Return False
-      End If
+      ' Reimposto eventuale precedente utensile
+      EgtSetCalcTool(sTool, sHead, nExit)
      ' Porto il tip nell'origine tavola
      ptAcquired = ptTipP1
      ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
Author	SHA1	Message	Date
NicolaP	86821914b1	Merge branch 'master' of https://gitlab.steamware.net/egaltech/OmagCUT	2022-02-09 19:46:44 +01:00
NicolaP	46abf5ca91	Merge commit '01a9ebf53b6146d3971178fd94b6810da557f58e'	2022-02-09 19:46:04 +01:00
NicolaP	01a9ebf53b	Aggiornamento versione 2.4b2	2022-02-09 19:45:19 +01:00
NicolaP	e01fbbc35a	Correzione dimensione vettreo per nuove variabili	2022-02-09 19:36:43 +01:00
NicolaP	c9356a3889	Merge commit 'f07cfdc9dc18b22d7af0657592457d118ef1e2ce' into Features/Nuove_variabili_PLC	2022-02-09 15:57:43 +01:00
NicolaP	4ce940bb0a	Nuovi coamandi per gestione PANEL e ZONE	2022-02-09 15:54:51 +01:00
DarioS	fd8ac8f528	OmagCUT : - modifiche per gestione migliorata ventose su macchine tipo Digitale5 con forti limiti di corsa in X - da polishing tolte epiclici su passate a zigzag.	2022-02-07 18:07:05 +01:00
Samuele Locatelli	f07cfdc9dc	Merge incoming	2022-02-05 10:46:07 +01:00
DarioS	4f060f3d3d	OmagCUT 2.4b1 : - riportata interfaccia per lucidature con epicicli.	2022-02-04 18:33:31 +01:00
NicolaP	7169fa1fd6	Merge branch 'Features/Comando_Parking_CN' into Features/Nuove_variabili_PLC	2022-02-03 17:14:48 +01:00
NicolaP	6b89e4067c	Configurazione pulsante Parking per NUM	2022-02-03 17:07:14 +01:00
NicolaP	ef5c98020e	Cambio versione 2.4a3	2022-01-27 19:38:30 +01:00
NicolaP	c2a1fa3fdc	Merge branch 'Features/Tagli_Diretti_WaterJet'	2022-01-27 19:36:57 +01:00
NicolaP	319275f43c	Gestione TagioGrglio con macchina WaterJet	2022-01-27 19:01:08 +01:00
NicolaP	61d238e196	Gestione TaglioMultiplo con macchina WaterJet	2022-01-27 17:01:07 +01:00
NicolaP	0900728bbf	Gestione TaglioSIngolo con macchina solo WaterJet	2022-01-27 13:03:23 +01:00
NicolaP	c4ac9e6770	Gestione accensione fari per scatto foto	2022-01-26 12:42:42 +01:00
NicolaP	ee83a453e7	Eliminato il campo qualità ""	2022-01-20 19:30:30 +01:00
NicolaP	9109a8cfb7	Correzione gestione parametro Offset, inserita nuova immagine per movimento a spirale	2022-01-20 12:57:46 +01:00
NicolaP	f1ab1f1e77	Preparazione nuovi parametri interfaccia Lucidature	2022-01-20 12:12:34 +01:00
NicolaP	7596849254	Migliorato codice	2022-01-19 20:21:30 +01:00
NicolaP	e12eb2599e	Correzione e miglioramento selezione tagli per Test	2022-01-19 16:14:44 +01:00
NicolaP	a0754265ac	Correzioni Modifica Inizio/Fine, definizione lista LeadIn, messaggio Cycle-Start	2022-01-17 18:42:29 +01:00
NicolaP	1645a39506	Merge branch 'Correzione_Incidi_(Ovale)'	2022-01-17 16:24:09 +01:00
NicolaP	9e2c2c1b98	Aggiornamento versione 2.4a2	2022-01-17 16:23:21 +01:00
NicolaP	51f15818c2	Merge remote-tracking branch 'origin/DB_WaterJet_Renzo' into Correzione_Incidi_(Ovale)	2022-01-17 16:14:45 +01:00
NicolaP	b0081241d8	Merge branch 'Feature/Mach_WaterJet' into Correzione_Incidi_(Ovale)	2022-01-17 16:14:29 +01:00
NicolaP	173230df5a	Correzione e modifica impaginazione Lavorazione di Scasso	2022-01-17 15:49:08 +01:00
NicolaP	22afb6edcd	Gestione modifica inizio/fine sugli angoli interni	2022-01-17 10:18:57 +01:00
NicolaP	9c8faf25bf	Gestione Modifica Inizio/Fine da comando diretto	2022-01-13 18:05:00 +01:00
NicolaP	58775595c7	Gestione minimo accorciamento tagli con cursore	2022-01-12 17:22:45 +01:00
RenzoL	367ac62fc8	Implementato flag FromDBWaterJet per utilizzo Materiali e Qualità WaterJet	2022-01-12 15:43:11 +01:00
NicolaP	9750fdfe75	Selezione da interfaccia delle lavorazioni	2022-01-12 12:27:48 +01:00
NicolaP	39bc4f55ea	Merge commit '803a7bdbfc50a45289bb4fddec345318bd22a07d' into Feature/Mach_WaterJet	2022-01-12 10:10:49 +01:00
DarioS	803a7bdbfc	OmagCUT : - piccola correzione su abilitazione Cornici.	2022-01-10 20:27:34 +01:00
NicolaP	1473298705	Merge branch 'Feature/Mach_WaterJet'	2022-01-10 20:17:55 +01:00
NicolaP	4be7087a1b	Disabilito tutto quello che riguarda la lama.	2022-01-10 20:17:01 +01:00
NicolaP	7c990987e8	Merge remote-tracking branch 'origin/DB_WaterJet_Renzo' into Feature/Mach_WaterJet	2022-01-10 19:36:56 +01:00
NicolaP	3837895350	Merge remote-tracking branch 'origin/HEAD' into Feature/Mach_WaterJet	2022-01-10 18:49:49 +01:00
NicolaP	e5195c5c5c	Disabilito info lama se H1 assente	2022-01-10 18:49:09 +01:00
DarioS	17ed0b3807	OmagCUT : - in Split aggiunta gestione con mouse (drag) di lunghezze di attacchi e uscite di tagli con lama - corretto problema salvataggio progetto quando non esiste direttorio in cui si dovrebbe trovare la foto.	2022-01-10 18:39:20 +01:00
NicolaP	e11722f598	Gestione visualizzazione bottoni in SplitPage	2022-01-10 18:20:28 +01:00
RenzoL	9644529618	Nel Db Waterjet il parametro del Sottomateriale viene selezionato anche quando si clicca una delle TextBox (ulteriore clic per scrivere nella TextBox)	2022-01-10 15:26:04 +01:00
DarioS	0eb6897c08	OmagCUT : - modifiche per import CSV con angoli di lato e tallone - salvataggio AGG_DEPTH in lato con taglio inclinato non passante.	2022-01-10 10:18:07 +01:00
DarioS	8462554421	OmagCUT 2.4a1 : - sistemata acquisizione punto da laser per grezzo (problema impostazione lama).	2022-01-04 08:10:43 +01:00
NicolaP	446df8f37f	Merge branch 'Feature/DB_WaterJet'	2021-12-29 13:11:01 +01:00
NicolaP	093f882118	Merge branch 'Feature/DB_WaterJet'	2021-12-29 11:59:53 +01:00