Correzione DoubleClick OnOff scena

- modifica a taglio singolo per acquisizione punto da macchina tipo MultiCut.

AboutBox/AboutBoxWD.xaml

@@ -23,7 +23,8 @@
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.25*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.25*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.25*"/>
          </Grid.RowDefinitions>
@@ -35,7 +36,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1">
-               <Image Source="../Resources/AboutBoxImage.png" Stretch="Uniform"/>
+                    <Image Source="../Resources/NewIcons/Logo-Egalware (3).png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
@@ -44,13 +45,17 @@
             VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="KeyLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
             VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="MachineLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
+
+            <TextBlock Name="AssStatusLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
             VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="ProjectLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center"
+
+            <TextBlock Name="MachineLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center"
             VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Center"
+         <TextBlock Name="ProjectLbl" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Center"
+            VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="9" HorizontalAlignment="Center"
             VerticalAlignment="Center" FontSize="15" />
-         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="10" IsCancel="True"
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="11" IsCancel="True"
             Style="{DynamicResource OmagCut_WindowGrayTextButton}" Margin="1,0"/>
 
       </Grid>

AboutBox/AboutBoxWD.xaml.vb

@@ -33,6 +33,19 @@ Public Class AboutBoxWD
 #Else
       KeyLbl.Text = sKey & " - " & sOpts
 #End If
+      ' COPIATO da codice CAM5
+      Dim sAssStatus As String = " discontinued"
+      Dim nAssLeftDays As Integer
+      If EgtGetKeyAssLeftDays(nAssLeftDays) And nAssLeftDays >= 0 Then
+         If nAssLeftDays > 30 Then
+            sAssStatus = "expires within " & nAssLeftDays.ToString() & " days"
+         ElseIf nAssLeftDays > 0 Then
+            sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days"
+         Else
+            sAssStatus = "to be renewed by today"
+         End If
+      End If
+      AssStatusLbl.Text = sAssStatus
       CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
       MachineLbl.Text = "Machine : " & m_MainWindow.m_CurrentMachine.sMachineName
       ProjectLbl.Text = "Project : " & m_MainWindow.m_CurrentProjectPageUC.GetCurrentProjectName()

CAM/CamAuto.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.Windows.Forms.Integration
+Imports EgtUILib
 
 Friend Module CamAuto
 
@@ -29,7 +30,7 @@ Friend Module CamAuto
       Return bOk
    End Function
 
-   Friend Function AddWaterJetMachining( nOperId As Integer, ByRef nWarn As Integer) As Boolean
+   Friend Function AddWaterJetMachining(nOperId As Integer, ByRef nWarn As Integer) As Boolean
       EgtLuaCreateGlobTable("CAM")
       SetLuaStandardCamParams()
       EgtLuaSetGlobIntVar("CAM.OPERID", nOperId)
@@ -93,7 +94,7 @@ Friend Module CamAuto
       If nPrjType = CurrentProjectPageUC.PRJ_TYPE.FLATS Then
          ' Reinserisco tutte le lavorazioni piane
          AddMachinings(GDB_ID.NULL, nWarn)
-      ' Se altrimenti progetto con cornici
+         ' Se altrimenti progetto con cornici
       ElseIf nPrjType = CurrentProjectPageUC.PRJ_TYPE.FRAMES Then
          ' Reinserisco tutte le lavorazioni delle cornici
          AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim)
@@ -101,6 +102,137 @@ Friend Module CamAuto
       Return True
    End Function
 
+   Friend Function ResetAllSplitCurv() As Boolean
+      Dim bOk As Boolean = True
+      Dim nIdPart As Integer = EgtGetFirstPart()
+      While nIdPart <> GDB_ID.NULL
+         ' elimino il layer dei flag di separazione "AUX_SPLIT_WJ"
+         Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(nIdPart, INFO_AUX_SPLIT_WJ)
+         EgtErase(IdAuxLayer)
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
+         While nIdMy <> GDB_ID.NULL
+            EgtRemoveInfo(nIdMy, INFO_JOINENTITY)
+            nIdMy = EgtGetNext(nIdMy)
+         End While
+         nIdPart = EgtGetNextPart(nIdPart)
+      End While
+      Dim nRawId As Integer = CamAuto.GetCurrentRaw()
+      nIdPart = EgtGetFirstPartInRawPart(nRawId)
+      While nIdPart <> GDB_ID.NULL
+         ' elimino il layer dei flag di separazione "AUX_SPLIT_WJ"
+         Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(nIdPart, INFO_AUX_SPLIT_WJ)
+         EgtErase(IdAuxLayer)
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
+         While nIdMy <> GDB_ID.NULL
+            EgtRemoveInfo(nIdMy, INFO_JOINENTITY)
+            nIdMy = EgtGetNext(nIdMy)
+         End While
+         nIdPart = EgtGetNextPartInRawPart(nIdPart)
+      End While
+      Return bOk
+   End Function
+
+   Friend Function ResetAllStartCurv() As Boolean
+      Dim bOk As Boolean = True
+      Dim nIdPart As Integer = EgtGetFirstPart()
+      While nIdPart <> GDB_ID.NULL
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         EgtRemoveInfo(nIdLayerOutLoop, INFO_START)
+         nIdPart = EgtGetNextPart(nIdPart)
+      End While
+      Dim nRawId As Integer = CamAuto.GetCurrentRaw()
+      nIdPart = EgtGetFirstPartInRawPart(nRawId)
+      While nIdPart <> GDB_ID.NULL
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         EgtRemoveInfo(nIdLayerOutLoop, INFO_START)
+         nIdPart = EgtGetNextPartInRawPart(nIdPart)
+      End While
+      Return bOk
+   End Function
+
+   Friend Function ResetAllBRidges() As Boolean
+      Dim bOk As Boolean = True
+      Dim nMachGroup As Integer = EgtGetCurrMachGroup()
+      Dim nBridgesGroup As Integer = EgtGetFirstNameInGroup(nMachGroup, "Bridges")
+      bOk = EgtErase(nBridgesGroup)
+      Return bOk
+   End Function
+
+   Friend Function ResetAllSplitCut() As Boolean
+      Dim PartList As New List(Of Integer)
+      ' Ricerca nei grezzi dei pezzi (devono essere ricercati tra quelli presenti nei grezzi)
+      Dim bOk As Boolean = True
+      ' Recupero il numero di fasi presenti nel progetto
+      Dim nPhaseCount As Integer = EgtGetPhaseCount()
+      For nPhase As Integer = 1 To nPhaseCount
+         EgtSetCurrPhase(nPhase)
+         Dim nRawId As Integer = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            Dim nParId As Integer = EgtGetFirstPartInRawPart(nRawId)
+            If EgtVerifyRawPartPhase(nRawId, nPhase) Then
+               While nParId <> GDB_ID.NULL
+                  Dim nNextParId As Integer = EgtGetNextPartInRawPart(nParId)
+                  ' verifico se il pezzo passato è un taglio di sepatazione (il nome deve contenere "SpliCut")
+                  Dim sName As String = String.Empty
+                  If EgtGetName(nParId, sName) AndAlso sName.Contains(SPLIT_CUT) Then
+                     ' Rimuovo il pezzo dal grezzo
+                     If EgtRemovePartFromRawPart(nParId) Then
+                        ' Salvo l'indice del pezzo se non è stato già inserito
+                        Dim nIndex As Integer = PartList.FirstOrDefault(Function(nId) nId = nParId)
+                        If nIndex = 0 Then PartList.Add(nParId)
+                     End If
+                  End If
+                  nParId = nNextParId
+               End While
+            End If
+            nRawId = EgtGetNextRawPart(nRawId)
+         End While
+      Next
+      ' Reimposto la prima fase del progetto
+      EgtSetCurrPhase(1)
+      ' Procedo ad eliminare il pezzo
+      For Each Item As Integer In PartList
+         bOk = bOk And EgtErase(Item)
+      Next
+      Return bOk
+   End Function
+
+   Friend Function ResetAllRawPart() As Boolean
+      Dim nPhase As Integer = 1
+      Dim nOtherRaw As Integer = EgtGetFirstRawPart()
+      While nOtherRaw <> GDB_ID.NULL
+         ' se il pezzo non appartiene alla prima fase allora viene eliminato
+         If Not EgtVerifyRawPartPhase(nOtherRaw, nPhase) Then
+            Dim NextRaw As Integer = EgtGetNextRawPart(nOtherRaw)
+            EgtRemoveRawPart(nOtherRaw)
+            nOtherRaw = NextRaw
+         Else
+            nOtherRaw = EgtGetNextRawPart(nOtherRaw)
+         End If
+      End While
+      Return True
+   End Function
+
+   ' verifico che il contorno passato non sia stato separato
+   Friend Function VerifyOutLoopIsClosed(nIdLayerOutLoop As Integer)
+      Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
+      While nIdMy <> GDB_ID.NULL
+         Dim nValInfo As Integer = 1
+         If EgtGetInfo(nIdMy, INFO_JOINENTITY, nValInfo) Then
+            If nValInfo = 0 Then Return False
+         End If
+         EgtRemoveInfo(nIdMy, INFO_JOINENTITY)
+         nIdMy = EgtGetNext(nIdMy)
+      End While
+      Return True
+   End Function
+
    Friend Function RemoveFinalEmptyPhases() As Boolean
       Dim nOpeId As Integer = EgtGetLastOperation()
       While nOpeId <> GDB_ID.NULL
@@ -674,6 +806,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)
@@ -719,10 +854,12 @@ Friend Module CamAuto
    End Function
 
    Private Function SetLuaStandardCamParams(Optional bDripOk As Boolean = True) As Boolean
+      Dim sMaterial As String = m_MainWindow.m_CurrentMachine.CurrMat.sName
       Dim sSawMch As String = m_MainWindow.m_CurrentMachine.sCurrSawing
       Dim sMillMch As String = m_MainWindow.m_CurrentMachine.sCurrMilling
       Dim sDrillMch As String = m_MainWindow.m_CurrentMachine.sCurrDrilling
       Dim sWaterJetMch As String = m_MainWindow.m_CurrentMachine.sCurrWaterJetting
+      Dim sWaterJetQual As String = m_MainWindow.m_CurrentMachine.sCurrWaterJettingQuality
       Dim sPocketMch As String = m_MainWindow.m_CurrentMachine.sCurrPocketing
       Dim sDripSawMch As String = If(bDripOk, m_MainWindow.m_CurrentMachine.sCurrDripSawing, "")
       Dim sDripDrillMch As String = If(bDripOk, m_MainWindow.m_CurrentMachine.sCurrDripDrilling, "")
@@ -735,11 +872,13 @@ Friend Module CamAuto
       Dim bMillingOnCorners As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
       Dim bMillingOnSinks As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
       Dim dMillingShort As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
+      EgtLuaSetGlobStringVar("CAM.MATERIAL", sMaterial)
       EgtLuaSetGlobStringVar("CAM.SAWMCH", sSawMch)
       EgtLuaSetGlobStringVar("CAM.MILLMCH", sMillMch)
       EgtLuaSetGlobStringVar("CAM.DRILLMCH", sDrillMch)
       EgtLuaSetGlobStringVar("CAM.POCKETMCH", sPocketMch)
       EgtLuaSetGlobStringVar("CAM.WATERJETMCH", sWaterJetMch)
+      EgtLuaSetGlobStringVar("CAM.WATERJETQLTY", sWaterJetQual)
       EgtLuaSetGlobStringVar("CAM.DRIPSAWMCH", sDripSawMch)
       EgtLuaSetGlobStringVar("CAM.DRIPDRILLMCH", sDripDrillMch)
       EgtLuaSetGlobNumVar("CAM.REDUCEDDEPTH", dReducedDepth)

CadCuts/CSVFile.vb

@@ -1,5 +1,5 @@
 Imports EgtUILib
-
+Imports System.IO
 
 Friend Module CSVFile
 
@@ -7,6 +7,7 @@ Friend Module CSVFile
 
    '-----------------------------------------------------------------------------------------------
    Friend Class CsvPart
+      Public m_sPath As String = String.Empty
       Public m_sName As String = String.Empty
       Public m_sOrd As String = String.Empty
       Public m_sDist As String = String.Empty
@@ -19,8 +20,20 @@ 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
+      ' definsco il riferimento al gruppo
+      Public m_sRefGuid As String = System.Guid.NewGuid.ToString
+      ' definisco il colore del gruppo che sto inserendo
+      Public m_cColor As Color3d = CompoColor(m_MainWindow.GetIniFile())
    End Class
 
    '-----------------------------------------------------------------------------------------------
@@ -51,6 +64,7 @@ Friend Module CSVFile
       For i As Integer = 1 To nNbr
          Dim OnePart As New CsvPart
          Dim sN As String = i.ToString()
+         OnePart.m_sPath = sFile
          EgtLuaGetGlobStringVar("CSV.NAME" & sN, OnePart.m_sName)
          OnePart.m_bActive = True
          EgtLuaGetGlobStringVar("CSV.ORD" & sN, OnePart.m_sOrd)
@@ -62,7 +76,18 @@ 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
+         If OnePart.m_nCount > 1 Then
+            OnePart.m_sRefGuid = System.Guid.NewGuid.ToString
+         End If
          ' inserisco in lista
          CsvPartList.Add(OnePart)
       Next
@@ -123,7 +148,9 @@ Friend Module CSVFile
             Else
                Dim sItems() As String = sLine.Split("=".ToCharArray)
                If sItems.Count() >= 2 Then
-                  If sItems(0) = "Nam" Then
+                  If sItems(0) = "Path" Then
+                     OnePart.m_sPath = sItems(1)
+                  ElseIf sItems(0) = "Nam" Then
                      OnePart.m_sName = sItems(1)
                   ElseIf sItems(0) = "Ord" Then
                      OnePart.m_sOrd = sItems(1)
@@ -147,8 +174,26 @@ 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)
+                  ElseIf sItems(0) = "Guid" Then
+                     OnePart.m_sRefGuid = sItems(1).Trim
                   End If
                End If
             End If
@@ -176,6 +221,7 @@ Friend Module CSVFile
          For i As Integer = 1 To CsvPartList.Count()
             Dim CurrPart As CsvPart = CsvPartList(i - 1)
             Writer.WriteLine("[P" & i.ToString() & "]")
+            Writer.WriteLine("Path=" & CurrPart.m_sPath)
             Writer.WriteLine("Nam=" & CurrPart.m_sName)
             Writer.WriteLine("Ord=" & CurrPart.m_sOrd)
             Writer.WriteLine("Dist=" & CurrPart.m_sDist)
@@ -188,20 +234,53 @@ 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())
+            Writer.WriteLine("Guid=" & CurrPart.m_sRefGuid)
          Next
          ' Terminatore
          Writer.WriteLine("[END]")
          ' Chiudo file
          Writer.Close()
          Return True
-      ' Errore
+         ' Errore
       Catch ex As Exception
          EgtOutLog("CSV List error writing " & sFile)
          Return False
       End Try
    End Function
 
+   ' dato l'elenco completo dei file salvo ogni singolo epl 
+   Friend Function WriteCsvMergePartList(CsvPartList As List(Of CsvPart)) As Boolean
+      Dim bOk As Boolean = True
+      Dim LocalPartList As New List(Of CsvPart)
+      Dim Index As Integer = 0
+      ' devo dividere la lista in tante parti quanti sono i file che lo costituiscono
+      While Index < CsvPartList.Count
+         Dim CurrFile As String = CsvPartList(Index).m_sPath
+         Dim sFile As String = Path.ChangeExtension(CurrFile, ".epl")
+         LocalPartList.Clear()
+         While CurrFile = CsvPartList(Index).m_sPath
+            LocalPartList.Add(CsvPartList(Index))
+            Index += 1
+            ' se terminata la lista
+            If Index = CsvPartList.Count Then
+               Exit While
+            End If
+         End While
+         ' salvo l'elenco corrente
+         bOk = WriteCsvPartList(sFile, CurrFile, LocalPartList) And bOk
+      End While
+      Return bOk
+   End Function
+
    Friend Function RemoveNotToNestParts(ByRef CsvPartList As List(Of CsvPart)) As Boolean
       For i As Integer = CsvPartList.Count() - 1 To 0 Step -1
          If CsvPartList(i).m_nToNest = 0 Then

CadCuts/CSVPage.xaml.vb

@@ -11,7 +11,7 @@ Public Class CSVPage
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
-   ' Flag tipologia
+   ' Flag tipologia (False -> Cvs semplificato)
    Private m_bFull As Boolean = False
    ' Flag inserimento diretto
    Private m_bDirect As Boolean = True
@@ -28,6 +28,10 @@ Public Class CSVPage
    Private m_ptRawMin As Point3d
    Private m_ptRawMax As Point3d
 
+   Dim m_bIsCounterLy As Boolean = False
+   Dim m_nCurrNubrOfParts As Integer = 0
+   Dim m_nIdToSel As Integer = GDB_ID.NULL
+
    Private Sub CSVPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Assegno la lista dei pezzi Csv come sorgente del treeview
       PartsTreeView.ItemsSource = m_ItemsList
@@ -101,13 +105,36 @@ Public Class CSVPage
          If EgtIsPart(nPartId) Or bPartInTable Then
             Dim nStat As Integer = GDB_ST.ON_
             EgtGetStatus(nPartId, nStat)
-            ' Se già selezionato, lo deselezione
-            If nStat = GDB_ST.SEL Then
-               EgtDeselectObj(nPartId)
-            ' Altrimenti lo seleziono
-            Else
-               EgtSelectObj(nPartId)
+
+            ' verifico se l'lemento selezionato è il numero di pezzi
+            If EgtGetType(nId) = GDB_TY.EXT_TEXT Then
+               Dim NameLayer As String = String.Empty
+               EgtGetName(EgtGetParent(nId), NameLayer)
+               If NameLayer = INFO_COUNTERLY Then
+                  Dim sText As String = String.Empty
+                  If EgtTextGetContent(nId, sText) Then
+                     Dim sItems() As String = sText.Split("#")
+                     If sItems.Count > 1 Then
+                        m_nCurrNubrOfParts = 0
+                        If StringToInt(sItems(1), m_nCurrNubrOfParts) And m_nCurrNubrOfParts > 0 Then
+                           m_bIsCounterLy = True
+                           m_nIdToSel = nPartId
+                        End If
+                     End If
+                  End If
+               End If
             End If
+
+            If Not m_bIsCounterLy Then
+               ' Se già selezionato, lo deselezione
+               If nStat = GDB_ST.SEL Then
+                  EgtDeselectObj(nPartId)
+                  ' Altrimenti lo seleziono
+               Else
+                  EgtSelectObj(nPartId)
+               End If
+            End If
+
             Exit While
          End If
          nId = EgtGetNextObjInSelWin()
@@ -115,6 +142,28 @@ Public Class CSVPage
       EgtDraw()
    End Sub
 
+   Private Sub OnMyMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseUpScene
+      If m_bIsCounterLy Then
+         ' apro una finestra di dialogo per chiedere se inserire tutti i pezzi della famiglia
+         Dim SelectWD As New SelectPartFromFamilyWD(m_MainWindow, m_nCurrNubrOfParts)
+         Dim sRefGroup As String = String.Empty
+         EgtGetInfo(m_nIdToSel, INFO_REFGROUP, sRefGroup)
+         ' deseleziono il pezzo corrente
+         m_MainWindow.m_CadCutPageUC.m_NestPage.DeselectPartInFaimily(sRefGroup)
+         Select Case SelectWD.NumberOfSelection
+            Case 0    ' Annulla
+               ' continuo senza eseguire niente
+            Case Else
+               ' seleziono il numero di pezzi indicati
+               m_MainWindow.m_CadCutPageUC.m_NestPage.SelectPartInFaimily(sRefGroup, SelectWD.NumberOfSelection)
+         End Select
+         m_bIsCounterLy = False
+         ' disassegno il riferimento all'oggetto appena creato
+         SelectWD = Nothing
+         EgtDraw()
+      End If
+   End Sub
+
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Remove(Me)
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC.m_NestPage)
@@ -133,15 +182,48 @@ Public Class CSVPage
       WritePrivateProfileString(S_CSV, K_CSVLASTFILE, "", m_MainWindow.GetIniFile())
    End Sub
 
+   Private Function CreateListOfDeniedFiles() As List(Of String)
+      Dim LocalList As New List(Of String)
+      LocalList.Add("MERGE")
+      Dim Index1 As Integer = 0
+      Dim Index2 As Integer = 0
+      For Index1 = 0 To m_CsvPartList.Count - 1
+         Dim sFileName As String = m_CsvPartList(Index1).m_sPath
+         sFileName = Path.GetFileNameWithoutExtension(sFileName).ToUpper.Trim()
+         Dim bNewFile As Boolean = True
+         For Index2 = 0 To LocalList.Count - 1
+            If sFileName = LocalList(Index2) Then
+               bNewFile = False
+               Exit For
+            End If
+         Next
+         If bNewFile Then
+            LocalList.Add(Path.GetFileNameWithoutExtension(sFileName).ToUpper.Trim)
+         End If
+      Next
+      Return LocalList
+   End Function
+
    Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
-      ' Salvo lista dei pezzi attuale
-      SaveCsvPartList()
+      '' Salvo lista dei pezzi attuale
+      'SaveCsvPartList()
       ' Leggo direttorio corrente dei file CSV
       Dim sCurrDir As String = ""
       GetPrivateProfileString(S_CSV, K_CSVCURRDIR, "C:\", sCurrDir, m_MainWindow.GetIniFile())
       ' Apro dialogo scelta file
-      Dim OpenFileWnd As New OpenFileWD(m_MainWindow, sCurrDir, ".CSV", ".EPL")
+      Dim OpenFileWnd As OpenFileWD
+      Dim sDeniedFiles As List(Of String) = CreateListOfDeniedFiles()
+      ' imposto il filtro
+      If m_bFull Then
+         OpenFileWnd = New OpenFileWD(m_MainWindow, sCurrDir, ".CSV", ".EPL", sDeniedFiles)
+      Else
+         OpenFileWnd = New OpenFileWD(m_MainWindow, sCurrDir, ".CSV")
+      End If
       If Not OpenFileWnd.ShowDialog() Then Return
+      ' verifico che il file inserito non appartenga al Merge attuale
+
+      ' Salvo lista dei pezzi attuale
+      SaveCsvPartList()
       ' Salvo direttorio corrente
       WritePrivateProfileString(S_CSV, K_CSVCURRDIR, OpenFileWnd.GetFileDir(), m_MainWindow.GetIniFile())
       ' Apertura file
@@ -173,17 +255,28 @@ Public Class CSVPage
       ' Pulisco path e lista dei pezzi Csv
       m_sFilePath = String.Empty
       m_sCsvPath = String.Empty
-      m_CsvPartList.Clear()
+
+      ' mantengo la lista attuale dei pezzi
+      'm_CsvPartList.Clear()
+
+      ' aggiungo i pezzi su una lista temporanea
+      Dim LocalPartList As New List(Of CsvPart)
       ' Eseguo la lettura del file Csv
-      If Not ReadCsvFile(sCsvPath, m_bFull, m_sCsvPath, m_CsvPartList) Then
+      If Not ReadCsvFile(sCsvPath, m_bFull, m_sCsvPath, LocalPartList) Then
          m_CurrProjPage.SetErrorMessage(EgtMsg(91206))    'Errore nella lettura del file CSV
          Return False
       End If
+
+      ' Creo un nuovo file che ospitarà il merge de
+      Dim sNewMergeFile As String = Path.GetDirectoryName(m_sCsvPath) & "\Merge.csv"
+      m_sCsvPath = sNewMergeFile
       m_sFilePath = m_sCsvPath
+
       ' Elimino pezzi nulli
-      RemoveWrongParts(m_CsvPartList)
+      RemoveWrongParts(LocalPartList)
       ' Aggiorno
       If m_bFull Then
+         MySaveCsvPartList(LocalPartList)
          ' Salvo come epl
          SaveCsvPartList()
          ' Rinomino file originale
@@ -196,9 +289,40 @@ Public Class CSVPage
          ' eseguo rinomina
          My.Computer.FileSystem.RenameFile(sCsvPath, sBakName)
       End If
+      ' attacco i nuovi pezzi alla lista corrente
+      For Each Item As CsvPart In LocalPartList
+         m_CsvPartList.Add(Item)
+      Next
       Return True
    End Function
 
+   Private Sub LoadCsvPartList(sFile As String)
+      ' Se Csv semplificato non va letta
+      If Not m_bFull Then Return
+      ' Pulisco path e lista dei pezzi Csv
+      m_sCsvPath = String.Empty
+
+      ' mantengo la lista attuale dei pezzi
+      'm_CsvPartList.Clear()
+
+      ' aggiungo i pezzi su una lista temporanea
+      Dim LocalPartList As New List(Of CsvPart)
+
+      ' Lettura del file
+      If ReadCsvPartList(sFile, m_sCsvPath, LocalPartList) Then
+         ' Creo un nuovo file che ospitarà il merge de
+         Dim sNewMergeFile As String = Path.GetDirectoryName(m_sCsvPath) & "\Merge.csv"
+         m_sCsvPath = sNewMergeFile
+         m_sFilePath = m_sCsvPath
+      End If
+      ' Elimino pezzi nulli
+      RemoveWrongParts(LocalPartList)
+      ' attacco i nuovi pezzi alla lista corrente
+      For Each Item As CsvPart In LocalPartList
+         m_CsvPartList.Add(Item)
+      Next
+   End Sub
+
    Private Sub ShowTreeView()
       ' Path del file Csv
       Dim TempPath As New Text.StringBuilder(260)
@@ -208,6 +332,7 @@ Public Class CSVPage
       m_ItemsList.Clear()
       Dim sCurrMat As String = String.Empty
       Dim dCurrTh As Double = 0
+      Dim sCurrPath As String = String.Empty
       Dim nCatToNest As Integer = 0
       Dim nCatCount As Integer = 0
       Dim PartCathegory As New PartCathegoryItem("", 0)
@@ -218,19 +343,28 @@ Public Class CSVPage
          If i = 1 Then
             sCurrMat = CurrPart.m_sMaterial
             dCurrTh = CurrPart.m_dTh
+            sCurrPath = CurrPart.m_sPath
          ElseIf String.Compare(sCurrMat, CurrPart.m_sMaterial, True) <> 0 Or
+                String.Compare(sCurrPath, CurrPart.m_sPath, True) <> 0 Or
                 Math.Abs(dCurrTh - CurrPart.m_dTh) > 10 * EPS_SMALL Then
             If m_bFull Then
                PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                                     " - " & LenToString(dCurrTh, 2) &
                                     " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+               If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+                  PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+               End If
             Else
                PartCathegory.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
+               If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+                  PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+               End If
             End If
             PartCathegory.IsExpanded = True
             m_ItemsList.Add(PartCathegory)
             sCurrMat = CurrPart.m_sMaterial
             dCurrTh = CurrPart.m_dTh
+            sCurrPath = CurrPart.m_sPath
             PartCathegory = New PartCathegoryItem("", 0)
             nCatToNest = 0
             nCatCount = 0
@@ -248,8 +382,14 @@ Public Class CSVPage
          PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                               " - " & LenToString(dCurrTh, 2) &
                               " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+         If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+            PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+         End If
       Else
          PartCathegory.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
+         If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+            PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+         End If
       End If
       PartCathegory.IsExpanded = True
       m_ItemsList.Add(PartCathegory)
@@ -259,6 +399,7 @@ Public Class CSVPage
       For Each CatItem As PartCathegoryItem In m_ItemsList
          Dim sCurrMat As String = String.Empty
          Dim dCurrTh As Double = 0
+         Dim sCurrPath As String = String.Empty
          Dim nCatToNest As Integer = 0
          Dim nCatCount As Integer = 0
          For Each PrtItem As PartCustomItem In CatItem.Items
@@ -268,6 +409,7 @@ Public Class CSVPage
             PrtItem.sText1 = sCount
             sCurrMat = PartData.m_sMaterial
             dCurrTh = PartData.m_dTh
+            sCurrPath = PartData.m_sPath
             nCatToNest += PartData.m_nToNest
             nCatCount += PartData.m_nCount
          Next
@@ -275,8 +417,14 @@ Public Class CSVPage
             CatItem.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                            " - " & LenToString(dCurrTh, 2) &
                            " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+            If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+               CatItem.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+            End If
          Else
             CatItem.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
+            If Not String.IsNullOrWhiteSpace(sCurrPath) Then
+               CatItem.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
+            End If
          End If
       Next
    End Sub
@@ -345,6 +493,7 @@ Public Class CSVPage
    End Function
 
    Private Sub InsertBtn_Click(sender As Object, e As RoutedEventArgs) Handles InsertBtn.Click
+      'm_CurrProjPage.ClearMessage()
       ' Recupero lo spessore della lastra corrente
       Dim dRawHeight As Double = GetRawHeight()
       If dRawHeight < EPS_SMALL Then Return
@@ -355,20 +504,17 @@ Public Class CSVPage
       End If
       ' Recupero la tolleranza sullo spessore
       Dim dToler As Double = GetPrivateProfileDouble(S_CSV, K_THICKTOLERANCE, 100 * EPS_SMALL, m_MainWindow.GetIniFile())
-      dToler = Math.Max( dToler, 100 * EPS_SMALL)
+      dToler = Math.Max(dToler, 100 * EPS_SMALL)
       ' Creo la lista dei pezzi inseribili nella lastra corrente
       Dim InsPartList As New List(Of CsvPart)
       For i As Integer = 1 To m_CsvPartList.Count()
          Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
          If CurrPart.m_bActive And
-            (Math.Abs(CurrPart.m_dTh - dRawHeight) < dToler Or
-              CurrPart.m_dTh < EPS_SMALL) And
-            (String.IsNullOrWhiteSpace(CurrPart.m_sMaterial) Or
-             String.IsNullOrWhiteSpace(sCurrMat) Or
-             CurrPart.m_sMaterial = "***" Or
-             sCurrMat = "***" Or
-             String.Compare(CurrPart.m_sMaterial, sCurrMat, True) = 0) Then
+            (Math.Abs(CurrPart.m_dTh - dRawHeight) < dToler Or CurrPart.m_dTh < EPS_SMALL) And
+            (String.IsNullOrWhiteSpace(CurrPart.m_sMaterial) Or String.IsNullOrWhiteSpace(sCurrMat) Or CurrPart.m_sMaterial = "***" Or sCurrMat = "***" Or String.Compare(CurrPart.m_sMaterial, sCurrMat, True) = 0) Then
             InsPartList.Add(CurrPart)
+            'ElseIf CurrPart.m_bActive Then
+            '   m_CurrProjPage.SetWarningMessage("Grezzo non compatibile")
          End If
       Next
       ' Lancio l'inserimento dei pezzi
@@ -424,10 +570,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 +589,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,11 +597,36 @@ 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
          If m_bFull Then
-            EgtSetInfo(nId, INFO_CSV_PATH, m_sCsvPath)
+            EgtSetInfo(nId, INFO_CSV_PATH, CurrPart.m_sPath)
             EgtSetInfo(nId, INFO_CSV_PART, CurrPart.m_sName)
             EgtSetInfo(nId, INFO_CSV_ORD, CurrPart.m_sOrd)
             EgtSetInfo(nId, INFO_CSV_DIST, CurrPart.m_sDist)
@@ -461,14 +636,36 @@ Public Class CSVPage
          Utility.SetTextColor( nRegId)
          ' Lo sposto nel gruppo speciale
          EgtRelocate(nId, nIpGrp)
+
+
+         ' assegno l'identificatico del pezzo, se esiste
+         If Not String.IsNullOrEmpty(CurrPart.m_sRefGuid) Then
+            ' GuidCode dovrebbe contenere 36 caratteri, il precode 5: tot = 41
+            If CurrPart.m_sRefGuid.Count <= 36 Then
+               Dim sPreGuid As String = CreatePreGuidCode(CurrPart.m_nId)
+               CurrPart.m_sRefGuid = sPreGuid & CurrPart.m_sRefGuid
+            End If
+            EgtSetInfo(CurrPart.m_nId, INFO_REFGROUP, CurrPart.m_sRefGuid)
+         End If
+         Dim nRegLayId As Integer = EgtGetFirstNameInGroup(CurrPart.m_nId, NAME_REGION)
+         ' Imposto il colore del pezzo inserito nel progetto
+         EgtSetColor(nRegLayId, CurrPart.m_cColor)
+         Dim EntId As Integer = EgtGetFirstInGroup(nRegLayId)
+         While EntId <> GDB_ID.NULL
+            If EgtGetType(EntId) = GDB_TY.SRF_FRGN Then EgtSetColor(EntId, CurrPart.m_cColor)
+            EntId = EgtGetNext(EntId)
+         End While
+
       Next
       EgtLuaResetGlobVar("CMP")
       EgtLuaResetGlobVar("CMP_Draw")
+
       ' Provo ad inserire i pezzi
       Dim dNewArea As Double = 0
       For i As Integer = 1 To InsPartList.Count()
          Dim CurrPart As CsvPart = InsPartList(i - 1)
          While CurrPart.m_nToNest > 0
+
             If m_bDirect Then
                If NestOnePart(CurrPart.m_nId) Then
                   dNewArea += GeomCalc.GetPartArea(CurrPart.m_nId)
@@ -490,6 +687,7 @@ Public Class CSVPage
       m_CurrProjPage.UpdateTotalArea( dNewArea)
       m_CurrProjPage.UpdateToProduceArea()
       m_MainWindow.m_CurrentProjectPageUC.ShowAreas()
+
       Return True
    End Function
 
@@ -566,11 +764,11 @@ Public Class CSVPage
       Dim sName As String = String.Empty
       EgtGetInfo(nId, INFO_CSV_PART, sName)
       ' Verifico che il pezzo appartenga a questo Csv
-      If String.Compare(sCsvPath, m_sCsvPath, True) = 0 Then
+      If SearchCurrCSV(sCsvPath) Then
          ' Cerco il pezzo nella lista dei pezzi
          For i As Integer = 1 To m_CsvPartList.Count()
             Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
-            If String.Compare(sName, CurrPart.m_sName, True) = 0 Then
+            If String.Compare(sName, CurrPart.m_sName, True) = 0 And String.Compare(sCsvPath, CurrPart.m_sPath, True) = 0 Then
                ' Se nel grezzo
                If EgtGetParent(nId) = m_nRawId Then
                   ' Rimuovo le lavorazioni
@@ -578,19 +776,38 @@ Public Class CSVPage
                   ' Rimuovo dal grezzo
                   EgtRemovePartFromRawPart(nId)
                End If
+               ' recupero il Guid del pezzo corrente (potrebbe essere stato modificato a causa di rotazioni quando il pezzo è passato in parcheggio)
+               Dim sCurrRefGuid As String = String.Empty
+               EgtGetInfo(nId, INFO_REFGROUP, sCurrRefGuid)
                ' Cancello il pezzo
                EgtErase(nId)
+               ' aggiorno il layer che indica il numero di pezzi in parcheggio (se sRefGroup<>"")
+               m_MainWindow.m_CadCutPageUC.m_NestPage.CountPartInFamily(sCurrRefGuid)
                ' Aggiorno il contatore
                CurrPart.m_nToNest += 1
+               ' ricreo la lista delle famiglie di pezzi presenti in parcheggio
+               m_MainWindow.m_CadCutPageUC.m_NestPage.GetFamilyGroupInPark()
                ' Esco
                Return True
             End If
          Next
       End If
+      ' creo la lista delle famiglie di pezzi presenti in parcheggio
+      m_MainWindow.m_CadCutPageUC.m_NestPage.GetFamilyGroupInPark()
       ' Pezzo non appartenente al Csv corrente
       Return False
    End Function
 
+   Private Function SearchCurrCSV(ByVal sCSVFile As String) As Boolean
+      For i As Integer = 1 To m_CsvPartList.Count()
+         Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
+         If String.Compare(sCSVFile, CurrPart.m_sPath, True) = 0 Then
+            Return True
+         End If
+      Next
+      Return False
+   End Function
+
    Friend Sub SaveCsvPartList()
       ' Se Csv semplificato non va salvata
       If Not m_bFull Then Return
@@ -601,24 +818,33 @@ Public Class CSVPage
       End If
       ' Path del file
       Dim sFile As String = Path.ChangeExtension(m_sFilePath, ".epl")
-      ' Scrittura del file
-      If WriteCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
-         ' Registro in ini path
-         WritePrivateProfileString(S_CSV, K_CSVLASTFILE, sFile, m_MainWindow.GetIniFile())
+      ' Scrittura dei file
+      If WriteCsvMergePartList(m_CsvPartList) Then
+         ' Scrittura dei file Merge
+         If WriteCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
+            WritePrivateProfileString(S_CSV, K_CSVLASTFILE, sFile, m_MainWindow.GetIniFile())
+         End If
       End If
    End Sub
 
-   Private Sub LoadCsvPartList(sFile As String)
-      ' Se Csv semplificato non va letta
+   ' salvo il sottoelenco dei pezzi
+   Friend Sub MySaveCsvPartList(ByVal CurrPartList As List(Of CsvPart))
+      ' Se Csv semplificato non va salvata
       If Not m_bFull Then Return
-      ' Pulisco path e lista dei pezzi Csv
-      m_sCsvPath = String.Empty
-      m_CsvPartList.Clear()
-      ' Lettura del file
-      ReadCsvPartList(sFile, m_sCsvPath, m_CsvPartList)
-      m_sFilePath = sFile
-      ' Elimino pezzi nulli
-      RemoveWrongParts(m_CsvPartList)
+      Dim sCurrPath As String = String.Empty
+      ' recupero dalla lista il nome del file corrente
+      For Each Item As CsvPart In CurrPartList
+         sCurrPath = Item.m_sPath
+      Next
+      ' se non trov il nome del file assocciato all'elenco di pezzi esco
+      If String.IsNullOrEmpty(sCurrPath) Then
+         EgtOutLog("CSV Curr list missing")
+         Return
+      End If
+      ' Path del file
+      Dim sFile As String = Path.ChangeExtension(sCurrPath, ".epl")
+      ' Scrittura del file
+      WriteCsvPartList(sFile, sCurrPath, CurrPartList)
    End Sub
 
    Friend Sub UpdateCsvPartList()

CadCuts/CadCutPageUC.xaml

@@ -30,7 +30,7 @@
          </Grid.ColumnDefinitions>
 
          <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                <Image Name="PhotoIMG" Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
             <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>

CadCuts/CadCutPageUC.xaml.vb

@@ -107,6 +107,9 @@ Public Class CadCutPageUC
 
    Private Sub PhotoBtn_Click(sender As Object, e As RoutedEventArgs) Handles PhotoBtn.Click
       m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Se macchina fotografica collegata, faccio una foto
@@ -140,6 +143,9 @@ Public Class CadCutPageUC
 
    Private Sub RawPartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RawPartBtn.Click
       m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_RawPartPage)
@@ -165,6 +171,9 @@ Public Class CadCutPageUC
 
    Private Sub DrawBtn_Click(sender As Object, e As RoutedEventArgs) Handles DrawBtn.Click
       m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_DrawPageUC)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Draw
@@ -172,6 +181,9 @@ Public Class CadCutPageUC
 
    Private Sub ImportBtn_Click(sender As Object, e As RoutedEventArgs) Handles ImportBtn.Click
       m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_ImportPageUC)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Import
@@ -193,10 +205,13 @@ Public Class CadCutPageUC
    End Sub
 
    Private Sub SplitBtn_Click(sender As Object, e As RoutedEventArgs) Handles SplitBtn.Click
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       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
@@ -206,9 +221,9 @@ Public Class CadCutPageUC
                SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Nest.png", UriKind.Relative))
             End If
             If m_CadCutMode = CadCutModes.Nest Then
-                  CadCutPageGrid.Children.Remove(m_NestPage)
-               Else
-                  CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
+               CadCutPageGrid.Children.Remove(m_NestPage)
+            Else
+               CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
             End If
             CadCutPageGrid.Children.Add(m_SplitPage)
             m_CadCutMode = CadCutModes.Split

CadCuts/ChooseTestToolWD.xaml

@@ -0,0 +1,61 @@
+<Window x:Class="ChooseTestToolWD"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+    FontFamily="{DynamicResource OmagCut_Font}"
+    Title="OpenFile" Height="382.6" Width="426.6" WindowStyle="None" 
+        ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
+        Background="Transparent">
+
+    <Border Style="{DynamicResource OmagCut_Border}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="4*"/>
+                <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.5*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
+            <!--TextAlignment="Center"
+                  FontSize="20"
+                  VerticalAlignment="Center"-->
+            <ListBox Name="SetUpToolListBox" Grid.Column="1" Grid.Row="2"
+               ItemsSource="{Binding ItemList}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding ToolAlias}" Style="{StaticResource OmagCut_ListBoxTextBlock}" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+            <Grid Grid.Column="1" Grid.Row="4">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                </Grid.ColumnDefinitions>
+
+                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
+                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+
+            </Grid>
+
+        </Grid>
+
+    </Border>
+
+</Window>

CadCuts/ChooseTestToolWD.xaml.vb

@@ -0,0 +1,281 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+
+Public Class ChooseTestToolWD
+
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   Private m_SetUpToolList As New ObservableCollection(Of TestTool)
+
+   Sub New(Owner As Window)
+      Me.Owner = Owner
+      InitializeComponent()
+   End Sub
+
+   Private Sub OpenFile_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' Posizione finestra
+      Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
+      Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
+      ' Definizione del collegamento tra ItemList e ListBox1
+      SetUpToolListBox.ItemsSource = m_SetUpToolList
+      FilePathTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 45)              ' Selezionare l'utensile da tastare
+   End Sub
+
+   Private Sub OpenFile_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
+      ' carico elenco degli utensili impostati attualmente in macchina (anche il laser!)
+      LoadSetUpTool()
+      ' ricerco l'utensile della lavorazione indicata
+      Dim Item As TestTool = m_SetUpToolList.FirstOrDefault(Function(x) x.ToolName = m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrToolFromSelectedSawCurv)
+      Dim Index As Integer = m_SetUpToolList.IndexOf(Item)
+      If Index < 0 Then
+         Index = 0
+      End If
+      ' se presente seleziono il primo elemento
+      If m_SetUpToolList.Count > 0 Then
+         SetUpToolListBox.SelectedItem = m_SetUpToolList(Index)
+         OkBtn.IsEnabled = True
+      Else
+         OkBtn.IsEnabled = False
+      End If
+   End Sub
+
+   Private Function LoadSetUpTool() As Boolean
+      Dim sNameTool As String = String.Empty
+      Dim sHeadTool As String = String.Empty
+      Dim nExitTool As Integer = 0
+
+      'sNameTool = m_MainWindow.m_CurrentMachine.sCurrSaw
+      'If Not String.IsNullOrEmpty(sNameTool) Then
+      '   ' Imposto la lama
+      '   m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool, True))
+      'End If
+      'sNameTool = m_MainWindow.m_CurrentMachine.sCurrMill
+      'If Not String.IsNullOrEmpty(sNameTool) Then
+      '   ' Imposto la fresa
+      '   m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool, False))
+      'End If
+      'sNameTool = m_MainWindow.m_CurrentMachine.sCurrDrill
+      'If Not String.IsNullOrEmpty(sNameTool) Then
+      '   ' Imposto il foretto
+      '   m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool, False))
+      'End If
+
+      sNameTool = "Laser point"
+      If Not String.IsNullOrEmpty(sNameTool) Then
+         ' Imposto laser di puntamento
+         m_SetUpToolList.Add(New TestTool(sNameTool, ""))
+      End If
+
+      sNameTool = m_MainWindow.m_CurrentMachine.sCurrWaterJet
+      If Not String.IsNullOrEmpty(sNameTool) Then
+         ' Imposto WJ
+         m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+      End If
+
+      Select Case m_MainWindow.m_CurrentMachine.MountedToolConfig
+         Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
+            sNameTool = m_MainWindow.m_CurrentMachine.sCurrSaw
+            If Not String.IsNullOrEmpty(sNameTool) Then
+               ' Imposto la lama
+               m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+            End If
+            sNameTool = m_MainWindow.m_CurrentMachine.sCurrMill
+            If Not String.IsNullOrEmpty(sNameTool) Then
+               ' Imposto la fresa
+               m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+            End If
+            sNameTool = m_MainWindow.m_CurrentMachine.sCurrDrill
+            If Not String.IsNullOrEmpty(sNameTool) Then
+               ' Imposto il foretto
+               m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+            End If
+
+         Case CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER
+            sNameTool = m_MainWindow.m_CurrentMachine.sCurrSaw
+            If Not String.IsNullOrEmpty(sNameTool) Then
+               ' Imposto la lama
+               m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+            End If
+            ' Recupero tutti gli utensili attrezzati (nel ToolChanger e nel ManualToolChanger)
+            For Each ToolChangerPos As ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
+               'm_SetUpToolList.Add(New ToolPos(ToolChangerPos.sTool, ToolChangerPos.sName, False))
+               sNameTool = ToolChangerPos.sTool
+               If Not String.IsNullOrEmpty(sNameTool) Then
+                  ' Imposto la lama
+                  m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+               End If
+            Next
+            Return True
+
+         Case CurrentMachine.MountedToolConfigs.TOOLCHANGER
+            ' Recupero tutti gli utensili attrezzati (nel ToolChanger e nel ManualToolChanger)
+            sNameTool = m_MainWindow.m_CurrentMachine.sCurrSaw
+            If Not String.IsNullOrEmpty(sNameTool) Then
+               ' Imposto la lama
+               m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+            End If
+            For Each ToolChangerPos As ToolChangerPos In m_MainWindow.m_CurrentMachine.ToolChanger
+               If Not String.IsNullOrWhiteSpace(ToolChangerPos.sTool) Then
+                  'm_SetUpToolList.Add(New ToolPos(ToolChangerPos.sTool, ToolChangerPos.sName, False))
+                  sNameTool = ToolChangerPos.sTool
+                  If Not String.IsNullOrEmpty(sNameTool) Then
+                     ' Imposto la lama
+                     m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+                  End If
+               End If
+            Next
+            For Each ToolChangerPos As ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
+               If Not String.IsNullOrWhiteSpace(ToolChangerPos.sTool) Then
+                  'm_SetUpToolList.Add(New ToolPos(ToolChangerPos.sTool, ToolChangerPos.sName, False))
+                  sNameTool = ToolChangerPos.sTool
+                  If Not String.IsNullOrEmpty(sNameTool) Then
+                     ' Imposto la lama
+                     m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+                  End If
+               End If
+            Next
+            Return True
+         Case Else
+            Return False
+      End Select
+
+
+      Return True
+   End Function
+
+   Private Sub SetUpToolListBox_PreviewMouseUp(sender As Object, e As MouseButtonEventArgs) Handles SetUpToolListBox.PreviewMouseUp
+      ' Disabilito Ok
+      OkBtn.IsEnabled = False
+      ' Recupero item selezionato
+      If SetUpToolListBox.SelectedItems.Count() = 0 Then
+         Return
+      End If
+      ' A seconda del tipo
+      OkBtn.IsEnabled = True
+   End Sub
+
+   Private Sub SetUpToolListBox_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles SetUpToolListBox.SelectionChanged
+      ' Disabilito Ok
+      OkBtn.IsEnabled = False
+      ' Recupero item selezionato
+      If SetUpToolListBox.SelectedItems.Count() = 0 Then
+         Return
+      Else
+         OkBtn.IsEnabled = True
+      End If
+   End Sub
+
+   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
+      DialogResult = True
+   End Sub
+
+   ' restituisce l'oggetto selezionato in elenco e lo imposta come attivo
+   Friend Function GetSelectedTool() As TestTool
+      Dim SelTestTool As TestTool = DirectCast(SetUpToolListBox.SelectedItem, TestTool)
+      If SelTestTool.ToolAlias = "Laser point" Then
+         SelTestTool.ToolHead = "H3"
+         SelTestTool.ToolExit = 1
+         SelTestTool.ToolIsSaw = False
+         SelTestTool.ToolIsLaser = True
+      Else
+         EgtTdbSetCurrTool(SelTestTool.ToolName)
+         Dim sHeadTool As String = String.Empty
+         Dim nExitTool As Integer = 0
+         Dim sTypeTool As String = String.Empty
+         Dim nTypeTool As Integer
+         EgtTdbGetCurrToolParam(MCH_TP.TYPE, nTypeTool)
+         EgtTdbGetCurrToolParam(MCH_TP.HEAD, sHeadTool)
+         EgtTdbGetCurrToolParam(MCH_TP.EXIT_, nExitTool)
+         EgtTdbGetCurrToolParam(MCH_TP.TYPE, sTypeTool)
+         SelTestTool.ToolHead = sHeadTool
+         SelTestTool.ToolExit = nExitTool
+         SelTestTool.ToolType = nTypeTool
+         SelTestTool.ToolIsSaw = (nTypeTool = MCH_TY.SAW_STD)
+         SelTestTool.ToolIsLaser = False
+      End If
+
+      Return SelTestTool
+   End Function
+
+End Class
+
+Public Class TestTool
+
+   Private m_ToolAlias As String = String.Empty
+   Private m_ToolName As String = String.Empty
+   Private m_ToolHead As String = "H1"
+   Private m_ToolExit As Integer = 1
+   Private m_ToolIsSaw As Boolean = False
+   Private m_ToolIsLaser As Boolean = False
+   Private m_ToolType As Integer = -1
+
+   Public Property ToolAlias As String
+      Get
+         Return m_ToolAlias
+      End Get
+      Set(value As String)
+         m_ToolAlias = value
+      End Set
+   End Property
+
+   Public Property ToolName As String
+      Get
+         Return m_ToolName
+      End Get
+      Set(value As String)
+         m_ToolName = value
+      End Set
+   End Property
+
+   Public Property ToolHead As String
+      Get
+         Return m_ToolHead
+      End Get
+      Set(value As String)
+         m_ToolHead = value
+      End Set
+   End Property
+
+   Public Property ToolExit As Integer
+      Get
+         Return m_ToolExit
+      End Get
+      Set(value As Integer)
+         m_ToolExit = value
+      End Set
+   End Property
+
+   Public Property ToolType As Integer
+      Get
+         Return m_ToolType
+      End Get
+      Set(value As Integer)
+         m_ToolType = value
+      End Set
+   End Property
+
+   Public Property ToolIsSaw As Boolean
+      Get
+         Return m_ToolIsSaw
+      End Get
+      Set(value As Boolean)
+         m_ToolIsSaw = value
+      End Set
+   End Property
+
+   Public Property ToolIsLaser As Boolean
+      Get
+         Return m_ToolIsLaser
+      End Get
+      Set(value As Boolean)
+         m_ToolIsLaser = value
+      End Set
+   End Property
+
+   Sub New(sToolAlias As String, sToolName As String)
+      m_ToolAlias = sToolAlias
+      m_ToolName = sToolName
+   End Sub
+
+End Class

CadCuts/EditValueWD.xaml

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

CadCuts/EditValueWD.xaml.vb

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

CadCuts/MoveRawPartPage.xaml

@@ -7,158 +7,167 @@
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280">
 
-   <!-- Definizione della SplitPage -->
-   <Grid Name="SplitPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
+    <!-- Definizione della SplitPage -->
+    <Grid Name="SplitPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
 
-      <!--Upper button grid-->
-      <Grid Grid.Column="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="8*"/>
-         </Grid.ColumnDefinitions>
-
-         <!--Griglia per oscurare i bottoni della pagina sottostante-->
-         <Grid Background="{DynamicResource OmagCut_Gray}">
+        <!--Upper button grid-->
+        <Grid Grid.Column="1">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="4*"/>
+                <ColumnDefinition Width="8*"/>
             </Grid.ColumnDefinitions>
 
-            <Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <!--Griglia per oscurare i bottoni della pagina sottostante-->
+            <Grid Background="{DynamicResource OmagCut_Gray}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
+                        <Image.RenderTransform>
+                            <TransformGroup>
+                                <RotateTransform Angle="180"/>
+                            </TransformGroup>
+                        </Image.RenderTransform>
+                    </Image>
+                </Button>
+                <Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+
+            </Grid>
+        </Grid>
+
+        <!--Left Button Grid-->
+        <Grid Grid.RowSpan="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <Button Name="TopLBtn" Grid.Column="0" Grid.Row="1"
+         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+                <Image Source="{DynamicResource TopLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
-            <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
-                  <Image.RenderTransform>
-                     <TransformGroup>
-                        <RotateTransform Angle="180"/>
-                     </TransformGroup>
-                  </Image.RenderTransform>
-               </Image>
+            <Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
+         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+                <Image Source="{DynamicResource UpArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
-            <Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
-         </Grid>
-      </Grid>
-
-      <!--Left Button Grid-->
-      <Grid Grid.RowSpan="3">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="2*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-
-         <Button Name="TopLBtn" Grid.Column="0" Grid.Row="1"
+            <Button Name="TopRBtn" Grid.Column="2" Grid.Row="1"
          Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-            <Image Source="{DynamicResource TopLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
-         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-            <Image Source="{DynamicResource UpArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="TopRBtn" Grid.Column="2" Grid.Row="1"
-         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-            <Image Source="{DynamicResource TopRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
+                <Image Source="{DynamicResource TopRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
          Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
-            <Image Source="{DynamicResource LeftArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="1" Grid.Row="2" Width="50"
+                <Image Source="{DynamicResource LeftArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="1" Grid.Row="2" Width="50"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-         <Button Name="ResetBtn" Grid.Column="1" Grid.Row="2"
+            <Button Name="ResetBtn" Grid.Column="1" Grid.Row="2"
             Style="{DynamicResource OmagCut_YellowTextButton}">
-         </Button>
-         <Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
+            </Button>
+            <Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
          Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource RightArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="BottomLBtn" Grid.Column="0" Grid.Row="3"
+                <Image Source="{DynamicResource RightArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="BottomLBtn" Grid.Column="0" Grid.Row="3"
          Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-            <Image Source="{DynamicResource BottomLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
+                <Image Source="{DynamicResource BottomLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
          Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-            <Image Source="{DynamicResource DownArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="BottomRBtn" Grid.Column="2" Grid.Row="3"
+                <Image Source="{DynamicResource DownArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="BottomRBtn" Grid.Column="2" Grid.Row="3"
          Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-            <Image Source="{DynamicResource BottomRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
+                <Image Source="{DynamicResource BottomRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
 
-         <Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
+            <Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
             Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                 <Image Source="{DynamicResource CounterClockwiseRotateImg}" Width="64" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
-         </Button>
+            </Button>
 
-         <Grid Name="RotationAngle" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50"
+            <Grid Name="RotationAngle" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
+                <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
             Text="°"/>
-         </Grid>
+            </Grid>
 
-         <Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
+            <Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
             Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
+                <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
-         </Button>
+            </Button>
 
+            <!--Gestione sfridi-->
+            <Button Name="RemovePartBtn" Grid.ColumnSpan="2" Grid.Row="6"
+                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-         <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6"
-         Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="ScrapsBtn" Grid.Column="3" Grid.Row="6"
+                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-         <Grid Grid.Row="7" Grid.ColumnSpan="3">
+            <!--Gestione scarico pezzi-->
+            <Button Name="UnloadPartsBtn" Grid.ColumnSpan="2" Grid.Row="7"
+                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
+
+            <Grid Grid.Row="7" Grid.ColumnSpan="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                </Grid.ColumnDefinitions>
+
+            </Grid>
+
+        </Grid>
+
+        <!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
+        <Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="10*"/>
             </Grid.ColumnDefinitions>
+            <!-- Inserimento della pausa durante il movimento sulla tavola di scarico-->
+            <Button Name="PauseBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+        </Grid>
 
-         </Grid>
-
-      </Grid>
-
-      <!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
-      <Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="10*"/>
-         </Grid.ColumnDefinitions>
-
-
-      </Grid>
-
-   </Grid>
+    </Grid>
 
 </UserControl>

CadCuts/NestPageUC.xaml

@@ -8,7 +8,7 @@
    d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="NestPage_Initialized" Loaded="NestPage_Loaded" Unloaded="NestPage_Unloaded">
       
    <!-- Definizione della NestPage -->
-   <Grid Name="NestPageGrid" >
+   <Grid Name="NestPageGrid">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="3*"/>
          <ColumnDefinition Width="12*"/>
@@ -78,7 +78,7 @@
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50"
+            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
                Text="°"/>
@@ -99,19 +99,55 @@
             <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
          </Button>
-         
-         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
+
+          <!--Comandi attivi solo in madalità REG-->
+            <UniformGrid Name ="UG0_Reg" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" Visibility="Hidden">
+                <ToggleButton Name="AddPointRegBtn" Visibility="Hidden"
+                              Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+                <ToggleButton Name="ModPointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Move-Spot-RegImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+                <ToggleButton Name="RemovePointRegBtn" Visibility="Hidden"
+                              Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+            </UniformGrid>
+
+            <!--Comandi attivi solo in madalità REG-->
+            <UniformGrid Name ="UG1_Reg" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" Visibility="Hidden">
+                <Button Name="AdjustPointRegBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Muovi-grezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <ToggleButton Name="ActivatePointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource ON_OFF-REGImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+            </UniformGrid>
+
+            <UniformGrid Name ="UG0" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="3">
                 <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
                     <Image Source="{DynamicResource Inserisci-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
                 </Button>
                 <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
                     <Image Source="{DynamicResource Parcheggia-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
                 </Button>
+                <ToggleButton Name="StartCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource StartWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+            </UniformGrid>
+          
+            <UniformGrid Name ="UG1"  Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" >
+                <Button Name="RemovePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <ToggleButton Name="DragRettanleBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Drag_RettangleImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+                <ToggleButton Name="SplitCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource SplitWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
             </UniformGrid>
-
-            <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
 
             <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
                 <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">

CadCuts/OpenFileWD.xaml.vb

@@ -9,6 +9,7 @@ Public Class OpenFileWD
    Private m_sCurrFile As String = String.Empty
    Private m_sExt As String = String.Empty
    Private m_sExt2 As String = String.Empty
+   Private n_sDeniedFiles As New List(Of String)
 
    Private m_OpenItemList As New ObservableCollection(Of IconListBoxItem)
 
@@ -27,6 +28,15 @@ Public Class OpenFileWD
       InitializeComponent()
    End Sub
 
+   Sub New(Owner As Window, sDir As String, sExt As String, sExt2 As String, DeniedFiles As List(Of String))
+      Me.Owner = Owner
+      m_sCurrDir = sDir
+      m_sExt = sExt
+      m_sExt2 = sExt2
+      n_sDeniedFiles = DeniedFiles
+      InitializeComponent()
+   End Sub
+
    Private Sub OpenFile_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Posizione finestra
       Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
@@ -71,13 +81,20 @@ Public Class OpenFileWD
       Dim FileI As FileInfo
       For Each FileI In vFileI
          Dim sExt As String = Path.GetExtension(FileI.Name).ToUpper()
-         If String.Compare(sExt, m_sExt, True) = 0 Or
-            String.Compare(sExt, m_sExt2, True) = 0 Then
+         Dim sFileName As String = Path.GetFileNameWithoutExtension(FileI.Name).ToUpper.Trim
+         Dim bDenied As Boolean = False
+         For Each ItemFile As String In n_sDeniedFiles
+            If ItemFile.ToUpper.Trim = sFileName Then
+               bDenied = True
+               Exit For
+            End If
+         Next
+         If (String.Compare(sExt, m_sExt, True) = 0 Or String.Compare(sExt, m_sExt2, True) = 0) And Not bDenied Then
             m_OpenItemList.Add(New IconListBoxItem(FileI.Name, 3))
          End If
       Next
-      ' riporto visualizzazione in cima alla lista (esiste sempre almeno un elemento)
-      FileListBox.ScrollIntoView(m_OpenItemList(0))
+         ' riporto visualizzazione in cima alla lista (esiste sempre almeno un elemento)
+         FileListBox.ScrollIntoView(m_OpenItemList(0))
       Return True
    End Function
 

CadCuts/SelectPartFromFamilyWD.xaml

@@ -0,0 +1,72 @@
+<Window x:Class="SelectPartFromFamilyWD"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+        Title="SaveNameWD" Height="200" Width="400" ShowInTaskbar="False">
+    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
+    <Border Style="{DynamicResource OmagCut_Border}">
+        <Grid x:Name="SaveNameGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="4*"/>
+                <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.1*"/>
+                <RowDefinition Height="0.3*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+
+            </Grid.RowDefinitions>
+
+            <!--Messaggio: Seleziona il numero di pezzi-->
+            <TextBlock Name="TitleWDTxbl" Grid.Column="1" Grid.Row="1"
+                       Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+
+            <UniformGrid Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Columns="2">
+                <TextBlock Name="NbrOfPartsMsg"
+                           Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="NbrOfParts"
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+            </UniformGrid>
+
+            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="5" Grid.RowSpan="1">
+                <Grid.ColumnDefinitions>
+
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+
+                </Grid.ColumnDefinitions>
+
+                <!--ultimo progetto-->
+                <Button Name="ConfirmSelection" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
+                        ToolTip="Confirm">
+                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <!--nuovo progetto-->
+                <Button Name="SelectAllPart" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
+                        ToolTip="Select all" Visibility="Collapsed">
+                    <Image Source="{DynamicResource NuovoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <!--apri folder progetti-->
+                <Button Name="CancelSelection" Grid.Column="5" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
+                        ToolTip="Cancel">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+
+            </Grid>
+
+        </Grid>
+
+    </Border>
+</Window>

CadCuts/SelectPartFromFamilyWD.xaml.vb

@@ -0,0 +1,66 @@
+Public Class SelectPartFromFamilyWD
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   Private m_NumberOfParts As Integer = 1
+   Public Property NumberOfParts As Integer
+      Get
+         Return m_NumberOfParts
+      End Get
+      Set(value As Integer)
+         m_NumberOfParts = value
+      End Set
+   End Property
+
+   Private m_NumberOfSelection As Integer = 1
+   Public Property NumberOfSelection As Integer
+      Get
+         Return m_NumberOfSelection
+      End Get
+      Set(value As Integer)
+         m_NumberOfSelection = value
+      End Set
+   End Property
+   Public Sub New(Owner As Window, NbrParts As Integer)
+      Me.Owner = Owner
+      m_NumberOfParts = NbrParts
+      InitializeComponent()
+      Me.ShowDialog()
+   End Sub
+
+   ' inizializzo la finestra
+   Private Sub SelectPartFromFamilyWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' posiziono la fistra in centro alla pagina
+      Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
+      Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
+
+      TitleWDTxbl.Text = "Selection parts"
+      NbrOfPartsMsg.Text = "Number of parts"
+      NbrOfParts.Text = m_NumberOfParts.ToString
+   End Sub
+
+   ' seleziono il numero di elementi indicati
+   Private Sub ConfirmSelection_Click(sender As Object, e As RoutedEventArgs) Handles ConfirmSelection.Click
+      Dim nVal As Integer = 0
+      StringToInt(NbrOfParts.Text, nVal)
+      If nVal >= 0 Then
+         m_NumberOfSelection = nVal
+      Else
+         ' indice non valido per la selezione
+         m_NumberOfSelection = 0
+      End If
+      Me.Close()
+   End Sub
+
+   '' seleziona tutti
+   'Private Sub SelectAllPart_Click(sender As Object, e As RoutedEventArgs) Handles SelectAllPart.Click
+   '   m_NumberOfSelection = m_NumberOfParts
+   '   Me.Close()
+   'End Sub
+
+   ' Deseleziomo tutto
+   Private Sub CancelSelection_Click(sender As Object, e As RoutedEventArgs) Handles CancelSelection.Click
+      m_NumberOfSelection = 0
+      Me.Close()
+   End Sub
+
+End Class

CadCuts/SplitAuto.vb

@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.Net
+Imports System.Windows.Forms.Integration
+Imports EgtUILib
 
 Public Module SplitAuto
 
@@ -36,6 +38,8 @@ Public Module SplitAuto
       Public m_dStartFreeLen As Double
       Public m_dEndFreeLen As Double
       Public m_vtDir As Vector3d
+      ' ver 2.6f4: tagli corti gestiti con LeadIn.OUT/LeadOut.OUT
+      Public m_bMngLeadInOnIntCorner As Boolean
    End Class
 
    '-----------------------------------------------------------------------------------------------
@@ -98,25 +102,33 @@ Public Module SplitAuto
                   Mach.m_dStartFreeLen = FREELEN_INF + 1
                   Mach.m_dEndFreeLen = FREELEN_INF + 1
                   Dim nEntId, nSub As Integer
-                  If EgtGetMachiningGeometry( 0, nEntId, nSub) Then
-                     If EgtGetType( nEntId) = GDB_TY.CRV_ARC OrElse EgtGetType( nEntId) = GDB_TY.CRV_COMPO Then Mach.m_bIsLine = False
-                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_PREVANG, INFO_NEXTANG), Mach.m_dPrevAng)
-                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_NEXTANG, INFO_PREVANG), Mach.m_dNextAng)
-                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_START_FREELEN, INFO_END_FREELEN), Mach.m_dStartFreeLen)
-                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_END_FREELEN, INFO_START_FREELEN), Mach.m_dEndFreeLen)
-                     Mach.m_bEnableInvert = GetEnableInvert( nEntId)
-                     EgtMidVector( nEntId, GDB_ID.ROOT, Mach.m_vtDir)
+                  If EgtGetMachiningGeometry(0, nEntId, nSub) Then
+                     ' EgtGetType( nEntId) = GDB_TY.CRV_ARC OrElse
+                     If EgtGetType(nEntId) = GDB_TY.CRV_COMPO Then Mach.m_bIsLine = False
+                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_PREVANG, INFO_NEXTANG), Mach.m_dPrevAng)
+                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_NEXTANG, INFO_PREVANG), Mach.m_dNextAng)
+                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_START_FREELEN, INFO_END_FREELEN), Mach.m_dStartFreeLen)
+                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_END_FREELEN, INFO_START_FREELEN), Mach.m_dEndFreeLen)
+                     Mach.m_bEnableInvert = GetEnableInvert(nEntId)
+                     EgtMidVector(nEntId, GDB_ID.ROOT, Mach.m_vtDir)
                      If Mach.m_bInvert Then Mach.m_vtDir = -Mach.m_vtDir
                      Mach.m_nEntId = nEntId
+                     EgtGetInfo(nOperId, "ManageLeadInOnIntCorner", Mach.m_bMngLeadInOnIntCorner)
                   End If
                   ' verifico se trasformabile in un taglio di separazione (almeno da un lato)
-                  If (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL) And
+                  If (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
                      Mach.m_sLay = NAME_OUTLOOP And Mach.m_nInterf = FMI_TYPE.NONE Then
                      Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
-                     Mach.m_bCanStartAll = (dStartAddLen > -EPS_SMALL And (nRes And CAR_RES.LI_OK) <> 0) And
-                                           Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine
-                     Mach.m_bCanEndAll = (dEndAddLen > -EPS_SMALL And (nRes And CAR_RES.LO_OK) <> 0) And
-                                         Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine
+                     Dim bIn As Boolean = False
+                     Dim bOut As Boolean = False
+                     CanExtendSides(Mach, bIn, bOut)
+                     Mach.m_bCanStartAll = ((dStartAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And (nRes And CAR_RES.LI_OK) <> 0) And
+                                           Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine And bIn
+                     Mach.m_bCanEndAll = ((dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And (nRes And CAR_RES.LO_OK) <> 0) And
+                                         Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine And bOut
+                     If nRes = 0 Then
+                        EgtOutLog("Operation ID " & nOperId.ToString & " isn't split cut! verify depth machining.")
+                     End If
                   End If
                   ' se trasformabile in taglio di separazione, verifico se lo è
                   If Mach.m_bCanStartAll Or Mach.m_bCanEndAll Then
@@ -131,7 +143,7 @@ Public Module SplitAuto
                      Mach.m_bStartAll = False
                      Mach.m_bEndAll = False
                   End If
-               ' Waterjet
+                  ' Waterjet
                ElseIf Mach.m_nType = MCH_OY.WATERJETTING Then
                   Mach.m_nInterf = FMI_TYPE.NONE
                   ' recupero l'angolo di fianco
@@ -140,7 +152,7 @@ Public Module SplitAuto
                   Mach.m_bCanEndAll = False
                   Mach.m_bStartAll = False
                   Mach.m_bEndAll = False
-               ' Forature e fresature
+                  ' Forature e fresature
                Else
                   Mach.m_nInterf = FMI_TYPE.NONE
                   Mach.m_dSideAng = 0
@@ -155,7 +167,7 @@ Public Module SplitAuto
                Mach.m_bPause = GetPause(nOperId)
                ' inserisco in lista
                MachSplitList.Add(Mach)
-            ' altrimenti la disattivo
+               ' altrimenti la disattivo
             Else
                EgtSetOperationMode(nOperId, False)
             End If
@@ -165,7 +177,38 @@ Public Module SplitAuto
       Return True
    End Function
 
+   Private Function CanExtendSides(CurrMach As SplitMach, ByRef bIn As Boolean, ByRef bOut As Boolean) As Boolean
+      If CurrMach.m_dPrevAng < -EPS_ANG_SMALL And CurrMach.m_dNextAng > EPS_ANG_SMALL Then
+         ' Posso estendere SOLO l'uscita
+         bOut = True
+         bIn = False
+      ElseIf CurrMach.m_dPrevAng > EPS_ANG_SMALL And CurrMach.m_dNextAng < -EPS_ANG_SMALL Then
+         ' Posso estendere SOLO l'ingresso
+         bIn = True
+         bOut = False
+      ElseIf CurrMach.m_dPrevAng < -EPS_ANG_SMALL And CurrMach.m_dNextAng < -EPS_ANG_SMALL Then
+         ' NON Posso estendere
+         bIn = False
+         bOut = False
+      Else
+         bIn = True
+         bOut = True
+      End If
+      Return True
+   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
@@ -182,7 +225,7 @@ Public Module SplitAuto
 
    Private Sub ColorSingleMachining(nOperId As Integer, sLay As String, dSideAng As Double, bEnabled As Boolean, nInterf As Integer)
       ' Verifico se è un taglio da sopra o da sotto
-      Dim bOnMach As Boolean = (sLay = NAME_ONPATH Or ( sLay = NAME_INLOOP AndAlso EgtExistsInfo( nOperId, INFO_FILOTOP)))
+      Dim bOnMach As Boolean = (sLay = NAME_ONPATH Or (sLay = NAME_INLOOP AndAlso EgtExistsInfo(nOperId, INFO_FILOTOP)))
       Dim bDrip As Boolean = (sLay = NAME_DRIPCUT Or sLay = NAME_UNDERDRILL)
       ' Recupero il preview della lavorazione
       Dim nPvId As Integer = GDB_ID.NULL
@@ -207,11 +250,11 @@ Public Module SplitAuto
             Next
             EgtSetColor(nDwnCutId, COL_MCH_DISABLED)
             Dim bFreeStart As Boolean = (nInterf And FMI_TYPE.LI) <> FMI_TYPE.LI
-            EgtSetColor(nPrcId, If(bFreeStart, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
-            EgtSetColor(nDwnPrcId, If(bFreeStart, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
+            EgtSetColor(nPrcId, If(bFreeStart, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
+            EgtSetColor(nDwnPrcId, If(bFreeStart, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
             Dim bFreeEnd As Boolean = (nInterf And FMI_TYPE.LO) <> FMI_TYPE.LO
-            EgtSetColor(nPocId, If(bFreeEnd, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
-            EgtSetColor(nDwnPocId, If(bFreeEnd, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
+            EgtSetColor(nPocId, If(bFreeEnd, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
+            EgtSetColor(nDwnPocId, If(bFreeEnd, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
          Else
             Dim colCut As Color3d
             If bOnMach Then
@@ -330,6 +373,7 @@ Public Module SplitAuto
       Dim ptOri As Point3d
       EgtGetTableRef(1, ptOri)
       Dim vtOri As New Vector3d(ptOri.x, ptOri.y, ptOri.z)
+      ' ---------------------------------- GREZZI ----------------------------------
       ' Eseguo eventuali spezzature dei grezzi e vi sposto i pezzi (i grezzi devono essere sempre copiati per Registrazione con rotazione)
       Dim nRawId As Integer = EgtGetFirstRawPart()
       While nRawId <> GDB_ID.NULL
@@ -352,6 +396,13 @@ Public Module SplitAuto
                   vNewRaws.Add(nNewRawId)
                   nNewRawId = EgtGetNextRawPart(nNewRawId)
                End While
+            Else
+               ' verifico che nella fase precedente è stato definito come sfrido, allora lo riassegno
+               Dim nVal As Integer = 0
+               EgtGetInfo(nRawId, K_ISNEWSCRAPS, nVal)
+               If nVal = 1 Or nVal = 2 Or nVal = 3 Then
+                  EgtSetInfo(nRaw1Id, K_ISNEWSCRAPS, "3")
+               End If
             End If
             ' Assegno ai nuovi grezzi eventuale texture del grezzo originale
             Dim nSolidId = EgtGetFirstNameInGroup(nRawId, NAME_RAW_SOLID)
@@ -374,10 +425,19 @@ Public Module SplitAuto
          ' passo al successivo grezzo
          nRawId = EgtGetNextRawPart(nRawId)
       End While
+      ' ---------------------------------- GREZZI ----------------------------------
       ' Cancello preview dei tagli allungati dalla lavorazione
       For Each nCut As Integer In vCuts
          RemoveMachiningPreview(nCut)
       Next
+      ' ---------------------------------- LAVORAZIONI ----------------------------------
+      ChangeOperationPhase(nNewPhase)
+      ' ---------------------------------- LAVORAZIONI ----------------------------------
+      Return True
+   End Function
+
+   ' Sposta le lavorzioni della fase precedente a quella indicata
+   Friend Sub ChangeOperationPhase_ERR(nNewPhase As Integer)
       ' Sposto tutte le lavorazioni disabilitate e le eventuali inglobate nella nuova fase
       Dim nId = EgtGetFirstOperation()
       While nId <> GDB_ID.NULL
@@ -398,9 +458,50 @@ Public Module SplitAuto
          End If
          nId = nNextId
       End While
-      Return True
-   End Function
+   End Sub
 
+   ' Miglioramento della gestione delle lavorazioni
+   Friend Sub ChangeOperationPhase(nNewPhase As Integer)
+      ' creo l'elenco delle lavorazioni che devono essere sposate
+      Dim MchList As New List(Of Integer)
+      ' Recupero le lavorazioni disabilitate e le eventuali inglobate nella nuova fase
+      Dim nId = EgtGetFirstOperation()
+      While nId <> GDB_ID.NULL
+         Dim nNextId = EgtGetNextOperation(nId)
+         If IsValidMachining(nId) And EgtGetOperationPhase(nId) = nNewPhase - 1 And EgtExistsInfo(nId, INFO_MCH_USER_OFF) Then
+            ' Provo ad inserire la lavorazione nell'elenco
+            AddMach(MchList, nId)
+            ' sposto le inglobate
+            Dim sInfo As String = String.Empty
+            If EgtGetInfo(nId, INFO_MCH_OTHMID, sInfo) Then
+               Dim sItems() As String = sInfo.Split(",".ToCharArray)
+               For Each sId2 As String In sItems
+                  Dim nId2 As Integer = 0
+                  StringToInt(sId2, nId2)
+                  If nId2 > 0 Then
+                     ' Provo ad inserire la lavorazione nell'elenco
+                     AddMach(MchList, nId2)
+                  End If
+               Next
+            End If
+         End If
+         nId = nNextId
+      End While
+      ' Procedo ora a spostare le lavorazioni nella nuova disposizione
+      For Each ItemMchId As Integer In MchList
+         EgtChangeOperationPhase(ItemMchId, nNewPhase)
+      Next
+   End Sub
+
+   ' Inserisce gli inidici delle lavorazioni evitando di inserire dei doppioni
+   Private Sub AddMach(MchList As List(Of Integer), IdMch As Integer)
+      For Each Item As Integer In MchList
+         If IdMch = Item Then
+            Return
+         End If
+      Next
+      MchList.Add(IdMch)
+   End Sub
    '-----------------------------------------------------------------------------------------------
    Friend Function CalculateSplitAuto() As Boolean
       ' Fase iniziale
@@ -724,28 +825,36 @@ Public Module SplitAuto
 
    Private Function ExecMove(nDispId As Integer, vNewRaws As List(Of Integer),
                              vtMove As Vector3d, dMinMove As Double) As Boolean
-      Dim vtMove2 As Vector3d = -vtMove
+      Dim bTwoHeadVac As Boolean = (EgtGetHeadId(VACUUM_HEAD_2) <> GDB_ID.NULL)
       Dim rmData As New RawMoveData
-      If PutVacuumCupsOnRaw(vNewRaws(1), rmData) AndAlso
-                        SafeMoveRawPart(vNewRaws(1), vtMove, dMinMove) Then
+      Dim vtMove2 As Vector3d = -vtMove
+
+      VacuumCups.ResetHeadName()
+      Dim bPutVacuum As Boolean = PutVacuumCupsOnRaw(vNewRaws(1), rmData)
+      If Not bPutVacuum And bTwoHeadVac Then bPutVacuum = PutVacuumCupsOnRaw(vNewRaws(1), rmData)
+      If bPutVacuum AndAlso SafeMoveRawPart(vNewRaws(1), vtMove, dMinMove) Then
          rmData.m_vtRawMove = vtMove
          SaveOneMoveInfoInDisposition(nDispId, rmData)
          Return True
-      ElseIf PutVacuumCupsOnRaw(vNewRaws(0), rmData) AndAlso
-                        SafeMoveRawPart(vNewRaws(0), vtMove2, dMinMove) Then
+      End If
+
+      VacuumCups.ResetHeadName()
+      Dim bPut2Vacuum As Boolean = PutVacuumCupsOnRaw(vNewRaws(0), rmData)
+      If Not bPut2Vacuum And bTwoHeadVac Then bPutVacuum = PutVacuumCupsOnRaw(vNewRaws(0), rmData)
+      If bPut2Vacuum AndAlso SafeMoveRawPart(vNewRaws(0), vtMove2, dMinMove) Then
          rmData.m_vtRawMove = vtMove2
          SaveOneMoveInfoInDisposition(nDispId, rmData)
          Return True
-      Else
-         Return False
       End If
+
+      Return False
    End Function
 
    Private Function SafeMoveRawPart(nRawId As Integer, ByRef vtMove As Vector3d, dMindist As Double) As Boolean
       ' Spostamento originale
-      Dim vtOriMove As New Vector3d( vtMove)
+      Dim vtOriMove As New Vector3d(vtMove)
       ' Livello di movimento
-      Dim nMoveLevel As Integer = GetPrivateProfileInt( S_SPLIT, K_MOVE_LEV, 5, m_MainWindow.GetIniFile())
+      Dim nMoveLevel As Integer = GetPrivateProfileInt(S_SPLIT, K_MOVE_LEV, 5, m_MainWindow.GetIniFile())
       Dim nMove As Integer = 1
       ' Se esce dalla tavola, movimento già annullato ed esco con errore
       If Not EgtMoveRawPart(nRawId, vtOriMove) Then Return False
@@ -780,7 +889,7 @@ Public Module SplitAuto
          If VerifyRawWithOtherRaws(nRawId, dMindist) Then
             vtMove += 0.5 * vtOriMove
             nMove += 1
-            If nMoveLevel = nMove Then return True
+            If nMoveLevel = nMove Then Return True
          Else
             EgtMoveRawPart(nRawId, -0.5 * vtOriMove)
          End If

CadCuts/SplitPageUC.xaml

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

CadCuts/VacuumCups.vb

@@ -1,4 +1,6 @@
 Imports EgtUILib
+Imports System.Text.RegularExpressions
+Imports System.Threading
 
 Module VacuumCups
    ' Tipo manipolatore con ventosa (0=assente, 1=dietro, 2=laterale)
@@ -8,11 +10,41 @@ 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_dPrefVertRotYMinus As Double = 0
+   Private m_dPrefVertRotYPlus As Double = 0
    Private m_dDripRefAng As Double = 0
+   ' dati carico massimo manipolatore
+   Private m_RawDensity As Double = 2500
+   Private m_RawWeight As Double = 0
+   Private m_MaxWeightSinglePlugger As Double = 250
+   Private m_MaxWeightDoublePlugger As Double = 750
+   Public bOverWeight As Boolean = False
+   ' dati per rotazione ventose vicono al fine corsa Y e X
+   Private bRotateVacuumNearExtraStrokeY As Boolean = False
+   Private bRotateVacuumNearExtraStrokeX As Boolean = False
+   ' dati stroke
+   Public bExtraStroke As Boolean = False
+   Public ptStartPointLift As Point3d
+   Public dDegRotStartAng As Double
 
    ' Nome del gruppo temporaneo per le ventose
    Private Const VACTMP_GRP As String = "VacTmp"
 
+   Private m_sHeadName As String = VACUUM_HEAD
+   Public Sub ResetHeadName()
+      Dim bReload As Boolean = (m_sHeadName <> VACUUM_HEAD)
+      m_sHeadName = VACUUM_HEAD
+      If bReload Then LoadVacuumCups()
+   End Sub
+   Public Function ChangeHeadName() As Boolean
+      If EgtGetHeadId( VACUUM_HEAD_2) = GDB_ID.NULL Then Return False
+      m_sHeadName = If( m_sHeadName = VACUUM_HEAD, VACUUM_HEAD_2, VACUUM_HEAD) 
+      LoadVacuumCups()
+      Return True
+   End Function
+
    '-----------------------------------------------------------------------------------------------
    Friend Class RawMoveData
 
@@ -48,6 +80,20 @@ Module VacuumCups
       Return m_nVacType
    End Function
 
+   ' carico i dati macchina relativi al peso massimo movimentabile
+   Friend Sub SetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
+      m_RawDensity = Density
+      m_MaxWeightSinglePlugger = MaxSingle
+      m_MaxWeightDoublePlugger = MaxDouble
+   End Sub
+
+   Friend Sub SetRotationForExtraStrokeY(Rotate As Boolean)
+      bRotateVacuumNearExtraStrokeY = Rotate
+   End Sub
+
+   Friend Sub SetRotationForExtraStrokeX(Rotate As Boolean)
+      bRotateVacuumNearExtraStrokeX = Rotate
+   End Sub
    Friend Function GetVacuumId() As Integer
       Return m_nVacId
    End Function
@@ -55,15 +101,17 @@ Module VacuumCups
    Friend Function LoadVacuumCups() As Boolean
       ' Leggo tipo manipolatore con ventosa
       m_nVacType = 0
-      EgtGetInfo(EgtGetHeadId(VACUUM_HEAD), KEY_VAC_TYPE, m_nVacType)
+      EgtGetInfo(EgtGetHeadId(m_sHeadName), KEY_VAC_TYPE, m_nVacType)
       ' Cancello eventuali vecchie ventose
       RemoveVacuumCups()
       ' Identificativo ventose nella macchina
-      Dim nLayId As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), VACUUM_HEAD_LAYOUT)
+      Dim nLayId As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), VACUUM_HEAD_LAYOUT)
       If nLayId = GDB_ID.NULL Then Return False
       ' Identificativo riferimento della testa nella macchina
-      Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT)
+      Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), HEAD_FIRST_EXIT)
       If nT1Id = GDB_ID.NULL Then Return False
+      ' imposto la l'uscita della ventosa come fosse l'uscita di un utensile
+      EgtSetCalcTool("", m_sHeadName, 1)
       ' Creo gruppo temporaneo in cui copiarli
       m_nTempId = EgtCreateGroup(GDB_ID.ROOT)
       If m_nTempId = GDB_ID.NULL Then Return False
@@ -73,18 +121,23 @@ Module VacuumCups
       m_nVacId = EgtCopyGlob(nLayId, m_nTempId)
       If m_nVacId = GDB_ID.NULL Then Return False
       ' Angolo di rotazione preferito
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
+      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)
+      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTYMINUS, m_dPrefVertRotYMinus)
+      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTYPLUS, m_dPrefVertRotYPlus)
       ' Direzione di riferimento per tagli Drip
-      EgtGetInfo( m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
+      EgtGetInfo(m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
       ' Nascondo il gruppo ma rendo visibili le curve di contorno delle ventose
       EgtSetStatus(m_nVacId, GDB_ST.OFF)
       Dim nId As Integer = EgtGetFirstInGroup(m_nVacId)
       While nId <> GDB_ID.NULL
          Select Case EgtGetType(nId)
-         Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
-            EgtSetStatus(nId, GDB_ST.ON_)
-         Case Else
-            EgtSetStatus(nId, GDB_ST.OFF)
+            Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
+               EgtSetStatus(nId, GDB_ST.ON_)
+            Case Else
+               EgtSetStatus(nId, GDB_ST.OFF)
          End Select
          nId = EgtGetNext(nId)
       End While
@@ -113,7 +166,7 @@ Module VacuumCups
    Friend Function ResetVacuumCups() As Boolean
       ' Ripristino posizione e rotazione originali
       Dim frOriRef As New Frame3d
-      EgtFrame(EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT), GDB_ID.ROOT, frOriRef)
+      EgtFrame(EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), HEAD_FIRST_EXIT), GDB_ID.ROOT, frOriRef)
       Dim frCurrRef As New Frame3d
       EgtFrame(m_nRefId, GDB_ID.ROOT, frCurrRef)
       EgtMove(m_nVacId, frOriRef.Orig() - frCurrRef.Orig(), GDB_RT.GLOB)
@@ -125,10 +178,10 @@ Module VacuumCups
       Dim nId As Integer = EgtGetFirstInGroup(m_nVacId)
       While nId <> GDB_ID.NULL
          Select Case EgtGetType(nId)
-         Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
-            EgtSetStatus(nId, GDB_ST.ON_)
-         Case Else
-            EgtSetStatus(nId, GDB_ST.OFF)
+            Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
+               EgtSetStatus(nId, GDB_ST.ON_)
+            Case Else
+               EgtSetStatus(nId, GDB_ST.OFF)
          End Select
          nId = EgtGetNext(nId)
       End While
@@ -160,10 +213,25 @@ Module VacuumCups
       EgtGetBBoxGlob(nRKerfId, GDB_BB.STANDARD, b3Kerf)
       Dim ptKerfCen As Point3d
       EgtCentroid(nRKerfId, GDB_ID.ROOT, ptKerfCen)
+
+      '-------------------- INIZIO CALCOLO PESO --------------------
+      ' recupero l'area del grezzo da muovere
+      Dim RawArea As Double = 0
+      ' superficie del grezzo senza considerare eventuali fori
+      EgtSurfFrGrossArea(nRKerfId, RawArea)
+      ' volume calcolato in mmc
+      Dim RawVolume As Double = RawArea * b3Raw.DimZ()
+      ' peso calcolato in kg
+      m_RawWeight = RawVolume * m_RawDensity / Math.Pow(10, 9)
+      '-------------------- FINE CALCOLO PESO --------------------
+
       ' Eseguo ricerca
       If FindVacuumCupsOnRaw(nRawId, ptRawCen, b3Kerf, ptKerfCen, nKerfId, nRKerfId, rmData) Then
          Return True
+      Else
+         If ChangeHeadName() Then Return False
       End If
+
       ' In caso di fallimento, provo riducendo con offset la regione di kerf
       ' (così si simula la proiezione del centro sul MAT - medial axis transform)
       Dim bOkFind As Boolean = False
@@ -182,6 +250,7 @@ Module VacuumCups
       Return False
    End Function
 
+   ' utilizzata per gestire la movimentazione dei pezzi per eseguire i drip
    Friend Function PutVacuumCupsOnPart(nPartId As Integer,
                                        ByRef rmData As RawMoveData, ByRef b3Part As BBox3d) As Boolean
       ' Ripristino posizione originale ventose
@@ -189,20 +258,20 @@ Module VacuumCups
       ' Verifico sia veramente un pezzo
       If EgtGetRawPartFromPart(nPartId) = GDB_ID.NULL Then Return False
       ' Cerco la direzione del primo taglio attivo da sotto
-      Dim nDripLayId As Integer = EgtGetFirstNameInGroup( nPartId, NAME_DRIPCUT)
-      Dim nDripLineId As Integer = EgtGetFirstInGroup( nDripLayId)
+      Dim nDripLayId As Integer = EgtGetFirstNameInGroup(nPartId, NAME_DRIPCUT)
+      Dim nDripLineId As Integer = EgtGetFirstInGroup(nDripLayId)
       While nDripLineId <> GDB_ID.NULL
-         Dim nMchId As Integer = EgtGetOperationId( "DripSaw" & nDripLineId.ToString())
+         Dim nMchId As Integer = EgtGetOperationId("DripSaw" & nDripLineId.ToString())
          Dim nMode As Integer
-         If EgtGetMode( nMchId, nMode) AndAlso nMode = GDB_MD.STD Then Exit While
-         nDripLineId = EgtGetNext( nDripLineId)
+         If EgtGetMode(nMchId, nMode) AndAlso nMode = GDB_MD.STD Then Exit While
+         nDripLineId = EgtGetNext(nDripLineId)
       End While
       Dim vtDir As New Vector3d
-      if EgtStartVector( nDripLineId, GDB_ID.ROOT, vtDir) Then
+      If EgtStartVector(nDripLineId, GDB_ID.ROOT, vtDir) Then
          Dim dLen, dAngV, dAngH As Double
-         vtDir.ToSpherical( dLen, dAngV, dAngH)
+         vtDir.ToSpherical(dLen, dAngV, dAngH)
          Dim dOffsAng = dAngH - m_dDripRefAng
-         While dOffsAng - m_dPreferredRot >= 90 
+         While dOffsAng - m_dPreferredRot >= 90
             dOffsAng -= 180
          End While
          While dOffsAng - m_dPreferredRot <= -90
@@ -261,6 +330,7 @@ Module VacuumCups
          Dim sCups() As String = Nothing
          Dim sCups2() As String = Nothing
          If Not GetVacuumCupSelection(nI, sCups, sCups2) Then Return False
+         bExtraStroke = False
          ' Determino validità soluzioni della configurazione
          Dim vtMove As New Vector3d
          Dim ptRotCen As New Point3d
@@ -289,6 +359,7 @@ Module VacuumCups
          Dim frCurrRef As New Frame3d
          EgtFrame(m_nRefId, GDB_ID.ROOT, frCurrRef)
          Dim vtDelta As Vector3d = frCurrRef.Orig() - ptRawCen
+
          ' Assegno dati noti al movimento del grezzo
          rmData.m_nId = nRawId
          rmData.m_vtRawMove = Vector3d.NULL()
@@ -334,7 +405,7 @@ Module VacuumCups
 
    Private Function GetVacRotAxisSteps(ByRef vAngRot As List(Of Double)) As Boolean
       ' Recupero l'asse rotante della testa ventosa
-      Dim nRotAxId As Integer = EgtGetParent(EgtGetHeadId(VACUUM_HEAD))
+      Dim nRotAxId As Integer = EgtGetParent(EgtGetHeadId(m_sHeadName))
       ' Verifico se contiene info con STEPS
       Dim sSteps As String = ""
       If Not EgtGetInfo(nRotAxId, KEY_ROTVAC_STEPS, sSteps) Then Return False
@@ -363,6 +434,26 @@ 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
+      '-------------------- INIZIO VERIFICA PESO --------------------
+      bOverWeight = False
+      Select Case GetPluggerFromCameras(sCups)
+         Case 2
+            ' se peso del grezzo oltre il limite consentito allora scarto la soluzione
+            If m_RawWeight > m_MaxWeightDoublePlugger Then
+               bOverWeight = True
+               Return INFINITO
+            End If
+         Case 1
+            ' se peso del grezzo oltre il limite consentito allora scarto la soluzione
+            If m_RawWeight > m_MaxWeightSinglePlugger Then
+               bOverWeight = True
+               Return INFINITO
+            End If
+      End Select
+      '-------------------- FINE VERIFICA PESO --------------------
+      ' 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 +465,30 @@ Module VacuumCups
          frMinRect.VersX().ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
          dRotAngDeg = dAngOrizzDeg
          If b3Vac.DimY() > b3Vac.DimX() + EPS_SMALL Then dRotAngDeg -= 90
-         Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
-         While dRotAngDeg - m_dPreferredRot >= dAngDelta / 2 
+         Dim dPreferredRot As Double = m_dPreferredRot
+         ' -------------------- INIZIO GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
+         ' verifico l'orientamento del pezzo
+         If bRotateVacuumNearExtraStrokeX And Not IsHorizontal(dAngOrizzDeg) Then
+            ' se l'orientamento è verticale
+            If frMinRect.Orig().x < b3Tab.Center().x Then
+               dPreferredRot = m_dPrefVertRotXMinus
+            Else
+               dPreferredRot = m_dPrefVertRotXPlus
+            End If
+         ElseIf bRotateVacuumNearExtraStrokeY And IsHorizontal(dAngOrizzDeg) Then
+            ' se l'orientemanto è orizzontale e la macchina è stata abilitata
+            If frMinRect.Orig().y < b3Tab.Center().y Then
+               dPreferredRot = m_dPrefVertRotYPlus
+            Else
+               dPreferredRot = m_dPrefVertRotYMinus
+            End If
+         End If
+         ' -------------------- FINE GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
+         Dim dAngDelta As Double = If(Math.Abs(b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
+         While dRotAngDeg - dPreferredRot >= dAngDelta / 2
             dRotAngDeg -= dAngDelta
          End While
-         While dRotAngDeg - m_dPreferredRot <= -dAngDelta / 2
+         While dRotAngDeg - dPreferredRot <= -dAngDelta / 2
             dRotAngDeg += dAngDelta
          End While
       Else
@@ -400,15 +510,15 @@ Module VacuumCups
          ' Ordino secondo distanza angolare crescente da direzione di allineamento (modulo 180 deg)
          Dim dRotRefDeg As Double = dRotAngDeg
          vAngRot.Sort(Function(P, Q)
-                         Dim dDiffP = Math.Abs( P - dRotRefDeg)
-                         If Math.Abs( dDiffP - 180) < 10 * EPS_ANG_SMALL Then dDiffP = 1
-                         Dim dDiffQ = Math.Abs( Q - dRotRefDeg)
-                         If Math.Abs( dDiffQ - 180) < 10 * EPS_ANG_SMALL Then dDiffQ = 1
-                         Return ( dDiffP - dDiffQ)
+                         Dim dDiffP = Math.Abs(P - dRotRefDeg)
+                         If Math.Abs(dDiffP - 180) < 10 * EPS_ANG_SMALL Then dDiffP = 1
+                         Dim dDiffQ = Math.Abs(Q - dRotRefDeg)
+                         If Math.Abs(dDiffQ - 180) < 10 * EPS_ANG_SMALL Then dDiffQ = 1
+                         Return (dDiffP - dDiffQ)
                       End Function)
          ' Annullo la rotazione di allineamento
          dRotAngDeg = 0
-      ' altrimenti in continuo
+         ' altrimenti in continuo
       Else
          ' Assegno più valori di ricerca e conservo angolo di allineamento
          vAngRot.AddRange({0, +5, -5, +12.5, -12.5, +25, -25, +45, -45})
@@ -430,13 +540,91 @@ Module VacuumCups
       ' Applico movimento e rotazione al punto
       ptRef.Move(vtMove)
       ptRef.Rotate(ptRotCen, Vector3d.Z_AX(), dRotAngDeg)
+
+      ' -------------- INIZIO verifica di essere nel limite delle corse macchina --------------
+      If VerifyOutOfStrokes(ptRef, dRotAngDeg) <> 0 Then
+         bExtraStroke = True
+         Return INFINITO
+      End If
+      ' se la posizione è accettbaile allora salvo i dati
+      ptStartPointLift = ptRef
+      dDegRotStartAng = dRotAngDeg
+      ' -------------- FINE verifica di essere nel limite delle corse macchina --------------
+
       ' 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
 
+   Private Function IsHorizontal(dDegAng As Double) As Boolean
+      If (Math.Abs(dDegAng) > 45 And Math.Abs(dDegAng) < 135) Or (Math.Abs(dDegAng) > 225 And Math.Abs(dDegAng) < 315) Then
+         Return False
+      End If
+      Return True
+   End Function
+
+   ' assegnate le posizioni del centro delle ventose e l'angolo di posizionamento orizzontale verifica che la posizione sia raggiungibile
+   Public Function VerifyOutOfStrokes(ptRef As Point3d, dRotAngDeg As Double) As Integer
+      Dim sAxisName As String = "C"
+      ' verifico che il nome dell'asse impostato sia corretto
+      If EgtGetAxisId(sAxisName) = GDB_ID.NULL Then
+         If m_sHeadName = VACUUM_HEAD Then
+            sAxisName = "C1"
+         Else
+            sAxisName = "C2"
+         End If
+      End If
+      ' Posizione Home dell'asse rotante
+      Dim dCHome As Double
+      EgtGetAxisHomePos(sAxisName, dCHome)
+      ' Corse dell'asse
+      Dim dCMin As Double
+      EgtGetAxisMin(sAxisName, dCMin)
+      Dim dCMax As Double
+      EgtGetAxisMax(sAxisName, dCMax)
+      ' Porto l'angolo nel range
+      Dim dRotAngMachDeg As Double = dRotAngDeg + dCHome
+      AdjustAngleInRange(dRotAngMachDeg, dCMin, dCMax)
+      ' Imposto la ventosa come fosse un utensile
+      EgtSetCalcTool("", m_sHeadName, 1)
+      ' Calcolo gli assi macchina
+      Dim dX, dY, dZ As Double
+      Dim nStat As Integer
+      If EgtGetAxisId("A") <> GDB_ID.NULL Then
+         ' Asse tavola rotante (movimenti solo con A0)
+         EgtGetCalcPositions(ptRef, 0, dRotAngMachDeg, nStat, dX, dY, dZ)
+         ' Verifico le corse
+         EgtVerifyOutstroke(dX, dY, dZ, 0, dRotAngMachDeg, nStat)
+      Else
+         EgtGetCalcPositions(ptRef, dRotAngMachDeg, 0, nStat, dX, dY, dZ)
+         ' Verifico le corse
+         EgtVerifyOutstroke(dX, dY, dZ, dRotAngMachDeg, 0, nStat)
+      End If
+
+
+      Return nStat
+   End Function
+
+   ' dall'informazione di extra corsa recupera il valore indicato
+   Public Function GetExtraStrokeValue(sInfo As String) As Double
+      Dim dExtraStroke As Double = 0
+      Dim sItems As String() = sInfo.Split("="c)
+      If sItems.Count = 2 Then
+         Dim nStartIndex As Integer = 0
+         For Each ItemChar As Char In sItems(1)
+            If ItemChar = "("c Then
+               Exit For
+            End If
+            nStartIndex += 1
+         Next
+         If nStartIndex > 0 Then
+            Dim sValue As String = sItems(1).Remove(nStartIndex, sItems(1).Count - nStartIndex)
+            StringToLen(sValue, dExtraStroke)
+         End If
+      End If
+      Return dExtraStroke
+   End Function
+
    Private Function TestVacuumCups(nCups() As Integer, nRawRegId As Integer,
                                    vtMove As Vector3d, ptRotCen As Point3d, dRotAngDeg As Double) As Boolean
       ' Eseguo verifica delle ventose rispetto al grezzo
@@ -457,6 +645,28 @@ Module VacuumCups
       Return bVacOk
    End Function
 
+   ' dato il vettore delle camere restituisco il quali attuatori sono coinvolti
+   Private Function GetPluggerFromCameras(sCups() As String) As Integer
+      Dim nCountPlunger As Integer = 1
+      Dim bPlugger1 As Boolean = False
+      Dim bPlugger2 As Boolean = False
+      For Each Camera As String In sCups
+         If (Camera.Contains("1") Or Camera.Contains("2") Or Camera.Contains("3")) Then
+            bPlugger1 = True
+         Else
+            bPlugger2 = True
+         End If
+      Next
+      ' verifico quali sono le camere attive
+      If bPlugger1 And bPlugger2 Then
+         nCountPlunger = 2
+      ElseIf Not bPlugger1 And Not bPlugger2 Then
+         nCountPlunger = 0
+      End If
+      ' restituisco il numero di Plugger in uso
+      Return nCountPlunger
+   End Function
+
    Friend Function SaveOneMoveInfo(nId As Integer, rmData As RawMoveData) As Boolean
       ' Assegno le informazioni
       EgtSetInfo(nId, "Id", rmData.m_nId)
@@ -557,7 +767,7 @@ Module VacuumCups
             rmList.RemoveAt(nInd)
             nInd = rmList.Count() - 1
          End If
-      ' Se non trovato, lo accodo
+         ' Se non trovato, lo accodo
       Else
          rmList.Add(New RawMoveData(nRawId))
          nInd = rmList.Count() - 1

Constants/ConstGen.vb

@@ -67,6 +67,8 @@ Module ConstGen
    Public Const MACHININGS_DIR As String = "Machinings"
    ' Nome file Dati delle lucidature
    Public Const KITS_FILE As String = "Kits.data"
+   ' Nome file Dati per waterJet
+   Public Const WATERJETDB_FILE As String = "WaterjetDB.data"
 
    ' File dei pezzi rovinati
    Public Const CURR_RUINED_EPL As String = "RuinedParts.epl"
@@ -82,6 +84,11 @@ Module ConstGen
 
    ' Nome testa con ventose per spostamento pezzi
    Public Const VACUUM_HEAD As String = "H4"
+   Public Const VACUUM_HEAD_2 As String = "H104"
+   ' Nome teste laser
+   Public Const LASER_HEAD As String = "H3"
+   Public Const LASER_HEAD_2 As String = "H103"
+
    ' Info tipo ventosa
    Public Const KEY_VAC_TYPE As String = "VacType"
    ' Nome gruppo layout in testa con ventose
@@ -90,6 +97,10 @@ 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"
+   Public Const KEY_VACLAY_PREFVROTYMINUS As String = "PrefVertRotYMinus"
+   Public Const KEY_VACLAY_PREFVROTYPLUS As String = "PrefVertRotYPlus"
    ' 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
@@ -143,6 +154,9 @@ Module ConstGen
    Public Const INFO_RAW_BLOCK = "Block"
    ' Info per numero lastra nel blocco
    Public Const INFO_RAW_SLABNBR = "SlabNbr"
+   ' Info per identificazione gruppo pezzi
+   Public Const INFO_REFGROUP As String = "RefGroup"
+   Public Const INFO_COUNTERLY As String = "CounterPz"
 
    ' Contrassegno di progetto OmagCut
    Public Const NAME_PROJMARK As String = "OmagCut"
@@ -178,6 +192,10 @@ Module ConstGen
    Public Const INFO_TOTAREA As String = "TotArea"
    ' Info per area da produrre dei pezzi del progetto
    Public Const INFO_TOPRODAREA As String = "ToProdArea"
+   ' Info per nome progetti
+   Public Const INFO_PROJNAME As String = "ProjName"
+   ' Info per parcheggio asse C
+   Public Const INFO_CAXESHOME As String = "CAxesHome"
 
    ' Nome layer delle regioni
    Public Const NAME_REGION As String = "Region"
@@ -203,6 +221,10 @@ 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"
+   Public Const INFO_ROUNDOFF As String = "RoundOff"
+   Public Const INFO_DIRECTCUT As String = "DirectCut"
+   Public Const INFO_STEP_TYPE As String = "StepType"
    ' 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
@@ -292,6 +314,14 @@ Module ConstGen
    Public Const INFO_PARTOK As String = "POK"
    ' Info in pezzo per stato rotazione
    Public Const INFO_PARTROT As String = "ROT"
+   ' Info in entità in OutLoop per indicare se è separata WaterJet
+   Public Const INFO_JOINENTITY As String = "JoinEntity"
+   ' Nome layer per "*" inidcanti un lato separato nel taglio WaterJet
+   Public Const INFO_AUX_SPLIT_WJ As String = "AUX_SPLIT_WJ"
+   ' Info in OutLoop per punto inzio lavorazione WaterJet
+   Public Const INFO_START As String = "Start"
+   ' Nome dei tagli diretti inseriti in fase di Splitting
+   Public Const SPLIT_CUT As String = "SplitCut"
 
    ' Nome di pezzo che è una cornice
    Public Const NAME_FRAME As String = "Frame"
@@ -324,6 +354,11 @@ Module ConstGen
    ' Info in pezzo per facet di ultima superficie selezionata
    Public Const INFO_FRAME_FACET As String = "Facet"
 
+   ' Nome del groppo dei ponticelli per lavorazioni Water
+   Public Const BRIDGES As String = "Bridges"
+   ' Nome dell'entità ponticello contenuta nel gruppo BRIDGES
+   Public Const BRIDGELINE As String = "BridgeLine"
+
    ' utensile per le lavorazioni manuali
    Public Const DUMMY_SAW As String = "DummySAW"
    ' lavorazione manuale
@@ -367,6 +402,9 @@ Module ConstGen
    Public Function COL_MCH_DRIPCUT() As Color3d
       Return New Color3d(255, 0, 165)
    End Function
+   Public Function COL_MCH_ONENGRAVE_ANG() As Color3d
+      Return New Color3d(255, 255, 100)
+   End Function
    Public Function COL_MCH_DRIPFREE() As Color3d
       Return New Color3d(192, 0, 128)
    End Function

Constants/ConstIni.vb

@@ -18,6 +18,8 @@ Module ConstIni
    Public Const S_GENERAL As String = "General"
    Public Const K_DEBUG As String = "Debug"
    Public Const K_LICENCE As String = "Licence"
+   Public Const K_NETKEY As String = "NetKey"
+   Public Const K_LOCKID As String = "LockId"
    Public Const K_MESSAGESDIR As String = "MessagesDir"
    Public Const K_MESSAGES As String = "Messages"
    Public Const K_SUPPORT As String = "Support"
@@ -46,6 +48,12 @@ Module ConstIni
    Public Const K_THEME As String = "Theme"
    Public Const K_MANUAL_CUT As String = "ManualCut"
    Public Const K_TEST As String = "Test"
+   Public Const K_SMARTMACHININGPAGE As String = "SmartMachiningPage"
+   Public Const K_STARTPROGRAM As String = "StartProgram"
+   Public Const K_GENERATECN As String = "GenerateCN"
+   Public Const K_FRACTIONPATTERN As String = "FractionPattern"
+   Public Const K_PRECISION As String = "Precision"
+   Public Const K_QUITDRAWPAGE As String = "QuitDrawPage"
 
    Public Const S_LANGUAGES As String = "Languages"
    Public Const K_LANGUAGE As String = "Language"
@@ -109,6 +117,8 @@ Module ConstIni
    Public Const K_LASTCOLOR As String = "LastColor"
    Public Const K_COLOR As String = "Color"
 
+   Public Const S_FRAMECOMPO As String = "FrameCompo"
+
    Public Const S_EXTCOMPO As String = "Compo"
 
    Public Const S_INTCOMPO As String = "InternalCompo"
@@ -129,7 +139,9 @@ Module ConstIni
    Public Const K_ENGRAVENUMBER2 As String = "EngraveNumber2"
    Public Const K_ENGRAVEOFFSET2 As String = "EngraveOffset2"
    Public Const K_ENGRAVEDEPTH As String = "EngraveDepth"
+   Public Const K_ENGRAVEDEPTH2 As String = "EngraveDepth2"
    Public Const K_ENGRAVESHORT As String = "EngraveShort"
+   Public Const K_ENGRAVEANGLE As String = "EngraveAngle"
    Public Const K_DRIPOFFSET As String = "DripOffset"
    Public Const K_DRIPOFFSET2 As String = "DripOffset2"
    Public Const K_DRIPDEPTH As String = "DripDepth"
@@ -137,6 +149,7 @@ Module ConstIni
    Public Const K_UNDERDRILLDEPTH As String = "UnderDrillDepth"
    Public Const K_FILOTOPOFFSET As String = "FiloTopOffset"
    Public Const K_FILOTOPDEPTH As String = "FiloTopDepth"
+   Public Const K_ROUNDOFF As String = "RoundOff"
 
    Public Const S_NEST As String = "Nest"
    Public Const K_DIRECT As String = "Direct"
@@ -148,6 +161,8 @@ Module ConstIni
    Public Const K_TEXTCOLOR As String = "TextColor"
    Public Const K_AUTOMATICOPTIMIZE As String = "AutomaticOptimize"
    Public Const K_AUTOMATICMAXTIME As String = "AutomaticMaxTime"
+   Public Const K_DRAG_RETTANGLE As String = "DragRectangle"
+   Public Const K_STARTENDMODIFYONINTCORNER As String = "StartEndModifyOnIntCorner"
 
    Public Const S_SPLIT As String = "Split"
    Public Const K_MOVE_LEV As String = "MoveLevel"
@@ -163,6 +178,14 @@ Module ConstIni
    Public Const K_CSVCURRDIR As String = "CurrDir"
    Public Const K_CSVLASTFILE As String = "LastFile"
 
+   Public Const S_TRF As String = "TRF"
+   Public Const K_ORDCODE As String = "OrdCode"
+   Public Const K_ORDDESC As String = "OrdDesc"
+   Public Const K_PARTCODE As String = "PartCode"
+   Public Const K_MATCODE As String = "MatCode"
+   Public Const K_SURFCODE As String = "SurfCode"
+   Public Const K_TRFTHICKNESS As String = "TrfThickness"
+
    Public Const S_SLABDXF As String = "SlabDxf"
    Public Const K_IMPORTSLABDXF As String = "ImportSlabDxf"
    Public Const K_SLABLAYER As String = "SlabLayer"
@@ -184,6 +207,7 @@ Module ConstIni
    Public Const K_OFFSZ As String = "OffsZ"
    Public Const K_OFFSXY As String = "OffsXY"
    Public Const K_OFFSYY As String = "OffsYY"
+   Public Const K_OFFSXINTERY As String = "OffsYInterY"
    Public Const K_STARTTRIM As String = "StartTrim"
    Public Const K_ENDTRIM As String = "EndTrim"
    Public Const K_OTHERSIDE As String = "OtherSide"
@@ -203,12 +227,27 @@ Module ConstIni
    Public Const K_RAWOFFSX As String = "OffsX"
    Public Const K_RAWOFFSY As String = "OffsY"
    Public Const K_RAWKERF As String = "Kerf"
+   Public Const K_ENABLEOTHERREFTAB As String = "EnableOtherRefTab"
+   Public Const K_OTHERREFTAB As String = "OtherRefTab"
+   Public Const K_OTHERREFTABX As String = "OtherRefTabX"
+   Public Const K_OTHERREFTABY As String = "OtherRefTabY"
+   Public Const K_OTHERREFTABPOS As String = "OtherRefTabPos"
+
 
    Public Const S_RAWMOVE As String = "RawMove"
    Public Const K_RAWSTEP As String = "Step"
    Public Const K_RAWROTATION As String = "Rotation"
    Public Const K_PERPENDICULAR As String = "Perpendicular"
 
+   Public Const S_SCRAPS As String = "Scraps"
+   Public Const K_ENABLESCRAPS As String = "EnableScraps"
+   Public Const K_PHOTODIR As String = "PhotoDir"
+   Public Const K_LASTBLOCK As String = "LastBlock"
+   Public Const K_TEMPLATE As String = "Template"
+   Public Const K_DAT As String = "Dat"
+   Public Const K_ZEBRAUTILITIES As String = "ZebraUtilities"
+   Public Const K_ENABLE_PRINTER As String = "EnablePrinter"
+
    Public Const S_REG As String = "Reg"
    Public Const K_REGSTEP As String = "Step"
    Public Const K_REGANGSTEP As String = "AngStep"
@@ -248,6 +287,8 @@ Module ConstIni
    Public Const S_VEINMATCHING As String = "VeinMatching"
    Public Const K_VEINMA_ENABLE As String = "Enable"
    Public Const K_VEINMA_PLACE As String = "WinPlace"
+   Public Const K_VEINMA_WIDTH As String = "Width"
+   Public Const K_VEINMA_HEIGHT As String = "Height"
 
    Public Const S_FASTGRID As String = "FastGrid"
    Public Const K_FG_ENABLE As String = "FGEnable"
@@ -294,6 +335,7 @@ Module ConstIni
    Public Const K_DC_FLATT_HEADSIDE As String = "FlattHeadSide"
    Public Const K_DC_FLATT_MACHTYPE As String = "FlattMachType"
    Public Const K_DC_FLATT_ROTLOCK As String = "FlattRotLock"
+   Public Const K_DC_FLAT_CHAINEDPATH As String = "ChainedPath"
    Public Const K_DC_FLATT_POSX As String = "FlattPosX"
    Public Const K_DC_FLATT_POSY As String = "FlattPosY"
    Public Const K_DC_POLISH_NAME As String = "PolishName"
@@ -301,6 +343,9 @@ Module ConstIni
    Public Const K_DC_TEST_LENGTH As String = "TestLength"
    Public Const K_DC_TEST_ANGH As String = "TestAngH"
    Public Const K_DC_TEST_OFFSET As String = "TestOffset"
+   Public Const K_DC_OFFSET_SQUARING As String = "OffsetSquaring"
+   Public Const K_DC_EXTRA_LEN_SQUARING As String = "ExtraLenSquaring"
+   Public Const K_ENABLEINVERT As String = "EnableInvert"
 
    Public Const S_STATDATA As String = "StatData"
    Public Const K_SD_DAY As String = "Day"

Constants/ConstKitData.vb

@@ -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"

Constants/ConstMachIni.vb

@@ -5,6 +5,7 @@
 
    Public Const S_PARTPROGRAM As String = "PartProgram"
    Public Const K_EXTENSION As String = "Extension"
+   Public Const K_EXTFILECN As String = "ExtFileCN"
 
    Public Const S_AXES As String = "Axes"
    Public Const K_AXESNUM As String = "AxesNum"
@@ -44,6 +45,21 @@
    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_NCFANUC As String = "NcFanuc"
+   Public Const K_SETNCMODE As String = "SetNcMode"
+   Public Const K_BASEADDRINT As String = "BaseAddrInt"
+   Public Const K_BASEADDRBIT As String = "BaseAddrBit"
+   Public Const K_NUMVARINT As String = "NumVarInt"
+   Public Const K_NUMVARBIT As String = "NumVarBit"
+
+   Public Const S_EXECLUA As String = "ExecLua"
+   Public Const K_FILESCRIPT_LUA As String = "FileScript"
+
+   Public Const S_CAMERAHQ As String = "CameraHQ"
+   Public Const K_CAMERAHQ_ENABLE As String = "EnableHQ"
+   Public Const K_CAMERAHQ_ACTIVATE As String = "ActivateHQ"
 
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
@@ -74,9 +90,16 @@
    Public Const K_TABLEDOWN As String = "TableDown"
    Public Const K_MANUAL As String = "Manual"
    Public Const K_DOORCLOSED As String = "DoorClosed"
+   Public Const K_DOOROPENDED As String = "DoorOpened"
    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 BTN_ENABLE_ZONE_1 As String = "EnableZone1"
+   Public Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
+   Public Const BTN_ENABLE_PC As String = "EnablePC"
    Public Const K_VACUUMUP As String = "VacuumUp"
    Public Const K_VACUUMDOWN As String = "VacuumDown"
    Public Const K_VACUUM2UP As String = "Vacuum2Up"
@@ -103,6 +126,10 @@
    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"
+   Public Const K_NAXES As String = "nAxes"
+   Public Const K_RESETSTATUS As String = "ResetStatus"
    ' Nuove variabili
    Public Const K_SPEEDHOLD As String = "SpeedHold"
    Public Const K_XYJOG As String = "XYJog"
@@ -133,6 +160,10 @@
    Public Const K_PRODLIPROBINGTCPOS2VAR As String = "ProbingTcPos2Var"
    Public Const K_PRODLISAWDIAMETER2VAR As String = "SawDiameter2Var"
 
+   Public Const S_POLISHLINE As String = "PolishLine"
+   Public Const K_CLICKSTATE As String = "ClickState"
+   Public Const k_CLICKDIR As String = "ClickDir"
+
    Public Const S_STATISTICS As String = "Stats"
    Public Const K_DATADIR As String = "DataDir"
    Public Const K_SHOWAREAS As String = "ShowAreas"
@@ -149,6 +180,8 @@
    Public Const K_PHOTO_OFFSETY As String = "OffsetY"
    Public Const K_PHOTO_TAB2_OFFSETX As String = "Tab2OffsetX"
    Public Const K_PHOTO_TAB2_OFFSETY As String = "Tab2OffsetY"
+   Public Const K_PHOTO_HQ_OFFSETX As String = "HQOffsetX"
+   Public Const K_PHOTO_HQ_OFFSETY As String = "HQOffsetY"
 
    Public Const S_TOOLS As String = "Tools"
    Public Const K_DRILLBIT As String = "Drillbit"
@@ -198,6 +231,7 @@
    Public Const K_MACH_MILLING_ON_SINKS As String = "MillingOnSinks"
    Public Const K_MACH_MILLING_SHORTENING As String = "MillingShortening"
    Public Const K_MACH_ENGRAVING_WITHMILL As String = "EngravingWithMill"
+   Public Const K_MACH_STARTCENERTOOLPATH As String = "StartCenterToolPath"
    Public Const K_MACH_ENGRAVING_DEPTH As String = "EngravingDepth"
    Public Const K_MACH_ENGRAVING_WIDTH As String = "EngravingWidth"
    Public Const K_MACH_NEST_ALIGNED As String = "Aligned"
@@ -209,7 +243,13 @@
    Public Const K_MACH_CUTFSEVENABLE As String = "CutFsevEnable"
    Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
    Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
-   ' DrillMillC90
+   Public Const K_USELASERORIGIN As String = "UseLaserOrigin"
+   Public Const K_HOLES_DIAMITERWJ As String = "HolesDiameterWJ"
+   Public Const K_HOLES_OFFSETWJ As String = "HolesOffsetWJ"
+   Public Const K_MIN_RADIUSWJ As String = "MinRadiusWJ"
+   Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners"
+   Public Const K_MACH_RECTIFICATION_ON_SUBSQUARE As String = "RectificationSubSqWJ"
+   Public Const K_MACH_DRILL_MILL_C90 As String = "DrillMillC90"
    ' CutLongDxSx
    ' AngRotMultiCut
    ' MinDistHeadsMultiCut
@@ -221,6 +261,13 @@
    Public Const S_MACH_RAWMOVE As String = "RawMove"
    Public Const K_MACH_RM_ROTATE As String = "Rotate"
    Public Const K_MACH_RM_FINALMOVE As String = "FinalMove"
+   Public Const K_MACH_WEIGHT_SINGLEPLUGGER As String = "MaxWeightSinglePlugger"
+   Public Const K_MACH_WEIGHT_DOUBLEPLUGGER As String = "MaxWeightDoublePlugger"
+   Public Const K_MACH_ROTATEVACUUMFOREXTRASTROKEY As String = "RotateVacuumForExtraStrokeY"
+   Public Const K_MACH_ROTATEVACUUMFOREXTRASTROKEX As String = "RotateVacuumForExtraStrokeX"
+
+   Public Const K_ISNEWSCRAPS As String = "IsNewScraps"
+   Public Const K_DATABASEID As String = "DatabaseID"
 
    Public Const S_MACH_REG As String = "Reg"
    Public Const K_MACH_MAX_ROT_ANG As String = "MaxRotAng"
@@ -244,10 +291,12 @@
 
    Public Const S_MACH_INPROGRESS As String = "InProgress"
    Public Const K_PHASEVAR As String = "PhaseVar"
+   Public Const K_WP_STEPTIME As String = "WPStepTime"
 
    Public Const S_MACH_PROBING As String = "Probing"
    Public Const K_PROBINGSTATEVAR As String = "ProbingStateVar"
    Public Const K_SAWDIAMETER As String = "SawDiameter"
+   Public Const K_TOOLLENGTH As String = "ToolLength"
    Public Const K_RAWTHICKNESS As String = "RawThickness"
    Public Const K_ENABLERAWPROBE As String = "EnableRawProbe"
 
@@ -276,9 +325,12 @@
    Public Const K_CURRDRIPSAWING As String = "CurrDripSawing"
    Public Const K_CURRDRIPDRILLING As String = "CurrDripDrilling"
    Public Const K_CURRWATERJETTING As String = "CurrWaterJetting"
+   Public Const K_CURRWATERJETTINGQUALITY As String = "CurrWaterJettingQualilty"
 
    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"
+   Public Const K_AVERAGEDENSITY As String = "AverageDensity"
 
 End Module

DirectCuts/ControlsDirectCutUC.xaml

@@ -0,0 +1,177 @@
+<UserControl x:Class="ControlsDirectCutUC"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             DataContext="Self"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagCUT="clr-namespace:OmagCUT"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
+
+   <Grid Name="LeftButtonGrid" Grid.Row="1" >
+      <Grid.RowDefinitions>
+         <!--<RowDefinition Height="1*"/>
+            <RowDefinition Height="7*"/>-->
+         <RowDefinition Height="9*"/>
+      </Grid.RowDefinitions>
+      <!-- Definizione della Grid laterale -->
+      <Grid Name="CutTypeGrid" Grid.Row="1" >
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <!--<RowDefinition Height="1*"/>-->
+         </Grid.RowDefinitions>
+         <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"                    
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Movimento-manualeImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="ManualTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="SingleCutBtn" Grid.Row="1"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SingleCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="MultipleCutBtn" Grid.Row="2"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-multiploImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="MultipleCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="GridCutBtn" Grid.Row="3"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-grigliaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="GridCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+
+         <Button Name="SingleDrillBtn" Grid.Row="4"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Foro-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SingleDrillTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="FlatteningCutBtn" Grid.Row="5"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource SpianaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="FlatteningCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <!--<Button Name="PolishingBtn" Grid.Row="6"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="PolishingTxt" Grid.Column="1"
+                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>-->
+
+         <!--<Button Name="CopyTemplateBtn" Grid.Row="7"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>-->
+
+         <Button Name="SquaringBtn" Grid.Row="6"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SquaringTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <!--<Button Name="SawTestBtn" Grid.Row="6"
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="140"/>
+                    </Grid.ColumnDefinitions>
+                    <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                    <TextBlock Name="SawTestTxt" Grid.Column="1"
+                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                </Grid>
+            </Button>-->
+
+         <Grid Name="ChangeUCGrid" Grid.Row="7">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Button Name="ChangeUCBtn" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Grid>
+                  <!--<Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />-->
+                  <TextBlock Name="ChangeUCTxBl" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               </Grid>
+            </Button>
+         </Grid>
+
+      </Grid>
+   </Grid>
+</UserControl>

DirectCuts/ControlsDirectCutUC.xaml.vb

@@ -0,0 +1,268 @@
+Imports EgtUILib
+Public Class ControlsDirectCutUC
+
+   ' Dichiarazione delle Page UserControl
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   ' ---- MAI USATA ---- nuova finestra per i comandi per il taglio manuale nuovo
+   Friend m_SingleCutAuto As SingleCutAuto
+   ' ---- MAI USATA ----
+   Friend m_MachineButtons As MachineButtonsUC
+   Friend m_ManualAxesMove As ManualAxesMoveUC
+   Friend m_SingleCut As SingleCutUC
+   Friend m_SingleDrill As SingleDrillUC
+   Friend m_MultipleCut As MultipleCut
+   Friend m_GridCut As GridCut
+   Friend m_FlatteningCut As FlatteningCut
+   Friend m_Squaring As SquaringUC
+   Friend m_ControlsMachineButton As ControlsMachineButtonUC
+   Friend m_VacuumMachineButton As VacuumMachineButtonUC
+
+   Friend m_ControlDirectCutPage1 As ControlsDirectCutUC1
+
+   ' Stato di visualizzazione della macchina
+   Friend m_bShowMachine As Boolean = False
+   Friend m_nMachLook As Integer = MCH_LOOK.ALL
+   ' Dati generali CN
+   Friend m_CN As CN_generico
+   Private m_bFirst As Boolean = True
+   ' Riferimento alla pagina correntemente attiva
+   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
+   ' Variabili che indicano attivazione paginette con bottoni macchina
+   Private m_ControlsBtn_IsActive As Boolean
+
+   Public Shared m_dZSafe As Double = 52
+
+   ' Variabile che indica se sono attivi i bottoni macchina nuovi o vecchi
+   Friend m_NewMachineButtonsType As Boolean
+   ' Indica che la finestra del talio Singolo deve essere di tipo manuale
+   Friend m_bManulaCut As Boolean = False
+
+   ' elenco dei nuovi bottoni
+   Private m_ButtonJogList As New List(Of MachineButton)
+
+   Enum DirectCutPages
+      ' pagina principale di tagli diretti
+      DirectCut
+      ' nuova pagina di tagli diretti
+      DirectCut1
+      ' elenco dei comandi associati
+      ManualAxesMove
+      SingleCut
+      MultipleCut
+      GridCut
+      FlatteningCut
+      Polishing
+      CopyTemplate
+      SawTest
+      SingleCutAuto
+      SingleDrill
+      Squaring
+   End Enum
+
+   Private Sub ControlsDirectCutUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' leggo la configurazione del programma per i nuovi tagli manuali
+      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
+
+      'Creazione delle Page UserControl
+      m_MachineButtons = New MachineButtonsUC
+      m_ManualAxesMove = New ManualAxesMoveUC
+      m_SingleCut = New SingleCutUC
+      m_SingleDrill = New SingleDrillUC
+      m_MultipleCut = New MultipleCut
+      m_GridCut = New GridCut
+      m_FlatteningCut = New FlatteningCut
+      m_Squaring = New SquaringUC
+      m_ControlsMachineButton = New ControlsMachineButtonUC
+      m_VacuumMachineButton = New VacuumMachineButtonUC
+      ' reiferimento alla pagina succesiva
+      m_ControlDirectCutPage1 = New ControlsDirectCutUC1
+      ' Costruisco la finestra per il nuovo tipo di taglio manuale
+      m_SingleCutAuto = New SingleCutAuto
+
+      'Posizionemento nella griglia delle Page UserControl DirectCutPageUC
+      m_MachineButtons.SetValue(Grid.RowProperty, 2)
+      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
+      m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
+      If m_bManulaCut Then
+         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
+      Else
+         m_SingleCut.SetValue(Grid.RowProperty, 1)
+      End If
+      m_SingleDrill.SetValue(Grid.RowProperty, 1)
+      m_MultipleCut.SetValue(Grid.RowProperty, 1)
+      m_GridCut.SetValue(Grid.RowProperty, 1)
+      m_FlatteningCut.SetValue(Grid.RowProperty, 1)
+      m_Squaring.SetValue(Grid.RowProperty, 1)
+      m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
+      m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)
+
+      ' ManualBtn.Content = EgtMsg(90201)
+      ManualTxt.Text = EgtMsg(90201)
+      'SingleCutBtn.Content = EgtMsg(90202)
+      SingleCutTxt.Text = EgtMsg(90202)
+      'SingleDrillBtn.Content = "Foro singolo"
+      SingleDrillTxt.Text = EgtMsg(90258)
+      'MultipleCutBtn.Content = EgtMsg(90203)
+      MultipleCutTxt.Text = EgtMsg(90203)
+      'GridCutBtn.Content = EgtMsg(90204)
+      GridCutTxt.Text = EgtMsg(90204)
+      'FlatteningCutBtn.Content = EgtMsg(90206)
+      FlatteningCutTxt.Text = EgtMsg(90206)
+      ' 90261=Squaring
+      SquaringTxt.Text = EgtMsg(90261)
+      ' 90409=Others
+      ChangeUCTxBl.Text = EgtMsg(90409)
+
+   End Sub
+
+   Private Sub ControlsDirectCutUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      ' Se rientro da simulazione
+      If m_ActiveDirectCutPage = DirectCutPages.SingleCut Then
+         LeftButtonGrid.Children.Add(m_SingleCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto Then
+         LeftButtonGrid.Children.Add(m_SingleCutAuto)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.MultipleCut Then
+         LeftButtonGrid.Children.Add(m_MultipleCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.GridCut Then
+         LeftButtonGrid.Children.Add(m_GridCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.FlatteningCut Then
+         LeftButtonGrid.Children.Add(m_FlatteningCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleDrill Then
+         LeftButtonGrid.Children.Add(m_SingleDrill)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.Squaring Then
+         LeftButtonGrid.Children.Add(m_Squaring)
+         Return
+      End If
+
+      If m_MainWindow.m_DirectCutPageUC.m_ActiveControl <> DirectCutPageUC.Controls.MachineButtonUC Or
+         m_MainWindow.m_DirectCutPageUC.m_ActiveControl <> DirectCutPageUC.Controls.VacuumButtonUC Then
+         ' Caso standard
+         m_ActiveDirectCutPage = DirectCutPages.DirectCut
+      End If
+
+      ' 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
+      Else
+         SingleCutBtn.IsEnabled = bRawOk
+      End If
+      MultipleCutBtn.IsEnabled = bRawOk
+      GridCutBtn.IsEnabled = bRawOk
+      SingleDrillBtn.IsEnabled = (bRawOk And bH1Exists)
+      FlatteningCutBtn.IsEnabled = (bRawOk And bH1Exists)
+      SquaringBtn.IsEnabled = bRawOk
+
+      ' aggiorno la visualizzazione dei parametri
+      ReloadParam()
+
+      ' Nascondo i pezzi in parcheggio
+      HideParkedParts()
+      EgtZoom(ZM.ALL)
+
+   End Sub
+
+   ' ricarico i parametri utensili per definizione 
+   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
+      If Not bSaw Then
+         EgtOutLog(" WARNING! Impossible to get point from SAW, there isn't SAW or SAWING! It's available only by DRAW")
+      End If
+      m_SingleCut.SetEnableParam(bSaw)
+      m_MultipleCut.SetEnableParam(bSaw)
+      m_GridCut.SetEnableParam(bSaw)
+   End Sub
+
+#Region "COMMAND CLICK BTN"
+
+   Private Sub ManualBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualBtn.Click
+      LeftButtonGrid.Children.Add(m_ManualAxesMove)
+      m_ActiveDirectCutPage = DirectCutPages.ManualAxesMove
+   End Sub
+
+   Private Sub SingleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleCutBtn.Click
+      If m_bManulaCut Then
+         LeftButtonGrid.Children.Add(m_SingleCutAuto)
+         m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto
+      Else
+         LeftButtonGrid.Children.Add(m_SingleCut)
+         m_ActiveDirectCutPage = DirectCutPages.SingleCut
+      End If
+
+   End Sub
+
+   Private Sub MultipleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles MultipleCutBtn.Click
+      LeftButtonGrid.Children.Add(m_MultipleCut)
+      m_ActiveDirectCutPage = DirectCutPages.MultipleCut
+   End Sub
+
+   Private Sub GridCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles GridCutBtn.Click
+      LeftButtonGrid.Children.Add(m_GridCut)
+      m_ActiveDirectCutPage = DirectCutPages.GridCut
+   End Sub
+
+   Private Sub FlatteningCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FlatteningCutBtn.Click
+      LeftButtonGrid.Children.Add(m_FlatteningCut)
+      m_ActiveDirectCutPage = DirectCutPages.FlatteningCut
+   End Sub
+
+   Private Sub SquaringBtn_Click(sender As Object, e As RoutedEventArgs) Handles SquaringBtn.Click
+      LeftButtonGrid.Children.Add(m_Squaring)
+      m_ActiveDirectCutPage = DirectCutPages.Squaring
+   End Sub
+
+   Private Sub SingleDrillBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleDrillBtn.Click
+      LeftButtonGrid.Children.Add(m_SingleDrill)
+      m_ActiveDirectCutPage = DirectCutPages.SingleDrill
+   End Sub
+
+   ' cambio pagina
+   Private Sub ChangeUCBtn_Click(sender As Object, e As RoutedEventArgs) Handles ChangeUCBtn.Click
+      DirectCutPage_Unloaded(Nothing, Nothing)
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut
+      m_MainWindow.m_DirectCutPageUC.LoadDirectCutUC1()
+   End Sub
+
+#End Region    ' Command Click Btn
+
+
+   Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+      Select Case m_ActiveDirectCutPage
+         Case DirectCutPages.DirectCut Or DirectCutPages.ManualAxesMove
+            ' Non è necessario fare alcunché
+         Case DirectCutPages.SingleCut
+            LeftButtonGrid.Children.Remove(m_SingleCut)
+         Case DirectCutPages.SingleCutAuto
+            LeftButtonGrid.Children.Remove(m_SingleCutAuto)
+         Case DirectCutPages.MultipleCut
+            LeftButtonGrid.Children.Remove(m_MultipleCut)
+         Case DirectCutPages.GridCut
+            LeftButtonGrid.Children.Remove(m_GridCut)
+         Case DirectCutPages.FlatteningCut
+            LeftButtonGrid.Children.Remove(m_FlatteningCut)
+         Case DirectCutPages.SingleDrill
+            LeftButtonGrid.Children.Remove(m_SingleDrill)
+         Case DirectCutPages.Squaring
+            LeftButtonGrid.Children.Remove(m_Squaring)
+      End Select
+   End Sub
+
+End Class

DirectCuts/ControlsDirectCutUC1.xaml

@@ -0,0 +1,86 @@
+<UserControl x:Class="ControlsDirectCutUC1"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             DataContext="Self"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagCUT="clr-namespace:OmagCUT"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
+
+   <Grid Name="LeftButtonGrid" Grid.Row="1" >
+      <Grid.RowDefinitions>
+         <!--<RowDefinition Height="1*"/>
+            <RowDefinition Height="7*"/>-->
+         <RowDefinition Height="9*"/>
+      </Grid.RowDefinitions>
+      <!-- Definizione della Grid laterale -->
+      <Grid Name="CutTypeGrid" Grid.Row="1" >
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <!--<RowDefinition Height="1*"/>-->
+         </Grid.RowDefinitions>
+
+         <Button Name="SawTestBtn" Grid.Row="0"
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SawTestTxt" Grid.Column="1"
+                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="PolishingBtn" Grid.Row="1"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="PolishingTxt" Grid.Column="1"
+                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="CopyTemplateBtn" Grid.Row="2"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Grid Name="ChangeUC1Grid" Grid.Row="7">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Button Name="ChangeUC1Btn" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Grid>
+                  <Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
+                  <!--<TextBlock Name="LabelCompo9" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>-->
+               </Grid>
+            </Button>
+         </Grid>
+
+      </Grid>
+   </Grid>
+</UserControl>

DirectCuts/ControlsDirectCutUC1.xaml.vb

@@ -0,0 +1,145 @@
+Imports EgtUILib
+Public Class ControlsDirectCutUC1
+
+   ' Dichiarazione delle Page UserControl
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Friend m_Polishing As Polishing
+   Friend m_CopyTemplate As CopyTemplateUC
+   Friend m_SawTest As SawTestUC
+
+   ' Stato di visualizzazione della macchina
+   Friend m_bShowMachine As Boolean = False
+   Friend m_nMachLook As Integer = MCH_LOOK.ALL
+   ' Dati generali CN
+   Friend m_CN As CN_generico
+   Private m_bFirst As Boolean = True
+   ' Riferimento alla pagina correntemente attiva
+   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
+   ' Variabili che indicano attivazione paginette con bottoni macchina
+   Private m_ControlsBtn_IsActive As Boolean
+
+   Public Shared m_dZSafe As Double = 52
+
+   ' Variabile che indica se sono attivi i bottoni macchina nuovi o vecchi
+   Friend m_NewMachineButtonsType As Boolean
+   ' Indica che la finestra del talio Singolo deve essere di tipo manuale
+   Friend m_bManulaCut As Boolean = False
+
+   Enum DirectCutPages
+      DirectCut
+      DirectCut1
+      Polishing
+      CopyTemplate
+      SawTest
+   End Enum
+
+   Private Sub ControlsDirectCutUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' leggo la configurazione del programma per i nuovi tagli manuali
+      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
+
+      'Creazione delle Page UserControl
+      m_SawTest = New SawTestUC
+      m_Polishing = New Polishing
+      m_CopyTemplate = New CopyTemplateUC
+
+      'Posizionemento nella griglia delle Page UserControl
+      m_SawTest.SetValue(Grid.RowProperty, 1)
+      m_Polishing.SetValue(Grid.RowProperty, 1)
+      m_CopyTemplate.SetValue(Grid.RowProperty, 1)
+
+      ' assegno i nomi ai pulsanti
+      SawTestTxt.Text = EgtMsg(90207)
+      PolishingTxt.Text = EgtMsg(90231)
+      'CopyTemplateBtn.Content = EgtMsg(90209)
+      CopyTemplateTxt.Text = EgtMsg(90209)
+      'SquaringTxt.Text = "Squaring"
+
+   End Sub
+
+   Private Sub ControlsDirectCutUC1_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      ' Se rientro da simulazione
+      If m_ActiveDirectCutPage = DirectCutPages.SawTest Then
+         LeftButtonGrid.Children.Add(m_SawTest)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.CopyTemplate Then
+         Me.LeftButtonGrid.Children.Add(m_CopyTemplate)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.Polishing Then
+         Me.LeftButtonGrid.Children.Add(m_Polishing)
+         Return
+      End If
+
+      ' Caso standard
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut1
+
+      ' 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)
+
+      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
+      SawTestBtn.IsEnabled = (bRawOk And bH1Exists)
+      CopyTemplateBtn.IsEnabled = bH1Exists
+
+      ' aggiorno la visualizzazione dei parametri
+      ReloadParam()
+
+      ' Nascondo i pezzi in parcheggio
+      HideParkedParts()
+      EgtZoom(ZM.ALL)
+
+   End Sub
+
+   ' ricarica i dati utensili
+   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
+      If Not bSaw Then
+         EgtOutLog(" WARNING! Impossible to get point from SAW, there isn't SAW or SAWING! It's available only by DRAW")
+      End If
+      'm_SingleCut.SetEnableParam(bSaw)
+      'm_MultipleCut.SetEnableParam(bSaw)
+      'm_GridCut.SetEnableParam(bSaw)
+   End Sub
+
+#Region "COMMAND CLICK BTN"
+   Private Sub SawTestBtn_Click(sender As Object, e As RoutedEventArgs) Handles SawTestBtn.Click
+      LeftButtonGrid.Children.Add(m_SawTest)
+      m_ActiveDirectCutPage = DirectCutPages.SawTest
+   End Sub
+
+   Private Sub PolishingBtn_Click(sender As Object, e As RoutedEventArgs) Handles PolishingBtn.Click
+      LeftButtonGrid.Children.Add(m_Polishing)
+      m_ActiveDirectCutPage = DirectCutPages.Polishing
+   End Sub
+
+   Private Sub CopyTemplateBtn_Click(sender As Object, e As RoutedEventArgs) Handles CopyTemplateBtn.Click
+      LeftButtonGrid.Children.Add(m_CopyTemplate)
+      m_ActiveDirectCutPage = DirectCutPages.CopyTemplate
+   End Sub
+
+   Private Sub ChangeUC1Btn_Click(sender As Object, e As RoutedEventArgs) Handles ChangeUC1Btn.Click
+      DirectCutPage_Unloaded(Nothing, Nothing)
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut1
+      m_MainWindow.m_DirectCutPageUC.LoadDirectCutUC()
+   End Sub
+
+#End Region    ' Command Click Btn
+
+   Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+      Select Case m_ActiveDirectCutPage
+         Case DirectCutPages.SawTest
+            LeftButtonGrid.Children.Remove(m_SawTest)
+         Case DirectCutPages.Polishing
+            LeftButtonGrid.Children.Remove(m_Polishing)
+         Case DirectCutPages.CopyTemplate
+            LeftButtonGrid.Children.Remove(m_CopyTemplate)
+      End Select
+   End Sub
+
+End Class

DirectCuts/ControlsMachineButtonUC.xaml.vb

@@ -23,6 +23,9 @@ Public Class ControlsMachineButtonUC
    Friend m_CN As CN_generico
    Private m_bFirst As Boolean = True
 
+   ' visualizzo l'elenco degli elementi della pagina sono al primo avvio
+   Friend Shared m_OutLogTypeButton As Boolean = True
+
    ' Creazione converter da String a ImageSource
    Dim ImageConverter As New ImageSourceConverter
 
@@ -72,10 +75,37 @@ Public Class ControlsMachineButtonUC
                If Not IsNothing(ButtonToAdd) Then m_ButtonList.Add(ButtonToAdd)
             End If
          End While
+
+         For Each MachineButton As MachineButton In m_ButtonList
+            GetTypeButton(MachineButton)
+         Next
+         m_OutLogTypeButton = False
+
          NotifyPropertyChanged("ButtonList")
       End If
    End Sub
 
+#Region "STATE CHANGED"
+   ' ------------------------------------------------------------------------------
+   ' i segeunti metodi notificano il cambiamento di stato di specifici bottoni
+   '-------------------------------------------------------------------------------
+
+   Friend Sub GetTypeButton(CurrMachineButton As MachineButton)
+      If Not m_OutLogTypeButton Then Return
+      Dim BtnType As Type = CurrMachineButton.GetType
+      If BtnType Is GetType(NoStateButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(0) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(TwoStateButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(1) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(ThreeStateButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(2) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(DoubleCommandButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(3) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(PressedCommandButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(4) ") & " , " & CurrMachineButton.StateFlag)
+      End If
+   End Sub
+
    Friend Sub SpindleStateChanged(SpindleState As Boolean)
       Dim SpindleButton As TwoStateButton = Nothing
       For Each MachineButton As MachineButton In m_ButtonList
@@ -255,38 +285,34 @@ Public Class ControlsMachineButtonUC
       Dim DoorOpenedButton As ThreeStateButton = Nothing
       For Each MachineButton As MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_DOORCLOSED Then
-            'If TypeOf MachineButton Is NoStateButton Then
-            '   DoorClosedButton = DirectCast(MachineButton, NoStateButton)
-            'ElseIf TypeOf MachineButton Is TwoStateButton Then
-            '   DoorClosedButton = DirectCast(MachineButton, TwoStateButton)
-            'ElseIf TypeOf MachineButton Is ThreeStateButton Then
-            '   DoorClosedButton = DirectCast(MachineButton, ThreeStateButton)
-            'ElseIf TypeOf MachineButton Is DoubleCommandButton Then
-            '   DoorClosedButton = DirectCast(MachineButton, DoubleCommandButton)
-            'ElseIf TypeOf MachineButton Is PressedCommandButton Then
-            '   DoorClosedButton = DirectCast(MachineButton, PressedCommandButton)
-            'End If
             DoorClosedButton = MachineButton
          End If
-         If MachineButton.StateFlag = "DoorOpened" Then
+         If MachineButton.StateFlag = K_DOOROPENDED Then
             DoorOpenedButton = MachineButton
          End If
       Next
+      ' Chiusura porte (gesrtione comando Three/Two state
       If Not IsNothing(DoorClosedButton) Then
          Select Case DoorClosedState
             Case 0
+               ' porta aperta
                DoorClosedButton.Background = Application.Current.FindResource("OmagCut_Red")
             Case 1, 2
+               ' porta in movimento/aperta
                DoorClosedButton.Background = Application.Current.FindResource("OmagCut_LightGray")
          End Select
       End If
+      ' Chiusura porte (gesrtione comando Three/Two state
       If Not IsNothing(DoorOpenedButton) Then
          Select Case DoorClosedState
             Case 0
+               ' porta aperta
                DoorOpenedButton.Background = Application.Current.FindResource("OmagCut_LightGray")
             Case 1
+               ' porta in movimento 
                DoorOpenedButton.Background = Application.Current.FindResource("OmagCut_Yellow")
             Case 2
+               ' porta chiusa
                DoorOpenedButton.Background = Application.Current.FindResource("OmagCut_Green")
          End Select
       End If
@@ -330,6 +356,78 @@ 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
+
+   Friend Sub ZoneStateChanged(ZoneState As Integer)
+      Dim bEnableZone1 As Boolean = False
+      If ZoneState = 1 Then
+         bEnableZone1 = True
+      ElseIf ZoneState = 2 Then
+         bEnableZone1 = False
+      End If
+      ' attivo il comando associato
+      Dim EnableZoneButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonList
+         If MachineButton.StateFlag = BTN_ENABLE_ZONE_1 Then
+            EnableZoneButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(EnableZoneButton) Then
+         EnableZoneButton.SetIsChecked(bEnableZone1)
+      End If
+      ' disattivo l'altro per esclusione
+      EnableZoneButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonList
+         If MachineButton.StateFlag = BTN_ENABLE_ZONE_2 Then
+            EnableZoneButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(EnableZoneButton) Then
+         EnableZoneButton.SetIsChecked(Not bEnableZone1)
+      End If
+   End Sub
+
+   Friend Sub PcStateChanged(EnablePC As Integer)
+      Dim bEnablePC1 As Boolean = False
+      If EnablePC = 1 Then
+         bEnablePC1 = True
+      ElseIf EnablePC = 2 Then
+         bEnablePC1 = False
+      End If
+      ' attivo/disattivo il comando associato
+      Dim EnablePCButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonList
+         If MachineButton.StateFlag = K_ENABLEPC & "_1" Then
+            EnablePCButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(EnablePCButton) Then
+         EnablePCButton.SetIsChecked(bEnablePC1)
+      End If
+      ' disattivo/attivo l'altro per esclusione
+      EnablePCButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonList
+         If MachineButton.StateFlag = BTN_ENABLE_ZONE_2 Then
+            EnablePCButton = MachineButton
+         End If
+      Next
+      If Not IsNothing(EnablePCButton) Then
+         EnablePCButton.SetIsChecked(Not bEnablePC1)
+      End If
+   End Sub
+
+#End Region    ' State Range
+
    Public Function GetPrivateProfileMachineButtons(
                          ByVal lpAppName As String,
                          ByVal lpKeyName As String,
@@ -402,6 +500,8 @@ Public MustInherit Class MachineButton
    Friend Const BTN_STATE_THREEAXIS As String = "ThreeAxis"
    Friend Const BTN_STATE_FIVEAXIS As String = "FiveAxis"
    Friend Const BTN_STATE_NOTHING As String = "Nothing"
+   Friend Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
+   Friend Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
 
    ' Dichiarazione delle Page UserControl
    Friend Shared m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
@@ -524,13 +624,64 @@ Public MustInherit Class MachineButton
                   EgtOutLog("dopo scrittura seconda variabile")
                End If
                Return
+            Case 4
+               ' ------------------------------------ FANUC ------------------------------------
+               ' eventuale scrittura di linea di comando MDI
+               If Not String.IsNullOrEmpty(CmdString) Then
+                  ' attivo mpdalità MDI
+                  m_CN.DGeneralFunctions_WriteCncMode(2)
+                  System.Threading.Thread.Sleep(100)
+                  ' salvo la stringa di comando ricevuta dal file lua
+                  m_CN.sz_ManualDataInput = CmdString
+                  ' esguo la funzione che ha il compito di scrivere il comando MDI
+                  m_CN.MDI_command()
+               End If
+               ' attivo modalità AUTO
+               m_CN.DGeneralFunctions_WriteCncMode(7)
+               System.Threading.Thread.Sleep(100)
+               If String.IsNullOrEmpty(EValue) Then
+                  ' EActive: impulsivo "D#####"
+                  m_CN.NC_pulse_bit(ENumber)
+                  EgtOutLog("Fanuc_DNumber= " & ENumber)
+               Else
+                  ' EActive + EValue: scrittura comando invariabile Short oppure Bit
+                  If ENumber.Contains(".") Then
+                     ' D#####.#
+                     Dim bEValue As Boolean
+                     If EValue.Trim = "1" Then bEValue = True
+                     m_CN.NC_write_var_bit(ENumber, CBool(EValue))
+                  Else
+                     ' D#####
+                     m_CN.NC_write_var_short(ENumber, CShort(EValue))
+                  End If
+                  EgtOutLog("Fanuc_DNumber= " & ENumber & " DValue= " & EValue)
+               End If
+               ' eventale caricamento seconda variabile
+               If String.IsNullOrEmpty(EValue2) Then
+                  ' EActive: impulsivo "D#####"
+                  m_CN.NC_pulse_bit(ENumber2)
+                  EgtOutLog("Fanuc_DNumber= " & ENumber2)
+               Else
+                  ' EActive + EValue: scrittura comando invariabile Short oppure Bit
+                  If ENumber2.Contains(".") Then
+                     ' D#####.#
+                     Dim bEValue2 As Boolean
+                     If EValue2.Trim = "1" Then bEValue2 = True
+                     m_CN.NC_write_var_bit(ENumber2, CBool(EValue2))
+                  Else
+                     ' D#####
+                     m_CN.NC_write_var_short(ENumber2, CShort(EValue2))
+                  End If
+                  EgtOutLog("Fanuc_DNumber2= " & ENumber2 & " DValue2= " & EValue2)
+               End If
+               Return
          End Select
       End If
       '--------------------------------------------------------- MDI ---------------------------------------------------------
       Dim nResult As Short
       ' assegno la modalità di funzionamento
       Select Case m_MainWindow.m_CNCommunication.m_nNCType
-         Case 1, 2
+         Case 1, 2, 4
             nResult = m_CN.DGeneralFunctions_WriteCncMode(2)     ' Modalità MDI per controlli num
          Case 3
             'Per il siemens non devo fare nulla
@@ -554,7 +705,7 @@ Public MustInherit Class MachineButton
          m_CN.DGeneralFunctions_CycleStart()
       End If
       System.Threading.Thread.Sleep(300)
-      ' riprostino la modalità manuale
+      ' ripristino la modalità manuale..?? siucuri ??
       nResult = m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
    End Sub
 
@@ -575,6 +726,7 @@ Public MustInherit Class MachineButton
          EgtTdbGetCurrToolParam(MCH_TP.FEED, dFeed)
       End If
       EgtLuaSetGlobNumVar("CMD.F", dFeed)
+
       Dim dSpeed As Double = 0
       If Not String.IsNullOrWhiteSpace(m_DirectCutPage.m_ManualAxesMove.SpeedTxBx.Text) Then
          StringToDouble(m_DirectCutPage.m_ManualAxesMove.SpeedTxBx.Text, dSpeed)
@@ -583,6 +735,18 @@ Public MustInherit Class MachineButton
          EgtTdbGetCurrToolParam(MCH_TP.SPEED, dSpeed)
       End If
       EgtLuaSetGlobNumVar("CMD.S", dSpeed)
+
+      ' versione 2.5e1
+      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
+      Dim sToolPos As String = String.Empty
+      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
+         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
+      End If
+      Dim dToolDiam As Double = 0
+      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
+         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
+      End If
+
       Dim dL1, dL2, dL3, dR1, dR2 As Double
       m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
       EgtLuaSetGlobNumVar("CMD.L1", dL1)
@@ -591,8 +755,17 @@ Public MustInherit Class MachineButton
       EgtLuaSetGlobNumVar("CMD.R1", dR1)
       EgtLuaSetGlobNumVar("CMD.R2", dR2)
       EgtLuaSetGlobBoolVar("CMD.INCHES", m_MainWindow.m_CNCommunication.GetMachineInInches())
+
+      ' versione 2.6h1
+      Dim sCurrTable As String = String.Empty
+      Dim nCuttTable As Integer = 1
+      EgtGetTableName(sCurrTable)
+      If sCurrTable <> "MainTab" Then nCuttTable = 2
+      EgtLuaSetGlobIntVar("CMD.TABLE", nCuttTable)
+
       EgtLuaCallFunction("CmdString")
-      ' Leggo variabili
+
+      ' Leggo variabili da file Lua
       CmdString = String.Empty
       EgtLuaGetGlobStringVar("CMD.CMDSTRING", CmdString)
       b2Start = False
@@ -647,12 +820,28 @@ 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
+         Dim sLuaScriptFile As String = m_MainWindow.m_CurrentMachine.sMachDir & "\DirectCmd\"
          If value Then
+            sLuaScriptFile &= TLuaScriptName
             ExecuteMDICommand(TLuaScriptName)
          Else
+            sLuaScriptFile &= FLuaScriptName
             ExecuteMDICommand(FLuaScriptName)
          End If
+
+         Dim IsPressedShiftKey As Boolean = False
+         If Keyboard.Modifiers And ModifierKeys.Shift And
+            GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0, m_MainWindow.GetIniFile()) > 4 Then IsPressedShiftKey = True
+         ' procedo all'apertura del file CadCut1 appena generato (solo se generazione corretta)
+         If IsPressedShiftKey Then
+            Try
+               Process.Start("Notepad.exe", sLuaScriptFile)
+            Catch ex As Exception
+               EgtOutLog(ex.ToString)
+            End Try
+         End If
       End Set
    End Property
    Friend Sub SetIsChecked(value As Boolean)
@@ -743,6 +932,7 @@ Public Class NoStateButton
             ExecuteMDICommand(TLuaScriptName)
          End If
       Else
+         ' FANUC, SIEMENS
          ExecuteMDICommand(TLuaScriptName)
       End If
    End Sub

DirectCuts/CopyTemplateUC.xaml.vb

@@ -5,6 +5,8 @@ Public Class CopyTemplateUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   Private m_refControlDirectCutUC As ControlsDirectCutUC1
+
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Array stringhe modalità di acquisizione dei punti
@@ -59,6 +61,7 @@ Public Class CopyTemplateUC
 
    Private Sub CopyTemplate_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       SaveBtn.IsEnabled = False
       LineBtn.IsChecked = True
@@ -163,6 +166,15 @@ Public Class CopyTemplateUC
    Private Sub Point1Btn_Click(sender As Object, e As RoutedEventArgs) Handles Point1Btn.Click
       ' Verifico configurazione tavola e grezzo
       If Not m_bTabOk Then Return
+
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      ' Ricavo dati lama corrente
+      Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      If bIsMultiCut Then
+         EgtSetCalcTool(sSaw, "H1", 1)
+      End If
+
       ' Se acquisizione lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
@@ -170,14 +182,19 @@ Public Class CopyTemplateUC
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then
             Return
          End If
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Se punto da laser
          If PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
          ' Altrimenti da lama
@@ -185,7 +202,7 @@ Public Class CopyTemplateUC
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
          End If
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
@@ -193,8 +210,6 @@ Public Class CopyTemplateUC
       Else
          ' Verifico presenza punto da mouse
          If Not m_bMouseOk Then Return
-         ' 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
          ' Assegno punto selezionato nel disegno a m_ptTipP1
@@ -254,8 +269,7 @@ Public Class CopyTemplateUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
-      m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function EraseCopyTemplatePart() As Boolean

DirectCuts/DirectCutPageUC.xaml

@@ -28,10 +28,10 @@
             <ColumnDefinition Width="7*"/>
          </Grid.ColumnDefinitions>
 
-          <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+         <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
-            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
 
@@ -42,25 +42,27 @@
 
       </Grid>
 
-         <!-- Definizione della Grid laterale -->
-      <Grid Name="LeftButtonGrid" Grid.Row="1" >
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="7*"/>
-         </Grid.RowDefinitions>
-
-         <!-- Definizione della Grid laterale -->
-         <Grid Name="CutTypeGrid" Grid.Row="1" >
+      <!-- Definizione della Grid laterale -->
+      <!--
+        <Grid Name="LeftButtonGrid" Grid.Row="1" >
             <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="7*"/>
+            </Grid.RowDefinitions>
+
+            -->
+      <!-- Definizione della Grid laterale -->
+      <!--<Grid Name="CutTypeGrid" Grid.Row="1" >
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
                 <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"                    
                         Style="{DynamicResource OmagCut_YellowIconButton}">
@@ -140,7 +142,7 @@
                                    Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
                     </Grid>
                 </Button>
-             
+
                 <Button Name="PolishingBtn" Grid.Row="6"
                         Style="{DynamicResource OmagCut_YellowIconButton}">
                     <Grid>
@@ -154,36 +156,51 @@
                     </Grid>
                 </Button>
 
-                <Button Name="CopyTemplateBtn" Grid.Row="7"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="140"/>
-                    </Grid.ColumnDefinitions>
-                    <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                    <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                </Grid>
-            </Button>
-             
-            <Button Name="SawTestBtn" Grid.Row="8"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="140"/>
-                    </Grid.ColumnDefinitions>
-                    <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="SawTestTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-            </Button>
+                -->
+      <!--<Button Name="CopyTemplateBtn" Grid.Row="7"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>-->
+      <!--
+                <Button Name="SquaringBtn" Grid.Row="7"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="SquaringTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>
+
+                <Button Name="SawTestBtn" Grid.Row="8"
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="SawTestTxt" Grid.Column="1"
+                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>
+
+            </Grid>-->
+      <!--
+
+        </Grid>-->
 
-        </Grid>
-      
-      </Grid>
-      
       <!-- Definizione della Grid laterale per bottoni macchina -->
       <Grid Name="MachineButtonGrid" Grid.Row="1">
          <Grid.RowDefinitions>
@@ -201,9 +218,13 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <!--<ColumnDefinition Width="1*"/>-->
+            <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
          <ToggleButton Name="ControlsMachineBtn" Grid.Column="0"
@@ -215,23 +236,23 @@
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
             <Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
-          
-          <!--Comando asse X-Y-->
-          <ToggleButton Name="XYBtn" Grid.Column="2"
+
+         <!--Comando asse X-Y-->
+         <ToggleButton Name="XYBtn" Grid.Column="2"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-                <Image Source="{DynamicResource XYJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource XYJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
-          
-          <!--Comando asse Z-C-->
-          <ToggleButton Name="ZCBtn" Grid.Column="3"   
+
+         <!--Comando asse Z-C-->
+         <ToggleButton Name="ZCBtn" Grid.Column="3"   
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-              <Image Source="{DynamicResource ZCJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
-          </ToggleButton>
+            <Image Source="{DynamicResource ZCJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         </ToggleButton>
 
          <!--Comando asse Z-B-->
          <ToggleButton Name="ZBBtn" Grid.Column="4"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-                <Image Source="{DynamicResource ZBJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ZBJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
 
          <!--Comando Remote-->
@@ -239,8 +260,18 @@
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
             <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
          </ToggleButton>
-         <Button Name="ManualModeBtn" Grid.Column="8"
-               Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+
+         <!--Parking-->
+         <ToggleButton Name="ParkingBtn" Grid.Column="6"
+              Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+            <Image Source="{DynamicResource ParkingImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         </ToggleButton>
+          
+          
+
+         <!--Comando Manula/MDI-->
+         <Button Name="ManualModeBtn" Grid.Column="11"
+                Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
             <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </Button>
 

DirectCuts/DirectCutPageUC.xaml.vb

@@ -7,18 +7,20 @@ Public Class DirectCutPageUC
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Friend m_MachineButtons As MachineButtonsUC
    Friend m_ManualAxesMove As ManualAxesMoveUC
-   Friend m_SingleCut As SingleCutUC
-   Friend m_SingleDrill As SingleDrillUC
-   ' nuova finestra per i comandi per il taglio manuale nuovo
-   Friend m_SingleCutAuto As SingleCutAuto
-   Friend m_MultipleCut As MultipleCut
-   Friend m_GridCut As GridCut
-   Friend m_FlatteningCut As FlatteningCut
-   Friend m_Polishing As Polishing
-   Friend m_CopyTemplate As CopyTemplateUC
-   Friend m_SawTest As SawTestUC
+
    Friend m_ControlsMachineButton As ControlsMachineButtonUC
    Friend m_VacuumMachineButton As VacuumMachineButtonUC
+   Friend m_ControlsDirectCutUC As ControlsDirectCutUC
+   Friend m_ControlsDirectCutUC1 As ControlsDirectCutUC1
+
+   Friend m_ActiveControl As Controls
+   Enum Controls
+      DirectCutUC
+      DirectCutUC1
+      MachineButtonUC
+      VacuumButtonUC
+   End Enum
+
 
    ' Stato di visualizzazione della macchina
    Friend m_bShowMachine As Boolean = False
@@ -26,8 +28,6 @@ Public Class DirectCutPageUC
    ' Dati generali CN
    Friend m_CN As CN_generico
    Private m_bFirst As Boolean = True
-   ' Riferimento alla pagina correntemente attiva
-   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
    ' Variabili che indicano attivazione paginette con bottoni macchina
    Private m_ControlsBtn_IsActive As Boolean
 
@@ -41,117 +41,46 @@ Public Class DirectCutPageUC
    ' elenco dei nuovi bottoni
    Private m_ButtonJogList As New List(Of MachineButton)
 
-   Enum DirectCutPages
-      DirectCut
-      ManualAxesMove
-      SingleCut
-      MultipleCut
-      GridCut
-      FlatteningCut
-      Polishing
-      CopyTemplate
-      SawTest
-      SingleCutAuto
-      SingleDrill
-   End Enum
 
    Private Sub DirectCutPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      ' leggo la configurazione del programma per i nuovi tagli manuali
-      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
-
       'Creazione delle Page UserControl
       m_MachineButtons = New MachineButtonsUC
       m_ManualAxesMove = New ManualAxesMoveUC
-      m_SingleCut = New SingleCutUC
-      m_SingleDrill = New SingleDrillUC
-      m_MultipleCut = New MultipleCut
-      m_GridCut = New GridCut
-      m_FlatteningCut = New FlatteningCut
-      m_Polishing = New Polishing
-      m_CopyTemplate = New CopyTemplateUC
-      m_SawTest = New SawTestUC
       m_ControlsMachineButton = New ControlsMachineButtonUC
       m_VacuumMachineButton = New VacuumMachineButtonUC
-      ' Costruisco la finestra per il nuovo tipo di taglio manuale
-      m_SingleCutAuto = New SingleCutAuto
+      m_ControlsDirectCutUC = New ControlsDirectCutUC
+      m_ControlsDirectCutUC1 = New ControlsDirectCutUC1
 
       'Posizionemento nella griglia delle Page UserControl
       m_MachineButtons.SetValue(Grid.RowProperty, 2)
-      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
+      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, m_MachineButtons.nCountButton)
       m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
-      If m_bManulaCut Then
-         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
-      Else
-         m_SingleCut.SetValue(Grid.RowProperty, 1)
-      End If
-      m_SingleDrill.SetValue(Grid.RowProperty, 1)
-      m_MultipleCut.SetValue(Grid.RowProperty, 1)
-      m_GridCut.SetValue(Grid.RowProperty, 1)
-      m_FlatteningCut.SetValue(Grid.RowProperty, 1)
-      m_Polishing.SetValue(Grid.RowProperty, 1)
-      m_CopyTemplate.SetValue(Grid.RowProperty, 1)
-      m_SawTest.SetValue(Grid.RowProperty, 1)
+
+      m_ControlsDirectCutUC.SetValue(Grid.RowProperty, 1)
+      m_ControlsDirectCutUC1.SetValue(Grid.RowProperty, 1)
       m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
       m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)
 
       ' verifico che sia presente almeno uno dei bottoni della nuova console (SOLO PER MACCHINA CON paragrafo [ControlMachButtons])
       Dim bCollapsedNewBottonsConsole As Boolean = Not m_ControlsMachineButton.GetPrivateProfileMachineButtons("JogButtons", "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
       m_NewMachineButtonsType = m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
+      ' verifico che sia presente almeno uno dei bottoni della nuova console (SOLO PER MACCHINA CON paragrafo [VacuumMachButtons])
+      Dim bCollapsedVacuumButton As Boolean = Not m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_VACUUMMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
       If Not m_NewMachineButtonsType Then
          'Assegno MachineButtons alla pagina
          LowerButtonGrid.Children.Add(m_MachineButtons)
          ControlsMachineBtn.Visibility = Windows.Visibility.Collapsed
          VacuumMachineBtn.Visibility = Windows.Visibility.Collapsed
       End If
-
-      If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
-         ManualBtn.IsEnabled = False
-         ManualModeBtn.Visibility = Windows.Visibility.Hidden
+      ' se non sono configurate le ventose allora nascondo il comando
+      If m_NewMachineButtonsType AndAlso bCollapsedVacuumButton Then
+         VacuumMachineBtn.Visibility = Windows.Visibility.Collapsed
       End If
 
-      ' ManualBtn.Content = EgtMsg(90201)
-      ManualTxt.Text = EgtMsg(90201)
-      'SingleCutBtn.Content = EgtMsg(90202)
-      SingleCutTxt.Text = EgtMsg(90202)
-      'SingleDrillBtn.Content = "Foro singolo"
-      SingleDrillTxt.Text = EgtMsg(90258)
-      'MultipleCutBtn.Content = EgtMsg(90203)
-      MultipleCutTxt.Text = EgtMsg(90203)
-      'GridCutBtn.Content = EgtMsg(90204)
-      GridCutTxt.Text = EgtMsg(90204)
-      'FlatteningCutBtn.Content = EgtMsg(90206)
-      FlatteningCutTxt.Text = EgtMsg(90206)
-      'PolishingBtn.Content = EgtMsg(90231)
-      PolishingTxt.Text = EgtMsg(90231)
-      'CopyTemplateBtn.Content = EgtMsg(90209)
-      CopyTemplateTxt.Text = EgtMsg(90209)
-      'SawTestBtn.Content = EgtMsg(90207)
-      SawTestTxt.text = EgtMsg(90207)
-
-
       ' nuovi bottoni 20/05/2021 - modifica specifiche 04/08/2021
       ' 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
@@ -195,53 +124,12 @@ Public Class DirectCutPageUC
       ' lo stato di questi comandi vieni carico dalla lettura del PLC (refresh)
       '----------- FINE NUOVI BOTTONI------------
 
-      ' Se rientro da simulazione
-      If m_ActiveDirectCutPage = DirectCutPages.SingleCut Then
-         LeftButtonGrid.Children.Add(m_SingleCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto Then
-         LeftButtonGrid.Children.Add(m_SingleCutAuto)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.MultipleCut Then
-         LeftButtonGrid.Children.Add(m_MultipleCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.GridCut Then
-         LeftButtonGrid.Children.Add(m_GridCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.FlatteningCut Then
-         LeftButtonGrid.Children.Add(m_FlatteningCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.Polishing Then
-         LeftButtonGrid.Children.Add(m_Polishing)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SawTest Then
-         LeftButtonGrid.Children.Add(m_SawTest)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleDrill Then
-         LeftButtonGrid.Children.Add(m_SingleDrill)
-         Return
-      End If
-
-      ' Caso standard
-      m_ActiveDirectCutPage = DirectCutPages.DirectCut
+      LoadLastDirectCutControls()
 
       ' Se macchina fotografica abilitata
       PhotoBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO)
-
-      ' Attivo le lavorazioni solo se esiste il grezzo
-      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
-      If m_bManulaCut Then
-         ' anche se non è presente un grezzo mantengo abilitato il bottone
-         SingleCutBtn.IsEnabled = True
-      Else
-         SingleCutBtn.IsEnabled = bRawOk
-      End If
-      MultipleCutBtn.IsEnabled = bRawOk
-      GridCutBtn.IsEnabled = bRawOk
-      SingleDrillBtn.IsEnabled = bRawOk
-      FlatteningCutBtn.IsEnabled = bRawOk
-      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
-      SawTestBtn.IsEnabled = bRawOk
+      ' aggiorno la visualizzazione dei parametri
+      ReloadParam()
 
       ' Nascondo i pezzi in parcheggio
       HideParkedParts()
@@ -249,11 +137,29 @@ 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
+      If Not bSaw Then
+         EgtOutLog(" WARNING! Impossible to get point from SAW, there isn't SAW or SAWING! It's available only by DRAW")
+      End If
+      m_ControlsDirectCutUC.m_SingleCut.SetEnableParam(bSaw)
+      m_ControlsDirectCutUC.m_MultipleCut.SetEnableParam(bSaw)
+      m_ControlsDirectCutUC.m_GridCut.SetEnableParam(bSaw)
+   End Sub
+
    Private Sub SetVisibilityJogButtuns()
       XYBtn.Visibility = Visibility.Collapsed
       ZCBtn.Visibility = Visibility.Collapsed
       ZBBtn.Visibility = Visibility.Collapsed
       RemoteBtn.Visibility = Visibility.Collapsed
+      ParkingBtn.Visibility = Visibility.Collapsed
 
       Dim Item As MachineButton = Nothing
       For Each Item In m_ButtonJogList
@@ -274,6 +180,10 @@ Public Class DirectCutPageUC
                RemoteBtn.Visibility = Visibility.Visible
                RemoteBtn.Foreground = Brushes.White
                RemoteBtn.Content = "Remote"
+            Case K_PARKING
+               ParkingBtn.Visibility = Visibility.Visible
+               ParkingBtn.Foreground = Brushes.White
+               ParkingBtn.ToolTip = "Parking"
          End Select
       Next
    End Sub
@@ -302,63 +212,13 @@ Public Class DirectCutPageUC
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
    End Sub
 
-   Private Sub ManualBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualBtn.Click
-      LeftButtonGrid.Children.Add(m_ManualAxesMove)
-      m_ActiveDirectCutPage = DirectCutPages.ManualAxesMove
-   End Sub
-
-   Private Sub SingleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleCutBtn.Click
-      If m_bManulaCut Then
-         LeftButtonGrid.Children.Add(m_SingleCutAuto)
-         m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto
-      Else
-         LeftButtonGrid.Children.Add(m_SingleCut)
-         m_ActiveDirectCutPage = DirectCutPages.SingleCut
-      End If
-
-   End Sub
-
-   Private Sub MultipleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles MultipleCutBtn.Click
-      LeftButtonGrid.Children.Add(m_MultipleCut)
-      m_ActiveDirectCutPage = DirectCutPages.MultipleCut
-   End Sub
-
-   Private Sub GridCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles GridCutBtn.Click
-      LeftButtonGrid.Children.Add(m_GridCut)
-      m_ActiveDirectCutPage = DirectCutPages.GridCut
-   End Sub
-
-   Private Sub FlatteningCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FlatteningCutBtn.Click
-      LeftButtonGrid.Children.Add(m_FlatteningCut)
-      m_ActiveDirectCutPage = DirectCutPages.FlatteningCut
-   End Sub
-
-   Private Sub PolishingBtn_Click(sender As Object, e As RoutedEventArgs) Handles PolishingBtn.Click
-      LeftButtonGrid.Children.Add(m_Polishing)
-      m_ActiveDirectCutPage = DirectCutPages.Polishing
-   End Sub
-
-   Private Sub CopyTemplateBtn_Click(sender As Object, e As RoutedEventArgs) Handles CopyTemplateBtn.Click
-      LeftButtonGrid.Children.Add(m_CopyTemplate)
-      m_ActiveDirectCutPage = DirectCutPages.CopyTemplate
-   End Sub
-
-   Private Sub SawTestBtn_Click(sender As Object, e As RoutedEventArgs) Handles SawTestBtn.Click
-      LeftButtonGrid.Children.Add(m_SawTest)
-      m_ActiveDirectCutPage = DirectCutPages.SawTest
-   End Sub
-
-   Private Sub SingleDrillBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleDrillBtn.Click
-      LeftButtonGrid.Children.Add(m_SingleDrill)
-      m_ActiveDirectCutPage = DirectCutPages.SingleDrill
-   End Sub
-
    Private Sub ControlsMachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles ControlsMachineBtn.Click
       If ControlsMachineBtn.IsChecked Then
          m_ControlsMachineButton = New ControlsMachineButtonUC
          m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
          m_NewMachineButtonsType = m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
          MachineButtonGrid.Children.Add(m_ControlsMachineButton)
+         m_ActiveControl = Controls.MachineButtonUC
          If VacuumMachineBtn.IsChecked Then
             MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
             VacuumMachineBtn.IsChecked = False
@@ -371,6 +231,7 @@ Public Class DirectCutPageUC
    Private Sub VacuumMachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles VacuumMachineBtn.Click
       If VacuumMachineBtn.IsChecked Then
          MachineButtonGrid.Children.Add(m_VacuumMachineButton)
+         m_ActiveControl = Controls.VacuumButtonUC
          If ControlsMachineBtn.IsChecked Then
             MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
             ControlsMachineBtn.IsChecked = False
@@ -380,7 +241,21 @@ Public Class DirectCutPageUC
       End If
    End Sub
 
-   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
+   Friend Sub LoadDirectCutUC()
+      ManageControls()
+      m_ActiveControl = Controls.DirectCutUC
+      MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
+   End Sub
+
+   Friend Sub LoadDirectCutUC1()
+      ManageControls()
+      m_ActiveControl = Controls.DirectCutUC1
+      MachineButtonGrid.Children.Add(m_ControlsDirectCutUC1)
+   End Sub
+
+
+#Region "[JogButtons]"
+
    Private Sub XYBtn_Click(sender As Object, e As RoutedEventArgs) Handles XYBtn.Click
       ' riverco in elenco il bottone XYJog
       Dim XYJogButton As MachineButton = Nothing
@@ -510,17 +385,57 @@ Public Class DirectCutPageUC
       End If
    End Sub
 
-   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
+   Private Sub ParkingBtn_Click(sender As Object, e As RoutedEventArgs) Handles ParkingBtn.Click
+      Dim ParkingButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_PARKING Then
+            ParkingButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(ParkingButton) Then Return
+      ' eseguo lo script lua associato
+      Dim CurrentBtn As Primitives.ToggleButton = e.Source
+      Dim sLuaFileName As String = String.Empty
+      ' verifico lo stato del bottone per avviare il giusto script
+      If CurrentBtn.IsChecked() Then
+         sLuaFileName = ParkingButton.TLuaScriptName
+      Else
+         sLuaFileName = ParkingButton.FLuaScriptName
+      End If
+      ParkingButton.ExecuteMDICommand(sLuaFileName)
+   End Sub
+
+   Friend Sub ParkingStateChanged(bParkingState As Boolean)
+      ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
+      Dim ParkingButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonJogList
+         If MachineButton.StateFlag.Trim = K_PARKING Then
+            ParkingButton = MachineButton
+            Exit For
+         End If
+      Next
+      If Not IsNothing(ParkingButton) Then
+         ParkingButton.SetIsChecked(bParkingState)
+         ParkingButton.IsChecked = bParkingState
+      End If
+   End Sub
+
+#End Region    '[JogButtons]
+
    Private Sub MachViewModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachViewModeBtn.Click
       If m_bShowMachine Then
          ' aggiorno lo stato
          Select Case m_nMachLook
-         Case MCH_LOOK.ALL
-            m_nMachLook = MCH_LOOK.TAB_HEAD
-         Case MCH_LOOK.TAB_HEAD
-            m_nMachLook = MCH_LOOK.TAB_TOOL
-         Case Else
-            m_nMachLook = MCH_LOOK.ALL
+            Case MCH_LOOK.ALL
+               m_nMachLook = MCH_LOOK.TAB_HEAD
+            Case MCH_LOOK.TAB_HEAD
+               m_nMachLook = MCH_LOOK.TAB_TOOL
+            Case MCH_LOOK.TAB_TOOL
+               m_nMachLook = MCH_LOOK.TAB
+            Case Else
+               m_nMachLook = MCH_LOOK.ALL
          End Select
          ' aggiorno lo stato della macchina e la sua visualizzazione
          EgtSetMachineLook(m_nMachLook)
@@ -529,36 +444,40 @@ Public Class DirectCutPageUC
    End Sub
 
    Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
-      Select Case m_ActiveDirectCutPage
-         Case DirectCutPages.DirectCut Or DirectCutPages.ManualAxesMove
-            ' Non è necessario fare alcunché
-         Case DirectCutPages.SingleCut
-            LeftButtonGrid.Children.Remove(m_SingleCut)
-         Case DirectCutPages.SingleCutAuto
-            LeftButtonGrid.Children.Remove(m_SingleCutAuto)
-         Case DirectCutPages.MultipleCut
-            LeftButtonGrid.Children.Remove(m_MultipleCut)
-         Case DirectCutPages.GridCut
-            LeftButtonGrid.Children.Remove(m_GridCut)
-         Case DirectCutPages.FlatteningCut
-            LeftButtonGrid.Children.Remove(m_FlatteningCut)
-         Case DirectCutPages.Polishing
-            LeftButtonGrid.Children.Remove(m_Polishing)
-         Case DirectCutPages.CopyTemplate
-            LeftButtonGrid.Children.Remove(m_CopyTemplate)
-         Case DirectCutPages.SawTest
-            LeftButtonGrid.Children.Remove(m_SawTest)
-         Case DirectCutPages.SingleDrill
-            LeftButtonGrid.Children.Remove(m_SingleDrill)
+      ManageControls()
+   End Sub
+
+   Friend Sub ManageControls()
+      Select Case m_ActiveControl
+         Case Controls.DirectCutUC
+            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC)
+            m_ControlsDirectCutUC.DirectCutPage_Unloaded(Nothing, Nothing)
+         Case Controls.DirectCutUC1
+            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC1)
+            m_ControlsDirectCutUC1.DirectCutPage_Unloaded(Nothing, Nothing)
+         Case Controls.MachineButtonUC
+            MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
+            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC)
+            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC1)
+            ControlsMachineBtn.IsChecked = False
+         Case Controls.VacuumButtonUC
+            MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
+            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC)
+            MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
+            VacuumMachineBtn.IsChecked = False
+      End Select
+   End Sub
+
+   Friend Sub LoadLastDirectCutControls()
+      Select Case m_ActiveControl
+         Case Controls.DirectCutUC
+            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
+         Case Controls.DirectCutUC1
+            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC1)
+         Case Else
+            m_ActiveControl = Controls.DirectCutUC
+            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
       End Select
-      If ControlsMachineBtn.IsChecked Then
-         MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
-         ControlsMachineBtn.IsChecked = False
-      End If
-      If VacuumMachineBtn.IsChecked Then
-         MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
-         VacuumMachineBtn.IsChecked = False
-      End If
    End Sub
 
    Private Sub ManualModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualModeBtn.Click

DirectCuts/FlatteningCut.xaml

@@ -7,142 +7,185 @@
    mc:Ignorable="d" 
    d:DesignHeight="597.3" d:DesignWidth="256">
 
-   <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
-   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
+    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
+    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
 
-      <!-- Definizione della Grid FlatteningCut -->
-      <Grid Name="FlatteningCutGrid" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/> 
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
+            <!-- Definizione della Grid FlatteningCut -->
+            <Grid Name="FlatteningCutGrid" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="1*"/>
+                </Grid.RowDefinitions>
 
-         <Grid Grid.Row="0" Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
+                <Grid Grid.Row="0" Grid.ColumnSpan="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
+                    <ToggleButton Name="Point1Btn" Grid.Column="0"
                Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+                        <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                    </ToggleButton>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
+                    <ToggleButton Name="Point2Btn" Grid.Column="1"
                Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+                        <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                    </ToggleButton>
 
-            </Grid>
+                </Grid>
 
-         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
-            <ComboBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-               </DataTemplate>
-            </ComboBox.ItemTemplate>
-         </ComboBox>
 
-         <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
+            <ScrollViewer VerticalScrollBarVisibility="Visible" Visibility="Visible"
+                          Grid.Row="1" Grid.RowSpan="11" Grid.ColumnSpan="2">
+
+                <Grid Name="DatiTaglioGrid" >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="0.1"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="0.1"/>
+                    </Grid.RowDefinitions>
+
+                    <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
+                <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
+                <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
+                <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="4"
+                <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+                <EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="WidthTxBl" Grid.Column="0" Grid.Row="5"
+                <TextBlock Name="WidthTxBl" Grid.Column="0" Grid.Row="5"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
+                <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="OverlapTxBl" Grid.Column="0" Grid.Row="6"
+                <TextBlock Name="OverlapTxBl" Grid.Column="0" Grid.Row="6"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OverlapTxBx" Grid.Column="1" Grid.Row="6" Margin="0,0,6,0"
+                <EgtWPFLib:EgtTextBox Name="OverlapTxBx" Grid.Column="1" Grid.Row="6" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-            <TextBlock Name="ZReleasedTxBl" Grid.Column="0" Grid.Row="7"
+                <TextBlock Name="ZReleasedTxBl" Grid.Column="0" Grid.Row="7"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="ZReleasedTxBx" Grid.Column="1" Grid.Row="7" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>          
+                <EgtWPFLib:EgtTextBox Name="ZReleasedTxBx" Grid.Column="1" Grid.Row="7" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="SideTxBl" Grid.Row="8" Grid.ColumnSpan="2"
+                <TextBlock Name="SideTxBl" Grid.Row="8" Grid.ColumnSpan="2"
              Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <CheckBox Name="SideChBx" Grid.Row="8" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                <CheckBox Name="SideChBx" Grid.Row="8" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
              HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
-         <ComboBox Name="TypeCmBx" Grid.Row="9" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
-            <ComboBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-               </DataTemplate>
-            </ComboBox.ItemTemplate>
-         </ComboBox>
+                <ComboBox Name="TypeCmBx" Grid.Row="9" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
 
-         <TextBlock Name="RotLockTxBl" Grid.Row="10" Grid.ColumnSpan="2"
+                <TextBlock Name="RotLockTxBl" Grid.Row="10" Grid.ColumnSpan="2"
              Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <CheckBox Name="RotLockChBx" Grid.Row="10" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                <CheckBox Name="RotLockChBx" Grid.Row="10" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
              HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
-         <Grid Grid.Row="11" Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-            <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-            <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-         </Grid>
+                    <TextBlock Name="ChainedPathTxBl" Grid.Row="11" Grid.ColumnSpan="2"
+             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    <CheckBox Name="ChainedPathChBx" Grid.Row="11" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+             HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
-         <Grid Grid.Row="12" Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
+                    <ComboBox Name="SelToolCmBx" Grid.Row="12" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <Grid Grid.Row="13" Grid.ColumnSpan="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="0.5*"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="0.5*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
+               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                    <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                    <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
+               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                    <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                </Grid>
+
+                </Grid>    
+            </ScrollViewer>
+
+            <Grid Grid.Row="12" Grid.ColumnSpan="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+                        <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                    </Button>
+                    <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                        <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                    </Button>
+                    <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                    </Button>
+                </Grid>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
             </Grid>
-
-      </Grid>
-
-   </Border>
+        
+    </Border>
 
 </UserControl>

DirectCuts/FlatteningCut.xaml.vb

@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.Reflection
+Imports EgtUILib
+Imports EgtUILib.EgtInterface
 
 Public Class FlatteningCut
 
@@ -35,14 +37,18 @@ Public Class FlatteningCut
    Private m_bHeadSide As Boolean = False
    Private m_nMachType As Integer = 1
    Private m_bRotLock As Boolean = False
+   Private m_bChainedPath As Boolean = True
+   Private m_nTool As Integer = 0
    ' Array delle modalità di acquisizione dei punti
    Private m_PointsModeArray(2) As String
    ' Array delle tipologia di lavorazione della spianatura
-   Private m_TypeArray(1) As String
+   Private m_TypeArray(2) As String
    ' Punto selezionato nel disegno
    Private m_ptPrev As Point3d
    ' Layer per crocette temporanee
    Private m_nTempLay As Integer = GDB_ID.NULL
+   ' Array degliutensili disponibili (lama e fresa)
+   Private m_ToolsArray(1) As String
 
    ' Costanti
    Private Const MAX_TAB_DEPTH As Double = 10.0
@@ -57,8 +63,9 @@ Public Class FlatteningCut
    End Enum
    ' Costanti che indicano la tipologia di lavorazione della spianatura
    Private Enum MACH_TYPE As Integer
-      ONEWAY = 0
-      ZIGZAG = 1
+      ZIGZAG = 0
+      ONEWAY = 1
+      SPIRAL = 2
    End Enum
    'Costante che indica il lato in cui posizionare i tagli
    Private Enum CutSide As Integer
@@ -66,6 +73,12 @@ Public Class FlatteningCut
       Right
    End Enum
 
+   Private Enum TOOL As Integer
+      SAW = 0
+      MILL = 1
+   End Enum
+
+   ' Per abilitare la spianatura con la FRESA deve essere imposatato a TRUE il flag "Usa Fresa" nella pagina MACCHINA (campo INCISIONI)
    Private Sub FlatteningCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
       m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
@@ -74,8 +87,9 @@ Public Class FlatteningCut
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' Creo lista tipo lavorazione
-      m_TypeArray(MACH_TYPE.ONEWAY) = EgtMsg(MSG_COMBOBOXPARAM + 39)
       m_TypeArray(MACH_TYPE.ZIGZAG) = EgtMsg(MSG_COMBOBOXPARAM + 38)
+      m_TypeArray(MACH_TYPE.ONEWAY) = EgtMsg(MSG_COMBOBOXPARAM + 39)
+      m_TypeArray(MACH_TYPE.SPIRAL) = EgtMsg(MSG_COMBOBOXPARAM + 51)
       ' la associo alla combobox
       TypeCmBx.ItemsSource = m_TypeArray
       ' assegno messaggi
@@ -89,19 +103,26 @@ Public Class FlatteningCut
       ZReleasedTxBl.Text = "Z Svincolo"
       SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
       RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29)
+      ChainedPathTxBl.Text = "Chained path"
       SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
       OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      ' tipo di utensile in uso per la lavorazione
+      m_ToolsArray(TOOL.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
+      m_ToolsArray(TOOL.MILL) = "Mill"
+      SelToolCmBx.ItemsSource = m_ToolsArray
       ' Carico i dati dell'ultimo taglio
-      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
-      m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
-      m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_LENGTH, m_dLen, m_MainWindow.GetIniFile())
-      m_dWid = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_WIDTH, m_dWid, m_MainWindow.GetIniFile())
+      m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
+      m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
+      m_dLen = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_LENGTH, m_dLen, m_MainWindow.GetIniFile())
+      m_dWid = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_WIDTH, m_dWid, m_MainWindow.GetIniFile())
       m_dOverlap = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_OVERLAP, m_dOverlap, m_MainWindow.GetIniFile())
       m_dZReleased = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_Z_RELEASED, m_dZReleased, m_MainWindow.GetIniFile())
       m_bHeadSide = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_FLATT_HEADSIDE, 0, m_MainWindow.GetIniFile()) <> 0)
-      m_nMachType = GetPrivateProfileInt( S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType, m_MainWindow.GetIniFile())
-      m_bRotLock = ( GetPrivateProfileInt( S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, 0, m_MainWindow.GetIniFile()) <> 0)
-      m_ptTipP1.x = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
+      m_nMachType = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType, m_MainWindow.GetIniFile())
+      m_bRotLock = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, 0, m_MainWindow.GetIniFile()) <> 0)
+      m_bChainedPath = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_FLAT_CHAINEDPATH, 0, m_MainWindow.GetIniFile()) <> 0)
+      m_nTool = GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile())
+      m_ptTipP1.x = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
       m_ptTipP1.y = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile())
    End Sub
 
@@ -124,16 +145,16 @@ Public Class FlatteningCut
       ' Disabilito registrazione progetto modificato
       EgtDisableModified()
       ' Creo layer temporaneo per crocette
-      m_nTempLay = EgtCreateGroup( GDB_ID.ROOT)
-      EgtSetLevel( m_nTempLay, GDB_LV.TEMP)
+      m_nTempLay = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
       ' Origine tavola
       m_bRawOk = True
-      If Not EgtGetTableRef( 1, m_ptTabOri) Then
+      If Not EgtGetTableRef(1, m_ptTabOri) Then
          m_bRawOk = False
          EgtOutLog("Error on TableRef1")
       End If
       ' Dati del grezzo
-      If Not GetRawBox( m_ptRawMin, m_ptRawMax) Then
+      If Not GetRawBox(m_ptRawMin, m_ptRawMax) Then
          m_bRawOk = False
          EgtOutLog("Error on RawBox")
       End If
@@ -141,7 +162,7 @@ Public Class FlatteningCut
       m_bPointP1Ok = False
       m_bPointP2Ok = False
       ' Inizializzo primo punto acquisito dal disegno
-      m_ptPrev = m_ptTipP1 + ( m_ptTabOri - Point3d.ORIG())
+      m_ptPrev = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG())
       m_ptPrev.z = m_ptRawMax.z
       ' Disegno crocetta che indica il punto acquisito
       CreateCross(m_nTempLay, m_ptPrev)
@@ -150,10 +171,10 @@ Public Class FlatteningCut
       SetCoordVisibility(True)
       ShowCoord()
       ' Assegno parametri di lavorazione già definiti
-      DepthTxBx.Text = LenToString( m_dDepth, 1)
-      DirectionTxBx.Text = DoubleToString( m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
-      LenghtTxBx.Text = LenToString( m_dLen, 1)
-      WidthTxBx.Text = LenToString( m_dWid, 2)
+      DepthTxBx.Text = LenToString(m_dDepth, 1)
+      DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
+      LenghtTxBx.Text = LenToString(m_dLen, 1)
+      WidthTxBx.Text = LenToString(m_dWid, 2)
       OverlapTxBx.Text = LenToString(m_dOverlap, 2)
       ZReleasedTxBx.Text = LenToString(m_dZReleased, 2)
       ' carico la quota di svincolo per la spianatura
@@ -162,6 +183,9 @@ Public Class FlatteningCut
       SideChBx.IsChecked = m_bHeadSide
       TypeCmBx.SelectedIndex = m_nMachType
       RotLockChBx.IsChecked = m_bRotLock
+      ChainedPathChBx.IsChecked = m_bChainedPath
+      ' Assegno l'utensile in definito in macchina per la fresatura
+      SelToolCmBx.SelectedIndex = m_nTool
       ' Reset taglio e disabilito bottone esecuzione
       m_bCutOk = False
       UpdateSimulOkBtn()
@@ -175,21 +199,24 @@ Public Class FlatteningCut
 
    Friend Sub FlatteningCut_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       ' Salvo i dati correnti
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_DEPTH, DoubleToString( m_dDepth, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_ANGH, DoubleToString( m_dAngO, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_LENGTH, DoubleToString( m_dLen, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_WIDTH, DoubleToString( m_dWid, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_OVERLAP, DoubleToString(m_dOverlap, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_Z_RELEASED, DoubleToString(m_dZReleased, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_HEADSIDE, If( m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType.ToString(), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, If( m_bRotLock, "1", "0"), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString( m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_DEPTH, DoubleToString(m_dDepth, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_ANGH, DoubleToString(m_dAngO, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_LENGTH, DoubleToString(m_dLen, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_WIDTH, DoubleToString(m_dWid, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_OVERLAP, DoubleToString(m_dOverlap, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_Z_RELEASED, DoubleToString(m_dZReleased, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_HEADSIDE, If(m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType.ToString(), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, If(m_bRotLock, "1", "0"), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_POSX, DoubleToString(m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
       ' Se non vado in simulazione
       If Not m_bSimul Then
+         ' imposto la Z di sicurezza corretta
+         EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
+         EgtMdbSave()
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -264,30 +291,43 @@ Public Class FlatteningCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      ' Ricavo dati lama corrente
+      Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      If bIsMultiCut Then
+         EgtSetCalcTool(sSaw, "H1", 1)
+      End If
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Se punto da laser
          If PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Altrimenti da lama
          Else
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP1) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP1) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
@@ -297,15 +337,13 @@ Public Class FlatteningCut
          m_dAngO = dTAngO + 90
          DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
 
-      ' Altrimenti da disegno
+         ' Altrimenti da disegno
       Else
          ' Assegno punto selezionato nel disegno a m_ptTipP1
          m_ptTipP1 = m_ptPrev
          ' 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
       End If
@@ -335,27 +373,40 @@ Public Class FlatteningCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      ' Ricavo dati lama corrente
+      Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      If bIsMultiCut Then
+         EgtSetCalcTool(sSaw, "H1", 1)
+      End If
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Se punto da laser
          If PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Altrimenti da lama
          Else
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
          End If
          ' Calcolo direzione asse lama
          If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP2) Then Return
@@ -363,15 +414,13 @@ Public Class FlatteningCut
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
 
-      ' Altrimenti da disegno
+         ' Altrimenti da disegno
       Else
          ' Assegno punto selezionato nel disegno a m_ptTipP2
          m_ptTipP2 = m_ptPrev
          ' 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
       End If
@@ -405,7 +454,7 @@ Public Class FlatteningCut
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then
@@ -444,8 +493,8 @@ Public Class FlatteningCut
       StringToLen(WidthTxBx.Text, dWidth)
       ' Recupero lo spessore della lama corrente
       EgtTdbSetCurrTool(m_MainWindow.m_CurrentMachine.sCurrSaw)
-      Dim dThick As Double = 0
-      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      Dim dThick As Double = GetFootPrintTool()
+      'EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       ' La larghezza della spianatura nono può essere inferiore allo spessore della lama
       m_dWid = Math.Max(dWidth, dThick)
       WidthTxBx.Text = LenToString(m_dWid, 2)
@@ -472,8 +521,8 @@ Public Class FlatteningCut
 
    Private Sub OverlapTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OverlapTxBx.EgtClosed
       ' Recupero spessore della lama correntemente attiva
-      Dim dThick As Double = 0
-      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      Dim dThick As Double = GetFootPrintTool()
+      'EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       '  Verifico che la sovrapposizione non sia superiore allo spessore della lama (meno 1mm di offset)
       Dim dOverlap As Double = 0
       Const MIN_OFFSET As Double = 1.0
@@ -520,6 +569,16 @@ Public Class FlatteningCut
       EgtDraw()
    End Sub
 
+   Private Sub SelToolCmBx_SelectionChanged(sender As Object, e As EventArgs) Handles SelToolCmBx.SelectionChanged
+      m_nTool = SelToolCmBx.SelectedIndex
+      ' Disabilito il concatenamento
+      ChainedPathChBx.IsEnabled = (m_nTool = TOOL.MILL)
+      ' Disegno il taglio
+      CreateFlatteningCut()
+      SetMachineInCurrPos()
+      EgtDraw()
+   End Sub
+
    Private Sub RotLockChBx_Click(sender As Object, e As EventArgs) Handles RotLockChBx.Click
       m_bRotLock = RotLockChBx.IsChecked
       ' Disegno il taglio
@@ -528,6 +587,14 @@ Public Class FlatteningCut
       EgtDraw()
    End Sub
 
+   Private Sub ChainedPathChBx_Click(sender As Object, e As EventArgs) Handles ChainedPathChBx.Click
+      m_bChainedPath = ChainedPathChBx.IsChecked
+      ' Disegno il taglio
+      CreateFlatteningCut()
+      SetMachineInCurrPos()
+      EgtDraw()
+   End Sub
+
    Private Sub XcoordTxBx_EgtClosed(sender As Object, e As EventArgs) Handles XcoordTxBx.EgtClosed
       ' Recupero il valore della coordinata (in 0 Tab)
       Dim dXcoord As Double = 0
@@ -567,6 +634,7 @@ Public Class FlatteningCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -578,9 +646,9 @@ Public Class FlatteningCut
       m_CurrProjPage.SetWarningMessage("Trial Version")
 #Else
       ' Verifico non sia versione Ufficio
-      If m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.OFFICE_TYPE) Then
-          m_CurrProjPage.SetWarningMessage( "Office Version")
-          Return
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
+         m_CurrProjPage.SetWarningMessage("Office Version")
+         Return
       End If
       ' Verifico ci sia un taglio valido
       If Not m_bCutOk Then Return
@@ -595,13 +663,15 @@ Public Class FlatteningCut
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
          Return
       End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
       ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
          ' copio il progetto corrente come progetto in lavorazione
          Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
          My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
          ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript( True)
+         m_MainWindow.ExecSentProgScript(True)
       End If
 #End If
    End Sub
@@ -609,9 +679,30 @@ Public Class FlatteningCut
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
       EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
       EgtMdbSave()
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
+   ' ricavo l'ingombro di lavorazione in funzione dell'utensile selezionato
+   Private Function GetFootPrintTool() As Double
+      ' vedere nella pagina Allarm il capito "Incisioni"
+      Dim bForceUseMill As Boolean = (m_nTool = TOOL.MILL)
+      Dim dFootPrint As Double = 0
+      ' verifico quale lavorazione è attiva
+      If Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrSawing) AndAlso Not bForceUseMill Then
+         Dim bSetTool As Boolean = EgtTdbSetCurrTool(m_MainWindow.m_CurrentMachine.sCurrSaw)
+         If Not bSetTool Then EgtOutLog("Erro nel settaggio utensile lama " & m_MainWindow.m_CurrentMachine.sCurrSaw)
+         EgtTdbGetCurrToolParam(MCH_TP.THICK, dFootPrint)
+      ElseIf Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrMilling) Then
+         Dim sCurrMill = m_MainWindow.m_CurrentMachine.sCurrMill
+         'GetDrillFromDrilling(sCurrMill, m_MainWindow.m_CurrentMachine.sCurrMilling)
+         GetMillFromMilling(sCurrMill, m_MainWindow.m_CurrentMachine.sCurrMilling)
+         ' recupero informazioni della fresa in uso
+         EgtTdbSetCurrTool(sCurrMill)
+         EgtTdbGetCurrToolParam(MCH_TP.DIAM, dFootPrint)
+      End If
+      Return dFootPrint
+   End Function
+
    Private Function CreateFlatteningCut() As Boolean
       ' Verifico sia definito il punto iniziale e il grezzo
       If Not m_bPointP1Ok Or Not m_bRawOk Then
@@ -628,20 +719,30 @@ Public Class FlatteningCut
       Dim nPartId = EgtCreateGroup(GDB_ID.ROOT)
       EgtSetName(nPartId, NAME_DIRECTCUT)
       Dim nLayerId = EgtCreateGroup(nPartId)
-      EgtSetName(nLayerId, NAME_OUTLOOP)
+      ' EgtSetName(nLayerId, NAME_OUTLOOP)
+      EgtSetName(nLayerId, NAME_ONPATH)
       ' Creo il taglio
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
+      EgtSetInfo(nCutId, INFO_DIRECTCUT, 1)
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
+      If (m_nTool = TOOL.MILL) Then
+         EgtSetInfo(nCutId, INFO_WIDTH, GetFootPrintTool)
+      End If
       EgtSetInfo(nCutId, INFO_SIDE_ANGLE, 0)
       ' Imposto prima direzione
       EgtSetInfo(nCutId, INFO_DIR, 1)
+      ' Imposto se iniziare la fresatura dal punto indicato
+      Dim bReducePath As Boolean = Not GetPrivateProfileInt(S_MACH_NEST, K_MACH_STARTCENERTOOLPATH, 0, m_MainWindow.GetMachIniFile()) <> 0
+      If Not bReducePath Then EgtSetInfo(nCutId, INFO_STRICT, 0)
+
       ' Eventuale bloccaggio rotazione asse C tra le passate
       If RotLockChBx.IsChecked Then
          EgtSetInfo(nCutId, INFO_ENABLE_INVERT, False)
       End If
+      EgtSetInfo(nCutId, INFO_STEP_TYPE, m_nMachType)
       ' Funzione che crea i tagli successivi al primo
       MultiplyCut(nLayerId, nCutId)
       ' Creo layer per crocetta di riferimento
@@ -670,22 +771,28 @@ Public Class FlatteningCut
          RemoveFinalHome()
       End If
       UpdateSimulOkBtn()
-
-
-
       Return m_bCutOk
    End Function
 
    Private Function MultiplyCut(nLayerId As Integer, nCutId As Integer) As Boolean
-      ' Recupero spessore della lama correntemente attiva
-      Dim dThick As Double = 0
-      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      Dim bEngWithMill As Boolean = (m_nTool = TOOL.MILL)
+      Dim bReducePath As Boolean = Not GetPrivateProfileInt(S_MACH_NEST, K_MACH_STARTCENERTOOLPATH, 0, m_MainWindow.GetMachIniFile()) <> 0
+
+      ' Recupero spessore della lama (utensile) correntemente attiva
+      Dim dThick As Double = GetFootPrintTool()
+      If dThick = 0 Then Return False
+
+      ' Salvo la prima curva nella lista dei percorsi da concatenare
+      Dim CutsList As New List(Of Integer)
+      CutsList.Add(nCutId)
+
       ' Imposto angolo di rotazione a seconda del lato dei tagli
       Dim dRotAngO As Double = If(SideChBx.IsChecked(), -90, 90)
       ' Definisco vettore di spostamento
       Dim vtDelta As Vector3d
       vtDelta = Vector3d.FromPolar(1, m_dAngO)
       vtDelta.Rotate(Vector3d.Z_AX, dRotAngO)
+
       ' Calcolo numero di iterazioni necessarie a coprire l'area impostata e lunghezza vettore delta
       Dim nStepNum As Integer
       Dim dDelta As Double
@@ -696,6 +803,10 @@ Public Class FlatteningCut
       If nStepNum > 1 Then
          dDelta = dWidth / (nStepNum - 1)
       End If
+      ' definisco la larghezza dell'utensile (solo per la fresa)
+      EgtSetInfo(nCutId, INFO_WIDTH, dThick)
+      ' definisco il tipo di utensile da utilizzare
+      EgtSetInfo(nCutId, "EngravingWithMill", m_nTool)
       ' Creo vettore delta
       vtDelta *= dDelta
       ' Creo indice per impostare info che indica tipologia di spianatura
@@ -704,6 +815,8 @@ Public Class FlatteningCut
          Dim vtPerpMove As Vector3d = Index * vtDelta
          ' Creo copie
          Dim nCut2Id = EgtCopyGlob(nCutId, nLayerId)
+         EgtSetInfo(nCut2Id, INFO_WIDTH, dThick)
+         EgtSetInfo(nCutId, "EngravingWithMill", m_nTool)
          ' Assegno info direzione a seconda del tipo di spianatura
          If TypeCmBx.SelectedIndex = MACH_TYPE.ZIGZAG Then
             If nTypeIndex = 1 Then
@@ -717,10 +830,77 @@ Public Class FlatteningCut
             EgtSetInfo(nCut2Id, INFO_DIR, 1)
          End If
          EgtMove(nCut2Id, vtPerpMove, GDB_RT.GLOB)
+
+         ' ----------------------- CREO SEGMENTI PER CONCATENAMENTO CURVE -----------------------
+         If m_bChainedPath And bEngWithMill Then
+            If bReducePath Then
+               If Index < nStepNum - 1 Then
+                  ExtendLenghtMillPath(nCut2Id, -dThick / 2)
+               ElseIf Index = nStepNum - 1 Then
+                  If nStepNum Mod 2 = 0 Then
+                     ExtendLenghtMillPath(nCut2Id, -dThick / 2, False, True)
+                  Else
+                     ExtendLenghtMillPath(nCut2Id, -dThick / 2, True, False)
+                  End If
+               End If
+            End If
+               CutsList.Add(nCut2Id)
+            End If
+         ' ----------------------- CREO SEGMENTI PER CONCATENAMENTO CURVE -----------------------
+
       Next
+
+      ' ----------------------- CREO UN UNICO PERCORSO CONCATENATO -----------------------
+      If m_bChainedPath And bEngWithMill Then
+         ' Decidere se accorciare i tagli del valore del raggio utensile!
+         If bReducePath Then
+            ExtendLenghtMillPath(CutsList(0), -dThick / 2, False, True)
+         End If
+         For Index As Integer = 0 To CutsList.Count - 2
+            If Index Mod 2 <> 0 Then
+               ' Costruisco la linea di collegamento tra due curve adiacenti
+               Dim PtStart_1 As Point3d
+               EgtStartPoint(CutsList(Index), GDB_RT.GLOB, PtStart_1)
+               Dim PtStart_2 As Point3d
+               EgtStartPoint(CutsList(Index + 1), GDB_RT.GLOB, PtStart_2)
+               CutsList.Add(EgtCreateLine(nLayerId, PtStart_1, PtStart_2))
+            Else
+               ' Costruisco la linea di collegamento tra due curve adiacenti
+               Dim PtStart_1 As Point3d
+               EgtEndPoint(CutsList(Index), GDB_RT.GLOB, PtStart_1)
+               Dim PtStart_2 As Point3d
+               EgtEndPoint(CutsList(Index + 1), GDB_RT.GLOB, PtStart_2)
+               CutsList.Add(EgtCreateLine(nLayerId, PtStart_1, PtStart_2))
+            End If
+         Next
+         Dim ptNear As Point3d
+         EgtStartPoint(CutsList(0), ptNear)
+         Dim IdJointCurv As Integer = EgtCreateCurveCompoByChain(nLayerId, CutsList.ToArray, ptNear, True)
+         EgtSetInfo(IdJointCurv, INFO_DIRECTCUT, 1)
+         EgtSetInfo(IdJointCurv, INFO_STEP_TYPE, m_nMachType)
+         EgtSetInfo(IdJointCurv, INFO_WIDTH, dThick)
+         ' Se unisco il percorso devo per forza usare la fresa!
+         EgtSetInfo(IdJointCurv, "EngravingWithMill", 1)
+         If Not bReducePath Then EgtSetInfo(IdJointCurv, INFO_STRICT, 0)
+      End If
+      ' ----------------------- CREO UN UNICO PERCORSO CONCATENATO -----------------------
+
       Return True
    End Function
 
+   Private Sub ExtendLenghtMillPath(ByVal IdCurv As Integer, ByVal ReduceVal As Double,
+                                    ByVal Optional bStart As Boolean = True, ByVal Optional bEnd As Boolean = True)
+      Dim PtStart As Point3d
+      EgtStartPoint(IdCurv, GDB_RT.GLOB, PtStart)
+      Dim PtEnd As Point3d
+      EgtEndPoint(IdCurv, GDB_RT.GLOB, PtEnd)
+      If bStart Then EgtTrimExtendCurveByLen(IdCurv, ReduceVal, PtStart, GDB_RT.GLOB)
+      If bEnd Then EgtTrimExtendCurveByLen(IdCurv, ReduceVal, PtEnd, GDB_RT.GLOB)
+      Dim dLenLine As Double
+      EgtCurveLength(IdCurv, dLenLine)
+      EgtOutLog("Lunghezza segmento ridotto: " & dLenLine.ToString)
+   End Sub
+
    Private Function CreateCross(nLayerId As Integer, ptP As Point3d) As Boolean
       ' Aggiungo crocette
       Dim vtCrossX As New Vector3d(20, 0, 0)

DirectCuts/GridCut.xaml

@@ -61,12 +61,12 @@
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Grid.Row="5" Grid.ColumnSpan="2">
@@ -89,7 +89,7 @@
             <TextBlock Name="DimPzXTxBl" Grid.Column="2" Grid.Row="0"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
 
-            <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75"
+            <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzXTxBx" Grid.Column="2" Grid.Row="1" Width="75"
             Style="{StaticResource OmagCut_CalculatorTextBox}" />
@@ -99,7 +99,7 @@
             <TextBlock Name="DimPzYTxBl" Grid.Column="2" Grid.Row="2"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
 
-            <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75"
+            <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzYTxBx" Grid.Column="2" Grid.Row="3" Width="75"
             Style="{StaticResource OmagCut_CalculatorTextBox}" />

DirectCuts/GridCut.xaml.vb

@@ -38,6 +38,8 @@ Public Class GridCut
    Private m_ptPrev As Point3d
    ' Layer per crocette temporanee
    Private m_nTempLay As Integer = GDB_ID.NULL
+   ' Gestione spessore lama
+   Private m_bSawTh As Boolean = False
 
    ' Costanti
    Private Const MAX_TAB_DEPTH As Double = 10.0
@@ -82,7 +84,12 @@ Public Class GridCut
       m_nNumX = GetPrivateProfileInt( S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX, m_MainWindow.GetIniFile())
       m_dDimX = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile())
       m_nNumY = GetPrivateProfileInt( S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY, m_MainWindow.GetIniFile())
-      m_dDimY = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_DIMY, m_dDimY, m_MainWindow.GetIniFile())
+      m_dDimY = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMY, m_dDimY, m_MainWindow.GetIniFile())
+
+      ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+      m_bSawTh = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_SING_SAWTH, 0, m_MainWindow.GetIniFile()) <> 0)
+      ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
       m_bHeadSide = ( GetPrivateProfileInt( S_DIRECTCUTS, K_DC_GRID_HEADSIDE, 0, m_MainWindow.GetIniFile()) <> 0)
       m_ptTipP1.x = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
       m_ptTipP1.y = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile())
@@ -141,6 +148,11 @@ Public Class GridCut
       NumPzYTxBx.Text = m_nNumY.ToString()
       DimPzYTxBx.Text = LenToString( m_dDimY, 1)
       SideChBx.IsChecked = m_bHeadSide
+
+      ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+      m_bSawTh = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_SING_SAWTH, 0, m_MainWindow.GetIniFile()) <> 0)
+      ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
       ' Reset taglio e disabilito bottone esecuzione
       m_bCutOk = False
       UpdateSimulOkBtn()
@@ -152,6 +164,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())
@@ -167,7 +180,7 @@ Public Class GridCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -185,6 +198,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,12 +260,31 @@ Public Class GridCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         m_MainWindow.m_DirectCutPageUC.ReloadParam()
+      End If
+
+      ' 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
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Ricavo dati lama corrente
          Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
          ' Se punto da laser
@@ -255,18 +292,18 @@ Public Class GridCut
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) 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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP1) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP1) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
@@ -285,10 +322,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,12 +352,31 @@ Public Class GridCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         m_MainWindow.m_DirectCutPageUC.ReloadParam()
+      End If
+
+      ' 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
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Ricavo dati lama corrente
          Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
          ' Se punto da laser
@@ -330,18 +384,18 @@ Public Class GridCut
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) 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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP2) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP2) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
@@ -358,10 +412,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
@@ -391,7 +443,7 @@ Public Class GridCut
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then
@@ -480,6 +532,7 @@ Public Class GridCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -508,19 +561,21 @@ Public Class GridCut
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
          Return
       End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
       ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
          ' copio il progetto corrente come progetto in lavorazione
          Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
          My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
          ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript( True)
+         m_MainWindow.ExecSentProgScript(True)
       End If
 #End If
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateGridCut() As Boolean
@@ -601,6 +656,15 @@ Public Class GridCut
       If dDimPzY <> 0 And nNumPzY > 0 And dDimPzX <> 0 And nNumPzX > 0 Then
          Dim dLenX As Double = dThick + (dDimPzX + dThick) * nNumPzX
          Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1)
+
+         ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+         ' Recupero spessore lama corrente
+         Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
+         If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then
+            EgtOffsetCurve(nCutParaId, -dThick, OFF_TYPE.EXTEND)
+         End If
+         ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
          ' Imposto affondamento e angolo di fianco sul taglio
          EgtSetInfo(nCutParaId, INFO_DEPTH, m_dDepth)
          EgtSetInfo(nCutParaId, INFO_SIDE_ANGLE, m_dAngV)
@@ -619,6 +683,13 @@ Public Class GridCut
          ' Arretro il punto di partenza di uno spessore lama
          Dim vtDeltaPos As Vector3d = Vector3d.FromPolar(dThick + 0.1, m_dAngO - 90)
          Dim nCutPerpId = EgtCreateLinePDL(nLayerId, ptStart + vtDeltaPos, m_dAngO + 90, dLenY + 0.2)
+
+         ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+         If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then
+            EgtOffsetCurve(nCutPerpId, -dThick, OFF_TYPE.EXTEND)
+         End If
+         ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
          ' Specchio se è attivo il flag che cambia lato di disegno
          If SideChBx.IsChecked() Then
             Dim vtRot As Vector3d = Vector3d.FromPolar(1, m_dAngO + 90)
@@ -641,6 +712,7 @@ Public Class GridCut
    End Function
 
    Private Function CreateCross(nLayerId As Integer, ptP As Point3d) As Boolean
+      ptP += New Vector3d(0, 0, 0.15)
       ' Aggiungo crocette
       Dim vtCrossX As New Vector3d(20, 0, 0)
       Dim vtCrossY As New Vector3d(0, 20, 0)

DirectCuts/MachineButtonsUC.xaml

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

DirectCuts/MachineButtonsUC.xaml.vb

@@ -7,10 +7,13 @@ Public Class MachineButtonsUC
    Private m_DirectCutPage As DirectCutPageUC
    Friend m_CN As CN_generico
 
+   Public nCountButton As Integer = 11
+
    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 +34,11 @@ 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_STATE_HOME As String = "Home"
+   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.
@@ -71,11 +79,17 @@ Public Class MachineButtonsUC
          GetToggleButton(nIndex + 1).Visibility = Windows.Visibility.Hidden
       Next
 
+      ' notifico nella variabile pubblica il numero di pulsanti inseriti nella barra
+      nCountButton = m_nCount
+
       ' Se variabile di stato "Nothing"/"DoorOpened"/"DoorClosed" imposto immagine fissa
       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 +148,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 +168,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)
@@ -246,9 +273,62 @@ Public Class MachineButtonsUC
                   End If
                   Return
                End If
+               ' CONTROLLO FANUC
+            Case 4
+               ' ------------------------------------ FANUC ------------------------------------
+               ' eventuale scrittura di linea di comando MDI
+               If Not String.IsNullOrEmpty(CmdString) Then
+                  ' attivo mpdalità MDI
+                  m_CN.DGeneralFunctions_WriteCncMode(2)
+                  System.Threading.Thread.Sleep(100)
+                  ' salvo la stringa di comando ricevuta dal file lua
+                  m_CN.sz_ManualDataInput = CmdString
+                  ' esguo la funzione che ha il compito di scrivere il comando MDI
+                  m_CN.MDI_command()
+               End If
+               ' attivo modalità AUTO
+               m_CN.DGeneralFunctions_WriteCncMode(7)
+               System.Threading.Thread.Sleep(100)
+               If String.IsNullOrEmpty(EValue) Then
+                  ' EActive: impulsivo "D#####"
+                  m_CN.NC_pulse_bit(ENumber)
+                  EgtOutLog("Fanuc_DNumber= " & ENumber)
+               Else
+                  ' EActive + EValue: scrittura comando invariabile Short oppure Bit
+                  If ENumber.Contains(".") Then
+                     ' D#####.#
+                     Dim bEValue As Boolean
+                     If EValue.Trim = "1" Then bEValue = True
+                     m_CN.NC_write_var_bit(ENumber, CBool(EValue))
+                  Else
+                     ' D#####
+                     m_CN.NC_write_var_short(ENumber, CShort(EValue))
+                  End If
+                  EgtOutLog("Fanuc_DNumber= " & ENumber & " DValue= " & EValue)
+               End If
+               ' eventale caricamento seconda variabile
+               If String.IsNullOrEmpty(EValue2) Then
+                  ' EActive: impulsivo "D#####"
+                  m_CN.NC_pulse_bit(ENumber2)
+                  EgtOutLog("Fanuc_DNumber= " & ENumber2)
+               Else
+                  ' EActive + EValue: scrittura comando invariabile Short oppure Bit
+                  If ENumber2.Contains(".") Then
+                     ' D#####.#
+                     Dim bEValue2 As Boolean
+                     If EValue2.Trim = "1" Then bEValue2 = True
+                     m_CN.NC_write_var_bit(ENumber2, CBool(EValue2))
+                  Else
+                     ' D#####
+                     m_CN.NC_write_var_short(ENumber2, CShort(EValue2))
+                  End If
+                  EgtOutLog("Fanuc_DNumber2= " & ENumber2 & " DValue2= " & EValue2)
+               End If
+               Return
          End Select
       End If
 
+
       Dim nResult As Short
       ' Imposto modalità MDI per controlli num
       Select Case m_MainWindow.m_CNCommunication.m_nNCType
@@ -265,6 +345,8 @@ Public Class MachineButtonsUC
             m_CN.DGeneralFunctions_CycleStart()
          Case 3
             'Per il siemens non devo fare nulla
+         Case 4
+            ' Nicola: 27/03/2023 attivazione della funzione M# indicata?
       End Select
 
       If b2Start Then
@@ -299,6 +381,17 @@ Public Class MachineButtonsUC
          EgtTdbGetCurrToolParam(MCH_TP.SPEED, dSpeed)
       End If
       EgtLuaSetGlobNumVar("CMD.S", dSpeed)
+      ' versione 2.5e1
+      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
+      Dim sToolPos As String = String.Empty
+      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
+         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
+      End If
+      Dim dToolDiam As Double = 0
+      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
+         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
+      End If
+
       Dim dL1, dL2, dL3, dR1, dR2 As Double
       m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
       EgtLuaSetGlobNumVar("CMD.L1", dL1)
@@ -344,6 +437,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 +678,237 @@ 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 HomeStateChanged(HomeState As Boolean)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_HOME)
+      If nIndex = -1 Then Return
+      If HomeState 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
+
+   Friend Sub TableUpChanged(TableUpState As Boolean)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_TABLEUP)
+      If nIndex = -1 Then Return
+      If TableUpState 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\" & 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
+      End If
+   End Sub
+
+   Friend Sub TableDownChanged(TableDownState As Boolean)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_TABLEDOWN)
+      If nIndex = -1 Then Return
+      If TableDownState 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\" & 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
+      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 +944,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
 

DirectCuts/ManualAxesMoveUC.xaml

@@ -69,10 +69,10 @@
          <EgtWPFLib:EgtTextBox x:Name="L3TxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
          <Button x:Name="R1Btn" Grid.Row="4" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-         <EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
          <Button x:Name="R2Btn" Grid.Row="5" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-         <EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
    
          <Grid Grid.Row="7" Grid.ColumnSpan="2">

DirectCuts/ManualAxesMoveUC.xaml.vb

@@ -21,10 +21,12 @@ Public Class ManualAxesMoveUC
       ' Messaggi
       L1SawThChBx.Content = EgtMsg(90232)   ' Spessore lama
       L2SawThChBx.Content = EgtMsg(90232)   ' Spessore lama
+
       AddHandler m_Timer.Tick, AddressOf Timer_tick
    End Sub
 
    Private Sub ManualAxesMove_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      m_CN = m_MainWindow.m_DirectCutPageUC.m_CN
       ' Valori feed e speed da lama corrente
       Dim dTemp As Double = 0
       EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
@@ -51,14 +53,43 @@ Public Class ManualAxesMoveUC
       ' Imposto check per considerare spessore lama
       L1SawThChBx.IsChecked = m_MainWindow.m_CurrentMachine.bAddSawThTo5AxMove
       L2SawThChBx.IsChecked = m_MainWindow.m_CurrentMachine.bAddSawThTo5AxMove
+
+      ' Aggiorno visualizzazione
+      SetMachineInCurrPos()
+      EgtDraw()
+      m_MainWindow.m_DirectCutPageUC.m_bShowMachine = True
    End Sub
 
    Private Sub ManualAxesMove_UnLoaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       m_Timer.Stop()
       m_MainWindow.m_CurrentMachine.bAddSawThTo5AxMove = (L1SawThChBx.IsEnabled And L1SawThChBx.IsChecked) Or
                                                          (L2SawThChBx.IsEnabled And L2SawThChBx.IsChecked)
+      ' Nascondo la macchina
+      m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
+      EgtSetMachineLook(MCH_LOOK.TAB)
+      EgtDraw()
    End Sub
 
+   Private Function SetMachineInCurrPos() As Boolean
+      ' Recupero la posizione macchina
+      Dim dL1, dL2, dL3, dR1, dR2 As Double
+      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return False
+      ' Recupero il nome degli assi macchina
+      Dim sL1 As String = String.Empty
+      Dim sL2 As String = String.Empty
+      Dim sL3 As String = String.Empty
+      Dim sR1 As String = String.Empty
+      Dim sR2 As String = String.Empty
+      If Not m_MainWindow.m_CNCommunication.GetAxesNames(sL1, sL2, sL3, sR1, sR2) Then Return False
+      ' Visualizzo macchina in posizione
+      EgtSetAxisPos(sL1, dL1)
+      EgtSetAxisPos(sL2, dL2)
+      EgtSetAxisPos(sL3, dL3)
+      EgtSetAxisPos(sR1, dR1)
+      EgtSetAxisPos(sR2, dR2)
+      Return True
+   End Function
+
    Private Sub UpdateAxesNames()
       Dim sL1 As String = String.Empty
       Dim sL2 As String = String.Empty
@@ -123,11 +154,16 @@ Public Class ManualAxesMoveUC
    Private Sub Timer_tick()
       UpdateAxesNames()
       UpdateUseSawThickness()
+      ' Aggiorno posizione macchina in disegno
+      SetMachineInCurrPos()
+      ' Aggiorno il disegno
+      EgtDraw()
    End Sub
 
    Private m_MoveClicked As Boolean = False
    Private Sub XXBtn_Click(sender As Object, e As MouseButtonEventArgs) Handles L1Btn.PreviewMouseDown, L2Btn.PreviewMouseDown, L3Btn.PreviewMouseDown, R1Btn.PreviewMouseDown, R2Btn.PreviewMouseDown
       If e.ClickCount > 1 OrElse m_MoveClicked Then
+         EgtOutLog(" → Hold on! Do not click compulsively.")
          Return
       End If
       m_MoveClicked = True
@@ -207,13 +243,14 @@ Public Class ManualAxesMoveUC
       System.Threading.Thread.Sleep(150)
       m_CN.DGeneralFunctions_CycleStart()
       System.Threading.Thread.Sleep(m_MainWindow.m_CurrentMachine.nThreadSleep)
-      m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
+      ' m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
       m_MoveClicked = False
    End Sub
 
    Private Sub SiemensMoveAxis(CurrentBtn As Button)
       ' leggo se stato reset
       If Not m_CN.bResetState Then
+         EgtOutLog("Reset status is 'False', is denied to execute file '\DirectCmd\AxesMove.lua'.")
          m_MoveClicked = False
          Return
       End If
@@ -338,7 +375,7 @@ Public Class ManualAxesMoveUC
    End Function
 
    Private Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Sub G0Btn_Checked(sender As Object, e As RoutedEventArgs) Handles G0Btn.Checked

DirectCuts/MultipleCut.xaml

@@ -68,12 +68,12 @@
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Grid.Row="6" Grid.ColumnSpan="2" Visibility="Visible">
@@ -124,70 +124,70 @@
 
                      <TextBlock Name="Num1TxBl" Grid.Column="0" Grid.Row="0"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz1TxBx" Grid.Column="1" Grid.Row="0" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz1TxBx" Grid.Column="1" Grid.Row="0" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz1TxBx" Grid.Column="3" Grid.Row="0" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num2TxBl" Grid.Column="0" Grid.Row="1"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz2TxBx" Grid.Column="1" Grid.Row="1" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz2TxBx" Grid.Column="1" Grid.Row="1" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz2TxBx" Grid.Column="3" Grid.Row="1" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num3TxBl" Grid.Column="0" Grid.Row="2"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz3TxBx" Grid.Column="1" Grid.Row="2" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz3TxBx" Grid.Column="1" Grid.Row="2" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz3TxBx" Grid.Column="3" Grid.Row="2" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num4TxBl" Grid.Column="0" Grid.Row="3"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz4TxBx" Grid.Column="1" Grid.Row="3" Width="75"
+                     <EgtWPFLib:EgtTextBox Name="NumPz4TxBx" Grid.Column="1" Grid.Row="3" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz4TxBx" Grid.Column="3" Grid.Row="3" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num5TxBl" Grid.Column="0" Grid.Row="4"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz5TxBx" Grid.Column="1" Grid.Row="4" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz5TxBx" Grid.Column="1" Grid.Row="4" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz5TxBx" Grid.Column="3" Grid.Row="4" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num6TxBl" Grid.Column="0" Grid.Row="5"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz6TxBx" Grid.Column="1" Grid.Row="5" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz6TxBx" Grid.Column="1" Grid.Row="5" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz6TxBx" Grid.Column="3" Grid.Row="5" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num7TxBl" Grid.Column="0" Grid.Row="6"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz7TxBx" Grid.Column="1" Grid.Row="6" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz7TxBx" Grid.Column="1" Grid.Row="6" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz7TxBx" Grid.Column="3" Grid.Row="6" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num8TxBl" Grid.Column="0" Grid.Row="7"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz8TxBx" Grid.Column="1" Grid.Row="7" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz8TxBx" Grid.Column="1" Grid.Row="7" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz8TxBx" Grid.Column="3" Grid.Row="7" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num9TxBl" Grid.Column="0" Grid.Row="8"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz9TxBx" Grid.Column="1" Grid.Row="8" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz9TxBx" Grid.Column="1" Grid.Row="8" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz9TxBx" Grid.Column="3" Grid.Row="8" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num10TxBl" Grid.Column="0" Grid.Row="9"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz10TxBx" Grid.Column="1" Grid.Row="9" Width="75"
+                  <EgtWPFLib:EgtTextBox Name="NumPz10TxBx" Grid.Column="1" Grid.Row="9" Width="75" IsLength="False"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz10TxBx" Grid.Column="3" Grid.Row="9" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>

DirectCuts/MultipleCut.xaml.vb

@@ -38,7 +38,8 @@ Public Class MultipleCut
    Private m_ptPrev As Point3d
    ' Layer per crocette temporanee
    Private m_nTempLay As Integer = GDB_ID.NULL
-
+   ' Gestione spessore lama
+   Private m_bSawTh As Boolean = False
    ' Costanti
    Private Const MAX_TAB_DEPTH As Double = 10.0
    Private Const MIN_CUT_LEN As Double = 10.0
@@ -90,9 +91,14 @@ Public Class MultipleCut
       m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_MULT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
       m_dAngV = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_MULT_ANGV, m_dAngV, m_MainWindow.GetIniFile())
       For nI As Integer = 0 To 9
-         m_nNum( nI) = GetPrivateProfileInt( S_DIRECTCUTS, K_DC_MULT_NUM & (nI+1).ToString(), 0, m_MainWindow.GetIniFile())
-         m_dDim( nI) = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_MULT_DIM & (nI+1).ToString(), 0, m_MainWindow.GetIniFile())
+         m_nNum(nI) = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_MULT_NUM & (nI + 1).ToString(), 0, m_MainWindow.GetIniFile())
+         m_dDim(nI) = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_MULT_DIM & (nI + 1).ToString(), 0, m_MainWindow.GetIniFile())
       Next
+
+      ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+      m_bSawTh = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_SING_SAWTH, 0, m_MainWindow.GetIniFile()) <> 0)
+      ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
       m_bHeadSide = ( GetPrivateProfileInt( S_DIRECTCUTS, K_DC_MULT_HEADSIDE, 0, m_MainWindow.GetIniFile()) <> 0)
       m_ptTipP1.x = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_MULT_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
       m_ptTipP1.y = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_MULT_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile())
@@ -168,6 +174,11 @@ Public Class MultipleCut
       NumPz10TxBx.Text = m_nNum(9).ToString()
       DimPz10TxBx.Text = LenToString( m_dDim(9), 1)
       SideChBx.IsChecked = m_bHeadSide
+
+      ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+      m_bSawTh = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_SING_SAWTH, 0, m_MainWindow.GetIniFile()) <> 0)
+      ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
       ' Reset taglio e disabilito bottone esecuzione
       m_bCutOk = False
       UpdateSimulOkBtn()
@@ -195,7 +206,7 @@ Public Class MultipleCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -213,6 +224,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,12 +285,31 @@ Public Class MultipleCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         m_MainWindow.m_DirectCutPageUC.ReloadParam()
+      End If
+
+      ' 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
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Ricavo dati lama corrente
          Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
          ' Se punto da laser
@@ -283,18 +317,20 @@ Public Class MultipleCut
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) 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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP1) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP1) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
@@ -312,10 +348,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,12 +378,31 @@ Public Class MultipleCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         m_MainWindow.m_DirectCutPageUC.ReloadParam()
+      End If
+
+      ' 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
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Ricavo dati lama corrente
          Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
          ' Se punto da laser
@@ -356,18 +410,18 @@ Public Class MultipleCut
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) 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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP2) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP2) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
@@ -383,10 +437,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
@@ -419,7 +472,7 @@ Public Class MultipleCut
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then
@@ -524,6 +577,7 @@ Public Class MultipleCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -552,19 +606,21 @@ Public Class MultipleCut
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
          Return
       End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
       ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
          ' copio il progetto corrente come progetto in lavorazione
          Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
          My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
          ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript( True)
+         m_MainWindow.ExecSentProgScript(True)
       End If
 #End If
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateMultipleCut() As Boolean
@@ -589,6 +645,22 @@ Public Class MultipleCut
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
+
+      ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+      ' 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
+      ' Se è impostata una lavorazione di lama
+      If Not String.IsNullOrEmpty(sSawing) Then
+         EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      End If
+      If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then
+         EgtOffsetCurve(nCutId, -dThick, OFF_TYPE.EXTEND)
+      End If
+      ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
       EgtSetInfo(nCutId, INFO_SIDE_ANGLE, m_dAngV)
@@ -681,6 +753,7 @@ Public Class MultipleCut
    End Function
 
    Private Function CreateCross(nLayerId As Integer, ptP As Point3d) As Boolean
+      ptP += New Vector3d(0, 0, 0.15)
       ' Aggiungo crocette
       Dim vtCrossX As New Vector3d(20, 0, 0)
       Dim vtCrossY As New Vector3d(0, 20, 0)

DirectCuts/Polishing.xaml.vb

@@ -6,6 +6,8 @@ Public Class Polishing
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   Private m_refControlDirectCutUC As ControlsDirectCutUC1
+
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Flag di simulazione in corso
@@ -30,6 +32,7 @@ Public Class Polishing
    Private Sub Polishing_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Attivo la pagina
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       ' Se rientro da simulazione
       If m_bSimul Then
@@ -60,7 +63,7 @@ Public Class Polishing
       If PolishingCmBx.SelectedIndex < 0 Then
          m_bPoliOk = False
          UpdateSimulOkBtn()
-      End If 
+      End If
       ' Rendo semitrasparente il grezzo
       Dim nRawSolidId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_RAW_SOLID)
       EgtSetAlpha( nRawSolidId, 60)
@@ -72,7 +75,7 @@ Public Class Polishing
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_refControlDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC1.DirectCutPages.DirectCut
          ' Cancello eventuali lucidature
          RemovePolishings()
          ' Riattivo eventuali lavorazioni presenti
@@ -148,6 +151,7 @@ Public Class Polishing
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -176,19 +180,21 @@ Public Class Polishing
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
          Return
       End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
       ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
          ' copio il progetto corrente come progetto in lavorazione
          Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
          My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
          ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript( True)
+         m_MainWindow.ExecSentProgScript(True)
       End If
 #End If
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreatePolishing( sKitName As String) As Boolean

DirectCuts/SawTestUC.xaml

@@ -70,7 +70,7 @@
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="5"

DirectCuts/SawTestUC.xaml.vb

@@ -5,6 +5,7 @@ Public Class SawTestUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   Private m_refControlDirectCutUC As ControlsDirectCutUC1
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Flag di simulazione in corso
@@ -76,6 +77,7 @@ Public Class SawTestUC
    Private Sub SawTest_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Attivo la pagina
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       ' Se rientro da simulazione
       If m_bSimul Then
@@ -139,7 +141,7 @@ Public Class SawTestUC
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_TEST_OFFSET, DoubleToString( m_dOffset, 2), m_MainWindow.GetIniFile())
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_refControlDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC1.DirectCutPages.DirectCut1
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -208,17 +210,30 @@ Public Class SawTestUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         EgtSetCalcTool(m_sSaw, "H1", 1)
+      End If
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Se punto da laser
          If PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(m_sSaw, "H1", 1) Then Return
          ' Altrimenti da lama
@@ -226,10 +241,10 @@ Public Class SawTestUC
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(m_sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP1) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP1) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
@@ -278,17 +293,30 @@ Public Class SawTestUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         EgtSetCalcTool(m_sSaw, "H1", 1)
+      End If
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Se punto da laser
          If PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(m_sSaw, "H1", 1) Then Return
          ' Altrimenti da lama
@@ -296,10 +324,10 @@ Public Class SawTestUC
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(m_sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP2) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP2) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
@@ -349,7 +377,7 @@ Public Class SawTestUC
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then
@@ -419,6 +447,7 @@ Public Class SawTestUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -447,19 +476,21 @@ Public Class SawTestUC
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
          Return
       End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
       ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
          ' copio il progetto corrente come progetto in lavorazione
          Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
          My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
          ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript( True)
+         m_MainWindow.ExecSentProgScript(True)
       End If
 #End If
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean
@@ -499,6 +530,10 @@ Public Class SawTestUC
       ElseIf nWSide = MCH_SAW_WS.LEFT Then
          vtPerp = vtDir
          vtPerp.Rotate(Vector3d.Z_AX, +90)
+      Else
+         m_CurrProjPage.ClearMessage()
+         ' 91144 = Set machining side: right or left.
+         m_CurrProjPage.SetInfoMessage(EgtMsg(91144))
       End If
       Dim ptEnd As Point3d = ptStart + vtDir * m_dLen + vtPerp * dThick
       Dim dLen2 As Double = m_dLen / 2

DirectCuts/SingleCutAuto.xaml.vb

@@ -363,7 +363,7 @@ Public Class SingleCutAuto
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -715,6 +715,7 @@ Public Class SingleCutAuto
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -758,7 +759,7 @@ Public Class SingleCutAuto
       ' reimposto il precedetne utensile e lavorazione
       m_MainWindow.m_CurrentMachine.sCurrSaw = m_PrecSaw
       m_MainWindow.m_CurrentMachine.sCurrSawing = m_PrecSawing
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean

DirectCuts/SingleCutUC.xaml

@@ -69,12 +69,12 @@
    
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
    
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
+         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="6"

DirectCuts/SingleCutUC.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.Windows.Threading
+Imports EgtUILib
 
 Public Class SingleCutUC
 
@@ -39,10 +40,14 @@ Public Class SingleCutUC
    Private m_nTempLay As Integer = GDB_ID.NULL
 
    ' Costanti
-   Private Const MAX_TAB_DEPTH As Double = 10.0
+   Private Const MAX_TAB_DEPTH As Double = 10.0  ' sostituita da un m_MaxTabDepth letto da file ini macchina
    Private Const MIN_CUT_LEN As Double = 10.0
    Private Const MAX_SIDE_ANG As Double = 60.0
    ' Costanti che indicano la modalità di acquisizione dei punti
+
+   ' Utilizzato per aggiornare la posizione della macchina
+   Private m_RefreshTimer As New DispatcherTimer
+
    Private Enum PT_MODE As Integer
       SAW = 0
       LASER = 1
@@ -68,14 +73,14 @@ Public Class SingleCutUC
       SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
       OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       ' Carico i dati dell'ultimo taglio
-      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
-      m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_LENGTH, m_dLen, m_MainWindow.GetIniFile())
-      m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_ANGH, m_dAngO, m_MainWindow.GetIniFile())
-      m_dAngV = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_ANGV, m_dAngV, m_MainWindow.GetIniFile())
+      m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
+      m_dLen = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_LENGTH, m_dLen, m_MainWindow.GetIniFile())
+      m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_ANGH, m_dAngO, m_MainWindow.GetIniFile())
+      m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_ANGV, m_dAngV, m_MainWindow.GetIniFile())
       m_dOffset = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_OFFSET, m_dOffset, m_MainWindow.GetIniFile())
       m_bSawTh = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_SING_SAWTH, 0, m_MainWindow.GetIniFile()) <> 0)
-      m_ptTipP1.x = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
-      m_ptTipP1.y = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile())
+      m_ptTipP1.x = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
+      m_ptTipP1.y = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile())
    End Sub
 
    Private Sub SingleCut_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -92,6 +97,10 @@ Public Class SingleCutUC
          m_MainWindow.m_DirectCutPageUC.m_bShowMachine = True
          EgtSetMachineLook(m_MainWindow.m_DirectCutPageUC.m_nMachLook)
          EgtDraw()
+         ' riavvio il timer per visualizzare la poszione della macchina
+         If Not IsNothing(m_RefreshTimer) Then
+            m_RefreshTimer.Start()
+         End If
          Return
       End If
       ' Disabilito registrazione progetto modificato
@@ -114,7 +123,7 @@ Public Class SingleCutUC
       m_bPointP1Ok = False
       m_bPointP2Ok = False
       ' Inizializzo primo punto acquisito dal disegno
-      m_ptPrev = m_ptTipP1 + ( m_ptTabOri - Point3d.ORIG())
+      m_ptPrev = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG())
       m_ptPrev.z = m_ptRawMax.z
       ' Disegno crocetta che indica il punto acquisito
       CreateCross(m_nTempLay, m_ptPrev)
@@ -137,24 +146,46 @@ Public Class SingleCutUC
       Point2Btn.IsEnabled = False
       ' Deseleziono bottone primo punto
       Point1Btn.IsChecked = False
+
+      ' la visualizzazione dei comandi è gestita dalla DirectCutPageUC richiamando la funzione ReloadParam
+
+      ' forzo la macchina ad essere visibile fin da subito
+      m_MainWindow.m_DirectCutPageUC.m_bShowMachine = True
+      m_MainWindow.m_DirectCutPageUC.m_nMachLook = MCH_LOOK.TAB
+      ' Creo il timer il timer per aggiornare il posizionamento della macchina
+      AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_tick
+      m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(1000)
+
       ' Aggiorno visualizzazione
       EgtDraw()
+
+      ' Avvi il timer
+      m_RefreshTimer.Start()
+   End Sub
+
+   Private Sub RefreshTimer_tick()
+      ' se è impostata la visualizzazione della sola tavola allora non aggiorno il disegno
+      If m_MainWindow.m_DirectCutPageUC.m_nMachLook = MCH_LOOK.TAB Then Return
+      ' Aggiorno visualizzazione
+      SetMachineInCurrPos()
+      ' Aggiorno il disegno
+      EgtDraw()
    End Sub
 
    Friend Sub SingleCut_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       ' Salvo i dati correnti
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_SING_DEPTH, DoubleToString( m_dDepth, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_SING_LENGTH, DoubleToString( m_dLen, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_SING_ANGH, DoubleToString( m_dAngO, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_SING_ANGV, DoubleToString( m_dAngV, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_DEPTH, DoubleToString(m_dDepth, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_LENGTH, DoubleToString(m_dLen, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_ANGH, DoubleToString(m_dAngO, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_ANGV, DoubleToString(m_dAngV, 2), m_MainWindow.GetIniFile())
       WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_OFFSET, DoubleToString(m_dOffset, 2), m_MainWindow.GetIniFile())
       WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_SAWTH, If(m_bSawTh, "1", "0"), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_SING_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_POSX, DoubleToString(m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
       WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -168,10 +199,18 @@ Public Class SingleCutUC
          EgtSetMachineLook(MCH_LOOK.TAB)
          EgtDraw()
       End If
+      ' interrompo il Timer per aggiornare la visualizzazione del posizionamento macchina 
+      m_RefreshTimer.Stop()
       ' Dichiaro pagina non attiva
       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,11 +268,30 @@ Public Class SingleCutUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         m_MainWindow.m_DirectCutPageUC.ReloadParam()
+      End If
+
+      ' 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
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Ricavo dati lama corrente
          Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
          ' Se punto da laser
@@ -241,18 +299,20 @@ Public Class SingleCutUC
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
+            EgtOutLog("Coordinate punto 1 da H3: " & m_ptTipP1.x.ToString & " ," & m_ptTipP1.y.ToString)
+            ' 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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
+            EgtOutLog("Coordinate punto 1 da H1: " & m_ptTipP1.x.ToString & " ," & m_ptTipP1.y.ToString)
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP1) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP1) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
@@ -264,17 +324,15 @@ Public Class SingleCutUC
          DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
          SideAngleTxBx.Text = DoubleToString(m_dAngV, 2)
 
-      ' Altrimenti punto da click di mouse
+         ' Altrimenti punto da click di mouse
       Else
          ' Assegno punto selezionato nel disegno a m_ptTipP1
          m_ptTipP1 = m_ptPrev
          ' 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
@@ -284,6 +342,7 @@ Public Class SingleCutUC
       m_MainWindow.m_DirectCutPageUC.m_bShowMachine = True
       EgtSetMachineLook(m_MainWindow.m_DirectCutPageUC.m_nMachLook)
       EgtDraw()
+
       ' Seleziono il bottone per indicare che il primo punto è stato acquisito
       Point1Btn.IsChecked = True
       ' Abilito e deseleziono secondo punto
@@ -303,11 +362,30 @@ Public Class SingleCutUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      If bIsMultiCut Then
+         m_MainWindow.m_DirectCutPageUC.ReloadParam()
+      End If
+
+      ' 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
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Ricavo dati lama corrente
          Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
          ' Se punto da laser
@@ -315,18 +393,20 @@ Public Class SingleCutUC
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
+            EgtOutLog("Coordinate punto 2 da H3: " & m_ptTipP2.x.ToString & " ," & m_ptTipP2.y.ToString)
+            ' 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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP2) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP2) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
@@ -336,17 +416,15 @@ Public Class SingleCutUC
          m_dAngV = 90 - dTAngV
          SideAngleTxBx.Text = DoubleToString(m_dAngV, 2)
 
-      ' Altrimenti punto da click di mouse
+         ' Altrimenti punto da click di mouse
       Else
          ' Assegno punto selezionato nel disegno a m_ptTipP2
          m_ptTipP2 = m_ptPrev
          ' 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
@@ -361,6 +439,7 @@ Public Class SingleCutUC
          m_dAngO = dAngOrizzDeg
          LenghtTxBx.Text = LenToString(m_dLen, 1)
          DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
+         EgtOutLog("Lunghezza taglio: " & dLen.ToString & "Angolo: " & dAngOrizzDeg.ToString)
          CreateSingleCut()
          ' Disegno la macchina nella sua posizione reale
          SetMachineInCurrPos()
@@ -378,7 +457,7 @@ Public Class SingleCutUC
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then
@@ -456,7 +535,7 @@ Public Class SingleCutUC
       EgtDraw()
    End Sub
 
-   Private Sub SawThick_Click( sender As Object, e As RoutedEventArgs) Handles SawThChBx.Click
+   Private Sub SawThick_Click(sender As Object, e As RoutedEventArgs) Handles SawThChBx.Click
       ' Recupero lo stato di check
       m_bSawTh = SawThChBx.IsChecked()
       ' Disegno il taglio
@@ -504,6 +583,7 @@ Public Class SingleCutUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -515,9 +595,9 @@ Public Class SingleCutUC
       m_CurrProjPage.SetWarningMessage( "Trial Version")
 #Else
       ' Verifico non sia versione Ufficio
-      If m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.OFFICE_TYPE) Then
-          m_CurrProjPage.SetWarningMessage( "Office Version")
-          Return
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
+         m_CurrProjPage.SetWarningMessage("Office Version")
+         Return
       End If
       ' Verifico ci sia un taglio valido
       If Not m_bCutOk Then Return
@@ -532,24 +612,27 @@ Public Class SingleCutUC
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
          Return
       End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
       ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
          ' copio il progetto corrente come progetto in lavorazione
          Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
          My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
          ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript( True)
+         m_MainWindow.ExecSentProgScript(True)
       End If
 #End If
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean
       ' Verifico sia definito il punto iniziale e il grezzo
       If Not m_bPointP1Ok Or Not m_bRawOk Then
+         EgtOutLog("Primo punto non valido")
          m_bCutOk = False
          Return False
       End If
@@ -559,9 +642,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
@@ -574,14 +661,19 @@ Public Class SingleCutUC
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
-      If Math.Abs(m_dOffset) > 10 * EPS_SMALL Then
-         Dim dTotOffset = m_dOffset
-         If m_bSawTh Then dTotOffset += If( m_dOffset > 0, dThick, -dThick)
+      ' Applico la correzione di spessore lama -> anche se Offset=0! ver_2.5b1
+      Dim dTotOffset = m_dOffset
+      If m_bSawTh Then
+         dTotOffset += If(m_dOffset > 0, dThick, -dThick)
+         EgtOffsetCurve(nCutId, dTotOffset, OFF_TYPE.EXTEND)
+      Else
          EgtOffsetCurve(nCutId, dTotOffset, OFF_TYPE.EXTEND)
       End If
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
       EgtSetInfo(nCutId, INFO_SIDE_ANGLE, m_dAngV)
+      ' Imposto se disabilitare l'inversine di direzione del taglio
+      If Not m_MainWindow.m_CurrentMachine.bEnableInvert Then EgtSetInfo(nCutId, INFO_ENABLE_INVERT, 0)
       ' Creo layer per crocetta di riferimento
       Dim nCrossLayerId = EgtCreateGroup(nPartId)
       ' Aggiungo crocetta/e

DirectCuts/SingleDrillUC.xaml.vb

@@ -71,8 +71,11 @@ Public Class SingleDrillUC
 
    Private Sub SingleDrill_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       m_sCurrDrill = m_CurrentMachine.sCurrDrill
-      GetDrillFromDrilling(m_sCurrDrill)
-
+      GetDrillFromDrilling(m_sCurrDrill, m_CurrentMachine.sCurrDrilling)
+      ' rimuovo utensile su uscite 1
+      EgtSetCalcTool("", "H1", 1)
+      ' imposto utensile su uscita 2
+      EgtSetCalcTool(m_sCurrDrill, "H1", 2)
       ' recupero informazioni del foretto usato
       EgtTdbSetCurrTool(m_sCurrDrill)
       EgtTdbGetCurrToolParam(MCH_TP.DIAM, m_dDiameter)
@@ -136,7 +139,7 @@ Public Class SingleDrillUC
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -213,21 +216,33 @@ Public Class SingleDrillUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' forzo utilizzo testa H1 solo per macchina con 2 teste
+      Dim bIsMultiCut As Boolean = (EgtGetHeadId("H101") <> GDB_ID.NULL)
+      ' Ricavo dati lama corrente
+      Dim sDrill As String = m_sCurrDrill
+      If bIsMultiCut Then
+         EgtSetCalcTool(sDrill, "H1", 2)
+      End If
+
       ' Se acquisizione lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.DRILL Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
          ' Recupero la posizione macchina
          Dim dL1, dL2, dL3, dR1, dR2 As Double
          If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
-
-         ' Ricavo dati Foretto corrente
-         Dim sDrill As String = m_sCurrDrill
+         ' Se macchina multicut il primo asse rotante restituito è quello della tavola 
+         Dim vAng() As Double = {dR1, dR2, 0}
+         If bIsMultiCut Then
+            vAng(0) = 0
+            vAng(1) = dR1
+            vAng(2) = dR2
+         End If
          ' Se punto da laser
          If PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
             ' Imposto come testa corrente il laser (senza utensile ovviamente)
             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
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(sDrill, "H1", 2) Then Return
             ' Altrimenti da lama
@@ -235,10 +250,10 @@ Public Class SingleDrillUC
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(sDrill, "H1", 2) Then Return
             ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
+            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
          End If
          ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP1) Then Return
+         If Not EgtGetCalcToolDirFromAngles(vAng, m_vtToolP1) Then Return
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
@@ -250,10 +265,8 @@ Public Class SingleDrillUC
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sDrill As String = m_sCurrDrill
          ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sDrill, "H1", 1) Then Return
+         If Not EgtSetCalcTool(sDrill, "H1", 2) Then Return
       End If
 
       ' Disegno il taglio
@@ -267,41 +280,41 @@ Public Class SingleDrillUC
       Point1Btn.IsChecked = True
    End Sub
 
-   Private Sub GetDrillFromDrilling(ByRef sCurrDrill As String)
-      If String.IsNullOrEmpty(sCurrDrill) Or String.IsNullOrWhiteSpace(sCurrDrill) Then
-         ' creo l'elenco degli utensili di foratura
-         Dim sToolName As String = String.Empty
-         Dim nType As Integer = MCH_TY.NONE
-         Dim DrillToolList As New ObservableCollection(Of String)
-         DrillToolList.Clear()
-         If EgtTdbGetFirstTool(MCH_TF.DRILLBIT, sToolName, nType) Then
-            DrillToolList.Add(sToolName)
-            While EgtTdbGetNextTool(MCH_TF.DRILLBIT, sToolName, nType)
-               DrillToolList.Add(sToolName)
-            End While
-         End If
-         ' recupero l'utensile associato alla lavorazione
-         Dim sCurrDrilling As String = m_MainWindow.m_CurrentMachine.sCurrDrilling
-         Dim ToolString As String = String.Empty
-         EgtMdbSetCurrMachining(sCurrDrilling)
-         ' Recupero nome utensile tramite TUUID
-         Dim sTuuid As String = String.Empty
-         EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTuuid)
-         EgtTdbGetToolFromUUID(sTuuid, ToolString)
-         Dim bToolExist As Boolean = False
-         For Each CurrTool As IEnumerable In DrillToolList
-            If CurrTool.ToString() = ToolString Then
-               bToolExist = True
-               Exit For
-            End If
-         Next
-         If bToolExist Then
-            sCurrDrill = ToolString
-         Else
-            sCurrDrill = String.Empty
-         End If
-      End If
-   End Sub
+   'Private Sub GetDrillFromDrilling(ByRef sCurrDrill As String)
+   '   If String.IsNullOrEmpty(sCurrDrill) Or String.IsNullOrWhiteSpace(sCurrDrill) Then
+   '      ' creo l'elenco degli utensili di foratura
+   '      Dim sToolName As String = String.Empty
+   '      Dim nType As Integer = MCH_TY.NONE
+   '      Dim DrillToolList As New ObservableCollection(Of String)
+   '      DrillToolList.Clear()
+   '      If EgtTdbGetFirstTool(MCH_TF.DRILLBIT, sToolName, nType) Then
+   '         DrillToolList.Add(sToolName)
+   '         While EgtTdbGetNextTool(MCH_TF.DRILLBIT, sToolName, nType)
+   '            DrillToolList.Add(sToolName)
+   '         End While
+   '      End If
+   '      ' recupero l'utensile associato alla lavorazione
+   '      Dim sCurrDrilling As String = m_MainWindow.m_CurrentMachine.sCurrDrilling
+   '      Dim ToolString As String = String.Empty
+   '      EgtMdbSetCurrMachining(sCurrDrilling)
+   '      ' Recupero nome utensile tramite TUUID
+   '      Dim sTuuid As String = String.Empty
+   '      EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTuuid)
+   '      EgtTdbGetToolFromUUID(sTuuid, ToolString)
+   '      Dim bToolExist As Boolean = False
+   '      For Each CurrTool As IEnumerable In DrillToolList
+   '         If CurrTool.ToString() = ToolString Then
+   '            bToolExist = True
+   '            Exit For
+   '         End If
+   '      Next
+   '      If bToolExist Then
+   '         sCurrDrill = ToolString
+   '      Else
+   '         sCurrDrill = String.Empty
+   '      End If
+   '   End If
+   'End Sub
 
    Private Sub XcoordTxBx_EgtClosed(sender As Object, e As EventArgs) Handles XcoordTxBx.EgtClosed
       ' Recupero il valore della coordinata (in 0 Tab)
@@ -342,6 +355,7 @@ Public Class SingleDrillUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -370,8 +384,10 @@ Public Class SingleDrillUC
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
          Return
       End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
       ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
          ' copio il progetto corrente come progetto in lavorazione
          Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
          My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
@@ -382,7 +398,7 @@ Public Class SingleDrillUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleDrill() As Boolean
@@ -397,7 +413,7 @@ Public Class SingleDrillUC
       Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
       ' Recupero spessore lama corrente
       Dim sDrill As String = m_sCurrDrill
-      GetDrillFromDrilling(sDrill)
+      GetDrillFromDrilling(sDrill, m_MainWindow.m_CurrentMachine.sCurrDrilling)
       EgtTdbSetCurrTool(sDrill)
       Dim dDiam As Double = 0
       EgtTdbGetCurrToolParam(MCH_TP.DIAM, dDiam)
@@ -430,9 +446,9 @@ Public Class SingleDrillUC
       ptIns.z = dRawHeight
       ' Inserisco il pezzo nel grezzo
       EgtAddPartToRawPart(nPartId, ptIns, m_MainWindow.m_CurrentProjectPageUC.m_nRawId)
+      EgtSetCurrPhase(1)
       ' Inserisco la lavorazione
       m_bCutOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
-      EgtSetCurrPhase(1)
       ' Eventuale eliminazione Home finale
       If Not m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome Then
          RemoveFinalHome()

DirectCuts/SquaringUC.xaml

@@ -0,0 +1,162 @@
+<UserControl x:Class="SquaringUC"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+   mc:Ignorable="d" 
+   d:DesignHeight="597.3" d:DesignWidth="256">
+
+   <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">-->
+   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
+
+      <!-- Definizione della Grid MultipleCut -->
+      <Grid Name="SingleCutGrid" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <!--<Grid Grid.Row="0" Grid.ColumnSpan="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <ToggleButton Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>
+
+                <ToggleButton Name="Point2Btn" Grid.Column="1"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>
+            </Grid>-->
+
+         <!--<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
+            Margin="6,0,6,0">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>-->
+
+         <!--<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
+
+         <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="3"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+         <EgtWPFLib:EgtTextBox Name="OffsetTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
+         <TextBlock Name="ExtraLenTxBl" Grid.Column="0" Grid.Row="4"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+         <EgtWPFLib:EgtTextBox Name="ExtraLenTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
+         <!--<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
+            <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
+
+         <!--<Grid Grid.Row="5" Grid.ColumnSpan="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1.5*"/>
+                    <ColumnDefinition Width="2"/>
+                    <ColumnDefinition Width="1.5*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                </Grid.RowDefinitions>
+
+                <Border Grid.Column="1" Grid.Row="0" Grid.RowSpan="4" Background="Black" />
+
+                <TextBlock Name="NumPzXTxBl" Grid.Column="0" Grid.Row="0"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <TextBlock Name="DimPzXTxBl" Grid.Column="2" Grid.Row="0"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+
+                <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                <EgtWPFLib:EgtTextBox Name="DimPzXTxBx" Grid.Column="2" Grid.Row="1" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+                <TextBlock Name="NumPzYTxBl" Grid.Column="0" Grid.Row="2"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <TextBlock Name="DimPzYTxBl" Grid.Column="2" Grid.Row="2"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+
+                <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                <EgtWPFLib:EgtTextBox Name="DimPzYTxBx" Grid.Column="2" Grid.Row="3" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+            </Grid>
+
+            <TextBlock Name="SideTxBl" Grid.Row="6" Grid.ColumnSpan="2"
+             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <CheckBox Name="SideChBx" Grid.Row="6" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+             HorizontalAlignment="Right" Margin="0,0,6,0"/>-->
+
+         <Grid Grid.Row="7" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
+               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+            <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
+               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+            <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+         </Grid>
+
+         <Grid Grid.Row="11" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
+
+      </Grid>
+
+   </Border>
+</UserControl>

DirectCuts/SquaringUC.xaml.vb

@@ -0,0 +1,444 @@
+Imports EgtUILib
+
+Public Class SquaringUC
+
+   ' Riferimenti a pagine
+   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
+   ' Flag di simulazione in corso
+   Private m_bSimul As Boolean = False
+
+   ' Origine tavola e dati grezzo
+   Private m_bRawOk As Boolean = False
+   Private m_ptTabOri As Point3d
+   Private m_ptRawMin As Point3d
+   Private m_ptRawMax As Point3d
+   ' Parametri P1 acquisito
+   Private m_ptTipP1 As Point3d
+   Private m_vtToolP1 As Vector3d
+   ' Parametri P2 acquisito
+   Private m_ptTipP2 As Point3d
+   Private m_vtToolP2 As Vector3d
+   ' Parametri della lavorazione
+   Private m_bCutOk As Boolean = False
+   Private m_dDepth As Double = 0
+   Private m_dOffsetSquaring As Double = 150
+   Private m_dExtraLength As Double = 0
+   Private m_dAngO As Double = 180
+   Private m_dAngV As Double = 0
+   Private m_nNumX As Integer = 0
+   Private m_dDimX As Double = 0
+   Private m_nNumY As Integer = 0
+   Private m_dDimY As Double = 0
+   Private m_bHeadSide As Boolean = False
+
+   ' Punto selezionato nel disegno
+   Private m_ptPrev As Point3d
+   ' Layer per crocette temporanee
+   Private m_nTempLay As Integer = GDB_ID.NULL
+
+   ' Costanti
+   Private Const MAX_TAB_DEPTH As Double = 10.0
+   Private Const MIN_CUT_LEN As Double = 10.0
+   Private Const MAX_SIDE_ANG As Double = 60.0
+
+   'Costante che indica il lato in cui posizionare i tagli
+   Private Enum CutSide As Integer
+      Left
+      Right
+   End Enum
+
+   Private Sub GridCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
+      ' 90260=Extra length
+      ExtraLenTxBl.Text = EgtMsg(90260)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+
+      ' Carico i dati dell'ultimo taglio
+      m_dOffsetSquaring = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_OFFSET_SQUARING, m_dOffsetSquaring, m_MainWindow.GetIniFile())
+      m_dExtraLength = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_EXTRA_LEN_SQUARING, m_dExtraLength, m_MainWindow.GetIniFile())
+      m_dDepth = 0
+      m_dAngO = 90
+      m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
+      m_nNumX = 1
+      m_dDimX = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile())
+      m_nNumY = 1
+      m_dDimY = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMY, m_dDimY, m_MainWindow.GetIniFile())
+      m_bHeadSide = False
+   End Sub
+
+   Private Sub Squaring_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      ' Attivo la pagina
+      m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_bActive = True
+      ' Se rientro da simulazione
+      If m_bSimul Then
+         m_bSimul = False
+         ' Disabilito registrazione progetto modificato
+         EgtDisableModified()
+         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
+         EgtSetMachineLook(MCH_LOOK.TAB)
+         EgtDraw()
+         Return
+      End If
+      ' Disabilito registrazione progetto modificato
+      EgtDisableModified()
+      ' Creo layer temporaneo per crocette
+      m_nTempLay = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
+      ' Origine tavola
+      m_bRawOk = True
+      If Not EgtGetTableRef(1, m_ptTabOri) Then
+         m_bRawOk = False
+         EgtOutLog("Error on TableRef1")
+      End If
+
+      ' Dati del grezzo
+      If Not GetRawBox(m_ptRawMin, m_ptRawMax) Then
+         m_bRawOk = False
+         EgtOutLog("Error on RawBox")
+      End If
+      ' calcolo lalavorazione di squadratura
+      RefreshSquaring()
+   End Sub
+
+   Private Sub RefreshSquaring()
+      If Not m_bRawOk Then Return
+
+      Dim m_ThickSaw As Double
+      EgtTdbGetCurrToolParam(MCH_TP.THICK, m_ThickSaw)
+
+      m_dDepth = CamAuto.GetRawHeight()
+      m_dDimX = Math.Abs(m_ptRawMax.x - m_ptRawMin.x) - 2 * (m_dOffsetSquaring)
+      m_dDimY = Math.Abs(m_ptRawMax.y - m_ptRawMin.y) - 2 * (m_dOffsetSquaring)
+
+      Dim ptStart As New Point3d(m_ptRawMin.x + m_dOffsetSquaring - m_ThickSaw, m_ptRawMin.y + m_dOffsetSquaring, m_ptRawMin.z)
+      Dim ptEnd As New Point3d(ptStart.x + m_dDimX, ptStart.y, m_ptRawMin.z)
+
+      SetCoordVisibility(True)
+      ShowCoord()
+
+      OffsetTxBx.Text = LenToString(m_dOffsetSquaring, 1)
+      ExtraLenTxBx.Text = LenToString(m_dExtraLength, 1)
+      m_bCutOk = False
+      UpdateSimulOkBtn()
+
+      SquaringPoint(ptStart, ptEnd)
+      m_ptPrev = ptStart
+   End Sub
+
+   Friend Sub Squaring_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+      ' Salvo i dati correnti
+      ' Salvo i dati correnti
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_OFFSET_SQUARING, DoubleToString(m_dOffsetSquaring, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_EXTRA_LEN_SQUARING, DoubleToString(m_dExtraLength, 2), m_MainWindow.GetIniFile())
+      ' Se non vado in simulazione
+      If Not m_bSimul Then
+         ' Dichiaro sottopagina da non riattivare
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
+         ' Rimuovo layer temporaneo per crocette
+         EgtErase(m_nTempLay)
+         ' Rimuovo eventuale pezzo per taglio diretto
+         EraseDirectCutPart()
+         ' Riattivo eventuali lavorazioni presenti
+         ActivateAllMachinings()
+         ' Abilito registrazione progetto modificato
+         EgtEnableModified()
+         ' Nascondo la macchina
+         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
+         EgtSetMachineLook(MCH_LOOK.TAB)
+         EgtDraw()
+      End If
+      ' Dichiaro pagina non attiva
+      m_bActive = False
+   End Sub
+
+   Private Sub UpdateSimulOkBtn()
+      If m_bCutOk Then
+         SimulBtn.IsEnabled = True
+         SimulBtn.Foreground = Brushes.Black
+         OkBtn.IsEnabled = True
+         OkBtn.Foreground = Brushes.Black
+      Else
+         SimulBtn.IsEnabled = False
+         SimulBtn.Foreground = Brushes.DarkGray
+         OkBtn.IsEnabled = False
+         OkBtn.Foreground = Brushes.DarkGray
+      End If
+   End Sub
+
+   Private Sub SquaringPoint(ptMin As Point3d, ptMax As Point3d)
+      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
+      EgtEmptyGroup(m_nTempLay)
+      ' 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)
+      '------------- BOTTOM LEFT -------------------
+      ' Assegno punto selezionato nel disegno a m_ptTipP1
+      m_ptTipP1 = ptMin
+      ' Porto il tip nell'origine tavola
+      m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
+      ' Reimposto eventuale precedente utensile
+      EgtSetCalcTool(sTool, sHead, nExit)
+      '-------------  TOP RIGHT   -------------------
+      ' Assegno punto selezionato nel disegno a m_ptTipP2
+      m_ptTipP2 = ptMax
+      ' Porto il tip nell'origine tavola
+      m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
+      ' Reimposto eventuale precedente utensile
+      EgtSetCalcTool(sTool, sHead, nExit)
+
+      ' Se il secondo punto non coincide con il primo, disegno il taglio
+      Dim vtDiff As Vector3d = m_ptTipP2 - m_ptTipP1
+      vtDiff.z = 0
+      Dim dLen As Double
+      Dim dAngVertDeg As Double
+      Dim dAngOrizzDeg As Double
+      vtDiff.ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
+      If dLen > EPS_SMALL Then
+         m_dAngO = dAngOrizzDeg
+         CreateGridCut()
+         ' visuliazzo tavola 
+         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
+         EgtSetMachineLook(MCH_LOOK.TAB)
+         EgtDraw()
+      End If
+   End Sub
+
+   Private Sub OffsetTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsetTxBx.EgtClosed
+      ' Verifico che l'offset impostato non sia superiore a quello massimo
+      Dim dMaxOffset As Double = Math.Min(m_dDimX, m_dDimY) / 2 - 15
+      Dim dOffset As Double = 0
+      StringToLen(OffsetTxBx.Text, dOffset)
+      If dOffset < 0 Then
+         dOffset = 0
+      ElseIf dOffset > dMaxOffset Then
+         dOffset = dMaxOffset
+      End If
+      m_dOffsetSquaring = dOffset
+      OffsetTxBx.Text = LenToString(m_dOffsetSquaring, 2)
+      ' Disegno il taglio
+      RefreshSquaring()
+      EgtDraw()
+   End Sub
+
+   Private Sub ExtraLength_EgtClosed(sender As Object, e As EventArgs) Handles ExtraLenTxBx.EgtClosed
+      ' Verifico che il valore indicato sia almeno maggiore dell'offset indicato
+      Dim dOffset As Double = 0
+      StringToLen(OffsetTxBx.Text, dOffset)
+      Dim MadExtraLeng As Double = Math.Abs(dOffset)
+      Dim dExtraLen As Double
+      StringToLen(ExtraLenTxBx.Text, dExtraLen)
+      If dExtraLen < 0 AndAlso dExtraLen < -MadExtraLeng Then
+         dExtraLen = 0
+      End If
+      m_dExtraLength = dExtraLen
+      ExtraLenTxBx.Text = LenToString(m_dExtraLength, 2)
+      ' Disegno il taglio
+      RefreshSquaring()
+      EgtDraw()
+   End Sub
+
+   Private Sub SimulBtn_Click(sender As Object, e As RoutedEventArgs) Handles SimulBtn.Click
+      ' Verifico ci sia un taglio valido
+      If Not m_bCutOk Then Return
+      ' Salvo il progetto con le lavorazioni
+      EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
+      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
+      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
+      ' Predispongo passaggio a simulazione
+      m_bSimul = True
+      m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
+      m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
+      m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
+      m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
+      m_MainWindow.m_ActivePage = MainWindow.Pages.Simulation
+   End Sub
+
+   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
+#If TRIAL Then
+      m_CurrProjPage.SetWarningMessage("Trial Version")
+#Else
+      ' Verifico non sia versione Ufficio
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
+         m_CurrProjPage.SetWarningMessage("Office Version")
+         Return
+      End If
+      ' Verifico ci sia un taglio valido
+      If Not m_bCutOk Then Return
+      ' Salvo il progetto con le lavorazioni
+      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
+      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
+      ' Genero file CNC (lancio anche se errore in precedenza)
+      Dim sCncPath As String = m_MainWindow.GetCncDir() & "\DirectCut" & m_MainWindow.m_CurrentMachine.sIsoFileExt
+      Dim bOk As Boolean = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion())
+      ' Se errore in generazione, segnalo l'errore ed esco
+      If Not bOk Then
+         m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
+         Return
+      End If
+      Dim sNameProg As Integer = 900
+      sNameProg = GetPrivateProfileInt(S_PARTPROGRAM, "NameProg", sNameProg, m_MainWindow.GetMachIniFile)
+      ' Download programma (eventuali errori sono segnalati dalla funzione)
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, sNameProg) Then
+         ' copio il progetto corrente come progetto in lavorazione
+         Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
+         My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
+         ' lancio eventuale lua post-trasmissione
+         m_MainWindow.ExecSentProgScript(True)
+      End If
+#End If
+   End Sub
+
+   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+   End Sub
+
+   Private Function CreateGridCut() As Boolean
+      ' Verifico sia definito il punto iniziale e il grezzo
+      If Not m_bRawOk Then
+         m_bCutOk = False
+         Return False
+      End If
+      ' Spessore grezzo
+      Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
+      ' Rimuovo eventuale vecchio pezzo per taglio diretto
+      EraseDirectCutPart()
+      ' Disattivo eventuali lavorazioni presenti
+      DeactivateAllMachinings()
+      ' Creo nuovo pezzo per il taglio diretto
+      Dim nPartId = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetName(nPartId, NAME_DIRECTCUT)
+      Dim nLayerId = EgtCreateGroup(nPartId)
+      EgtSetName(nLayerId, NAME_OUTLOOP)
+      ' Creo il taglio parallelo alla lama
+      Dim ptStart As Point3d = m_ptTipP1
+      ptStart.z = 0
+      ' Funzione che crea i tagli successivi al primo
+      MultiplyCut(nLayerId)
+      ' Calcolo punto di inserimento nel grezzo
+      Dim ptMin, ptMax As Point3d
+      EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, ptMin, ptMax)
+      Dim ptIns As Point3d = ptMin + (m_ptTabOri - m_ptRawMin)
+      ptIns.z = dRawHeight
+      ' Inserisco il pezzo nel grezzo
+      EgtAddPartToRawPart(nPartId, ptIns, m_MainWindow.m_CurrentProjectPageUC.m_nRawId)
+      ' Inserisco la lavorazione
+      m_bCutOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
+      EgtSetCurrPhase(1)
+      ' Eventuale eliminazione Home finale
+      If Not m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome Then
+         RemoveFinalHome()
+      End If
+      UpdateSimulOkBtn()
+      Return m_bCutOk
+   End Function
+
+   Private Function MultiplyCut(nLayerId As Integer) As Boolean
+      ' Recupero lo spessore del taglio della lama o del waterjet correntemente attiva
+      Dim nType As Integer = 0
+      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
+      Dim dThick As Double = 0
+      EgtTdbGetCurrToolParam(If(nType = MCH_TY.SAW_STD, MCH_TP.THICK, MCH_TP.DIAM), dThick)
+      ' Ricalcolo lo spessore in base all'inclinazione
+      dThick = dThick / Math.Cos(m_dAngV * Math.PI / 180)
+      ' Imposto angolo di rotazione a seconda del lato dei tagli paralleli
+      Dim dRotAngOX As Double = 90
+      ' Recupero dati da interfaccia
+      Dim dDimPzX As Double = m_dDimX
+      Dim nNumPzX As Integer = m_nNumX
+      Dim dDimPzY As Double = m_dDimY
+      Dim nNumPzY As Integer = m_nNumY
+      ' Definisco vettore di spostamento
+      Dim vtDelta As Vector3d
+      ' Calcolo primo taglio parallelo
+      Dim ptStart As Point3d = m_ptTipP1
+      ptStart.z = 0
+      If dDimPzY <> 0 And nNumPzY > 0 And dDimPzX <> 0 And nNumPzX > 0 Then
+         Dim dLenX As Double = dThick + (dDimPzX + dThick) * nNumPzX
+         Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1)
+         ' Imposto affondamento e angolo di fianco sul taglio
+         EgtSetInfo(nCutParaId, INFO_DEPTH, m_dDepth)
+         EgtSetInfo(nCutParaId, INFO_SIDE_ANGLE, m_dAngV)
+         ' Allungo la geometria
+         EgtExtendCurveStartByLen(nCutParaId, m_dOffsetSquaring + m_dExtraLength)
+         EgtExtendCurveEndByLen(nCutParaId, m_dOffsetSquaring + +m_dExtraLength)
+         ' Calcolo vettore di spostamento
+         vtDelta = Vector3d.FromPolar((dDimPzY + dThick), m_dAngO)
+         ' Ruoto il vettore di traslazione 
+         vtDelta.Rotate(Vector3d.Z_AX, dRotAngOX)
+         For Index As Integer = 1 To nNumPzY
+            Dim vtPerpMove As Vector3d = Index * vtDelta
+            ' Creo copie
+            Dim nCut2Id = EgtCopyGlob(nCutParaId, nLayerId)
+            EgtMove(nCut2Id, vtPerpMove, GDB_RT.GLOB)
+         Next
+         ' Calcolo primo taglio perpendicolare
+         Dim dLenY As Double = dThick + (dDimPzY + dThick) * nNumPzY
+         ' Arretro il punto di partenza di uno spessore lama
+         Dim vtDeltaPos As Vector3d = Vector3d.FromPolar(dThick + 0.1, m_dAngO - 90)
+         Dim nCutPerpId = EgtCreateLinePDL(nLayerId, ptStart + vtDeltaPos, m_dAngO + 90, dLenY + 0.2)
+         ' Imposto affondamento e angolo di fianco sul taglio
+         EgtSetInfo(nCutPerpId, INFO_DEPTH, m_dDepth)
+         EgtSetInfo(nCutPerpId, INFO_SIDE_ANGLE, m_dAngV)
+         ' Allungo la geometria
+         EgtExtendCurveStartByLen(nCutPerpId, m_dOffsetSquaring + m_dExtraLength)
+         EgtExtendCurveEndByLen(nCutPerpId, m_dOffsetSquaring + +m_dExtraLength)
+         ' Calcolo secondo vettore di spostamento
+         vtDelta = Vector3d.FromPolar((dDimPzX + dThick), m_dAngO)
+         For Index As Integer = 1 To nNumPzX
+            Dim vtPerpMove As Vector3d = vtDelta * Index
+            ' Creo copie
+            Dim nCut3Id = EgtCopyGlob(nCutPerpId, nLayerId)
+            EgtMove(nCut3Id, vtPerpMove, GDB_RT.GLOB)
+         Next
+      End If
+      Return True
+   End Function
+
+   Private Sub SetCoordVisibility(bShow As Boolean)
+      XcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+      XcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+      YcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+      YcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+   End Sub
+
+   Private Sub ShowCoord()
+      Dim ptText As Point3d = m_ptPrev
+      ptText.ToLoc(New Frame3d(m_ptTabOri))
+      XcoordTxBx.Text = LenToString(ptText.x, 2)
+      YcoordTxBx.Text = LenToString(ptText.y, 2)
+   End Sub
+
+   Private Function SetMachineInCurrPos() As Boolean
+      ' Recupero la posizione macchina
+      Dim dL1, dL2, dL3, dR1, dR2 As Double
+      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return False
+      ' Recupero il nome degli assi macchina
+      Dim sL1 As String = String.Empty
+      Dim sL2 As String = String.Empty
+      Dim sL3 As String = String.Empty
+      Dim sR1 As String = String.Empty
+      Dim sR2 As String = String.Empty
+      If Not m_MainWindow.m_CNCommunication.GetAxesNames(sL1, sL2, sL3, sR1, sR2) Then Return False
+      ' Visualizzo macchina in posizione
+      EgtSetAxisPos(sL1, dL1)
+      EgtSetAxisPos(sL2, dL2)
+      EgtSetAxisPos(sL3, dL3)
+      EgtSetAxisPos(sR1, dR1)
+      EgtSetAxisPos(sR2, dR2)
+      Return True
+   End Function
+
+End Class
+

DirectCuts/VacuumMachineButtonUC.xaml.vb

@@ -22,6 +22,9 @@ Public Class VacuumMachineButtonUC
    Friend m_CN As CN_generico
    Private m_bFirst As Boolean = True
 
+   ' visualizzo l'elenco degli elementi della pagina sono al primo avvio
+   Friend m_OutLogTypeButton As Boolean = True
+
    ' Creazione converter da String a ImageSource
    Dim ImageConverter As New ImageSourceConverter
 
@@ -71,10 +74,37 @@ Public Class VacuumMachineButtonUC
                If Not IsNothing(ButtonToAdd) Then m_ButtonList.Add(ButtonToAdd)
             End If
          End While
+
+         For Each MachineButton As MachineButton In m_ButtonList
+            OutLogTypeButton(MachineButton)
+         Next
+         m_OutLogTypeButton = False
+
          NotifyPropertyChanged("ButtonList")
       End If
    End Sub
 
+#Region "STATE CHANGED"
+   ' ------------------------------------------------------------------------------
+   ' i segeunti metodi notificano il cambiamento di stato di specifici bottoni
+   '-------------------------------------------------------------------------------
+
+   Friend Sub OutLogTypeButton(CurrMachineButton As MachineButton)
+      If Not m_OutLogTypeButton Then Return
+      Dim BtnType As Type = CurrMachineButton.GetType
+      If BtnType Is GetType(NoStateButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(0) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(TwoStateButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(1) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(ThreeStateButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(2) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(DoubleCommandButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(3) ") & " , " & CurrMachineButton.StateFlag)
+      ElseIf BtnType Is GetType(PressedCommandButton) Then
+         EgtOutLog(" ► " & BtnType.ToString.Replace("OmagCUT.", "(4) ") & " , " & CurrMachineButton.StateFlag)
+      End If
+   End Sub
+
    Friend Sub VacuumUpChanged(VacuumUpState As Boolean)
       Dim VacuumUpButton As TwoStateButton = Nothing
       For Each MachineButton As MachineButton In m_ButtonList
@@ -371,6 +401,8 @@ Public Class VacuumMachineButtonUC
       Next
    End Sub
 
+#End Region    ' State Range
+
    Public Function GetPrivateProfileMachineButtons(
                          ByVal lpAppName As String,
                          ByVal lpKeyName As String,

DrawImport/AlzFrontUC.xaml

@@ -199,12 +199,12 @@
                                   Visibility="Collapsed"
                                   Grid.Column="2" Grid.Row="1"
                                   HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
+                                  Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
                                   Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="Parameter2FTxBx" 
                                   Grid.Column="3" Grid.Row="1" 
                                   HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
+                                  Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
                                   Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
             <!-- Spessore aletta -->

DrawImport/AlzFrontUC.xaml.vb

@@ -76,9 +76,9 @@ Public Class AlzFrontUC
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
 
       ' nome dei parametri condivisi
-      Parameter1TxBl.Text = "Altezza"
-      Parameter2TxBl.Text = "Delta angolo"
-      Parameter5TxBl.Text = "Spessore"
+      Parameter1TxBl.Text = EgtMsg(91134)
+      Parameter2TxBl.Text = EgtMsg(91135)
+      Parameter5TxBl.Text = EgtMsg(91136)
 
       EgtZoom(ZM.ALL)
    End Sub
@@ -96,8 +96,14 @@ Public Class AlzFrontUC
       Dim LabelId As Integer = GDB_ID.NULL
 
       ' definisco i valori delle altezza e degli angoli di spoglia per le alzatine e i frontalini (letti da file ini del programma)
-      GetPrivateProfileString(S_ALZFRONT, K_ALZ_HEIGHT, "0", Parameter1ATxBx.Text, m_MainWindow.GetIniFile)
-      GetPrivateProfileString(S_ALZFRONT, K_FRONT_HEIGHT, "0", Parameter1FTxBx.Text, m_MainWindow.GetIniFile)
+      Dim sVal As String = String.Empty
+      Dim dVal As Double = 0
+      GetPrivateProfileString(S_ALZFRONT, K_ALZ_HEIGHT, "0", sVal, m_MainWindow.GetIniFile)
+      Utility.StringToDouble(sVal, dVal)
+      Parameter1ATxBx.Text = Utility.LenToString(dVal, 4)
+      GetPrivateProfileString(S_ALZFRONT, K_FRONT_HEIGHT, "0", sVal, m_MainWindow.GetIniFile)
+      Utility.StringToDouble(sVal, dVal)
+      Parameter1FTxBx.Text = Utility.LenToString(dVal, 4)
       GetPrivateProfileString(S_ALZFRONT, K_ALZ_DELTA_ANG, "0", Parameter2ATxBx.Text, m_MainWindow.GetIniFile)
       GetPrivateProfileString(S_ALZFRONT, K_FRONT_DELTA_ANG, "0", Parameter2FTxBx.Text, m_MainWindow.GetIniFile)
       Parameter5TxBx.Text = Utility.LenToString(m_MainWindow.m_CurrentProjectPageUC.m_dRawHeight, 2)
@@ -281,32 +287,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
@@ -625,9 +613,9 @@ Public Class AlzFrontUC
    Private Sub ParameterA1TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter1ATxBx.EgtClosed
       ' Nuovo angolo di inclinazione
       Dim dValue As Double
-      StringToDouble(Parameter1ATxBx.Text, dValue)
+      StringToLen(Parameter1ATxBx.Text, dValue)
       ' salvo il valore nel file ini e inserisco il valore nel file lua
-      WritePrivateProfileString("Alz&Front", "A_Height", Parameter1ATxBx.Text, m_MainWindow.GetIniFile())
+      WritePrivateProfileString("Alz&Front", "A_Height", DoubleToString(dValue, 3), m_MainWindow.GetIniFile())
       ' aggiorno il disegno
       LoadCurrentCompo()
    End Sub
@@ -636,9 +624,9 @@ Public Class AlzFrontUC
    Private Sub Parameter1FTxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter1FTxBx.EgtClosed
       ' Nuovo angolo di inclinazione
       Dim dValue As Double
-      StringToDouble(Parameter1FTxBx.Text, dValue)
+      StringToLen(Parameter1FTxBx.Text, dValue)
       ' salvo il valore nel file ini e inserisco il valore nel file lua
-      WritePrivateProfileString("Alz&Front", "F_Height", Parameter1FTxBx.Text, m_MainWindow.GetIniFile())
+      WritePrivateProfileString("Alz&Front", "F_Height", DoubleToString(dValue, 3), m_MainWindow.GetIniFile())
       ' aggiorno il disegno
       LoadCurrentCompo()
    End Sub

DrawImport/CompoDimensionUC.xaml.vb

@@ -37,7 +37,7 @@ Public Class CompoDimensionUC
       InternComponentBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 47)     ' Componenti interni
       If Not String.IsNullOrEmpty(sCompoDir) Then
          bEnableAlzFront = True
-         AlzFrontBtn.Content = "Alzatine & Frontalini"
+         AlzFrontBtn.Content = EgtMsg(91137)
       Else
          AlzFrontBtn.Visibility = Visibility.Collapsed
       End If
@@ -75,6 +75,7 @@ Public Class CompoDimensionUC
          m_DrawPage.sCompoName.StartsWith("PBagno") Then
          ShowInternalBtn(True)
          ShowAlzFrontBtn(bEnableAlzFront)
+         m_DrawPage.MessageGrid.Visibility = Visibility.Hidden
       Else
          ShowInternalBtn(False)
          ShowAlzFrontBtn(False)
@@ -106,8 +107,10 @@ Public Class CompoDimensionUC
    Friend Sub ShowAlzFrontBtn(ByVal value As Boolean)
       If value Then
          AlzFrontBtn.Visibility = Visibility.Visible
+         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Hidden
       Else
          AlzFrontBtn.Visibility = Visibility.Hidden
+         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Visible
       End If
    End Sub
 
@@ -336,6 +339,7 @@ Public Class CompoDimensionUC
             Dim nCmpInfo As Integer = 0
             If EgtGetInfo(nId, "ID", nCmpInfo) AndAlso nCmp = nCmpInfo Then
                EgtSetStatus(nId, GDB_ST.OFF)
+               UpdateInLoopReference(nCmp)
                Exit While
             End If
             nId = EgtGetNextName(nId, "HoleLabels")
@@ -379,5 +383,42 @@ Public Class CompoDimensionUC
       EgtDraw()
    End Sub
 
+   Private Sub UpdateInLoopReference(nCmp As Integer)
+      ' aggiorno il layer "FiloTop"
+      Dim nIdInLoop As Integer = EgtGetFirstNameInGroup(EgtGetFirstGroupInGroup(GDB_ID.ROOT), "InLoop")
+      While nIdInLoop <> GDB_ID.NULL
+         Dim nCmpInfoIL As Integer = 0
+         If EgtGetInfo(nIdInLoop, "ID", nCmpInfoIL) AndAlso nCmp = nCmpInfoIL Then
+            Dim nLayFiloTop As Integer = GDB_ID.NULL
+            EgtGetInfo(nIdInLoop, "FiloTopRef", nLayFiloTop)
+            If nLayFiloTop <> GDB_ID.NULL Then
+               Dim LocalList As New List(Of Integer) From {nIdInLoop}
+               m_DrawPage.m_FiloTopUC.CreateFiloTopPreView(LocalList)
+               EgtSetStatus(nLayFiloTop, GDB_ST.ON_)
+               Exit While
+            End If
+         End If
+         nIdInLoop = EgtGetNextName(nIdInLoop, "InLoop")
+      End While
+   End Sub
+
+   ' riceve la info "ID" della componente
+   Public Sub SetStatusVisibilityInLoopReference(nCmp As Integer, Status As GDB_ST)
+      ' aggiorno il layer "FiloTop"
+      Dim nIdInLoop As Integer = EgtGetFirstNameInGroup(EgtGetFirstGroupInGroup(GDB_ID.ROOT), "InLoop")
+      While nIdInLoop <> GDB_ID.NULL
+         Dim nCmpInfoIL As Integer = 0
+         If EgtGetInfo(nIdInLoop, "ID", nCmpInfoIL) AndAlso nCmp = nCmpInfoIL Then
+            Dim nLayFiloTop As Integer = GDB_ID.NULL
+            EgtGetInfo(nIdInLoop, "FiloTopRef", nLayFiloTop)
+            If nLayFiloTop <> GDB_ID.NULL Then
+               EgtSetStatus(nLayFiloTop, Status)
+               Exit While
+            End If
+         End If
+         nIdInLoop = EgtGetNextName(nIdInLoop, "InLoop")
+      End While
+   End Sub
+
 #End Region    ' METHODS for InternalCompo
 End Class

DrawImport/CompoTrfData.xaml.vb

@@ -24,6 +24,7 @@ Public Class CompoTrfData
 
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       DialogResult = True
+      SaveData()
       Close()
    End Sub
 
@@ -32,7 +33,30 @@ Public Class CompoTrfData
       Close()
    End Sub
 
+   Private Sub SaveData()
+      WritePrivateProfileString(S_TRF, K_ORDCODE, OrdCodeTxBx.Text, m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_TRF, K_ORDDESC, OrdDescTxBx.Text, m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_TRF, K_PARTCODE, PartCodeTxBx.Text, m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_TRF, K_MATCODE, MatCodeTxBx.Text, m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_TRF, K_SURFCODE, SurfCodeTxBx.Text, m_MainWindow.GetIniFile())
+      ' prima di salvare lo spessore converto in mm e poi di nuovo in stringa
+      Dim dVal As Double = 0
+      StringToLen(ThicknessTxBx.Text, dVal)
+      WritePrivateProfileString(S_TRF, K_TRFTHICKNESS, DoubleToString(dVal, 4), m_MainWindow.GetIniFile())
+   End Sub
+
    Friend Sub SetData(sOrdCode As String, sOrdDesc As String, sPartCode As String, sMatCode As String, sSurfCode As String, dTh As Double)
+      ' se verifico che non sono stati iniziliazzti i campi allora provvedo a leggere il file ini del programma
+      If sOrdCode = "" And sOrdDesc = "" And sPartCode = "" And sMatCode = "" And sSurfCode = "" Then
+         GetPrivateProfileString(S_TRF, K_ORDCODE, sOrdCode, sOrdCode, m_MainWindow.GetIniFile())
+         GetPrivateProfileString(S_TRF, K_ORDDESC, sOrdDesc, sOrdDesc, m_MainWindow.GetIniFile())
+         GetPrivateProfileString(S_TRF, K_PARTCODE, sPartCode, sPartCode, m_MainWindow.GetIniFile())
+         GetPrivateProfileString(S_TRF, K_MATCODE, sMatCode, sMatCode, m_MainWindow.GetIniFile())
+         GetPrivateProfileString(S_TRF, K_SURFCODE, sSurfCode, sSurfCode, m_MainWindow.GetIniFile())
+         ' recupero il dato dello spessore che deve essere in mm
+         dTh = GetPrivateProfileDouble(S_TRF, K_TRFTHICKNESS, dTh, m_MainWindow.GetIniFile())
+      End If
+      ' inizializzo i campi della finestra
       OrdCodeTxBx.Text = sOrdCode
       OrdDescTxBx.Text = sOrdDesc
       PartCodeTxBx.Text = sPartCode

DrawImport/DrawPageUC.xaml

@@ -64,7 +64,7 @@
                <ToggleButton Name="DimensionBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowToggleButton}" Visibility="Collapsed"/>
             </Grid>
 
-            <Grid Name="VariablesGrd" Grid.Row="1" Grid.ColumnSpan="2"/>
+            <Grid Name="VariablesGrd" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
             
             <Grid Name="MessageGrid" Grid.Row="2" Grid.ColumnSpan="2">
                <TextBlock Name="MessageTxBl" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
@@ -124,7 +124,7 @@
 
             <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"
                TextAlignment="Right"/>
-            <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60"
+            <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
             </Grid>

DrawImport/DrawPageUC.xaml.vb

@@ -41,6 +41,9 @@ Public Class DrawPageUC
    Friend m_bDrawOk As Boolean = False
    Private m_bFirst As Boolean = True
 
+   Private m_SelListHole As New List(Of Integer)
+   Private m_DeselectListHole As New List(Of Integer)
+
    ' questa variabile serve per risalire al nome della componente che ospita i componenti interni att
    Friend m_sMainCompo As String = String.Empty
 
@@ -280,6 +283,19 @@ Public Class DrawPageUC
       m_sCsvOrder = ""
       m_sCsvList = ""
       m_sCsvName = ""
+
+      ' Visuliazzazione dei bottoni per modifica dei componenti
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         SideAngleBtn.Visibility = Visibility.Hidden
+         FiloTopBtn.Visibility = Visibility.Hidden
+         EngraveBtn.Visibility = Visibility.Hidden
+         DripCutBtn.Visibility = Visibility.Hidden
+      Else
+         SideAngleBtn.Visibility = Visibility.Visible
+         FiloTopBtn.Visibility = Visibility.Visible
+         EngraveBtn.Visibility = Visibility.Visible
+         DripCutBtn.Visibility = Visibility.Visible
+      End If
    End Sub
 
    ' recupero il click sulla scena ed assegno il metodo a secondo della pagina aperta
@@ -360,6 +376,8 @@ Public Class DrawPageUC
          Dim nCmpInfo As Integer = 0
          If EgtGetInfo(nHLId, "ID", nCmpInfo) AndAlso nCmp = nCmpInfo Then
             EgtSetStatus(nHLId, GDB_ST.ON_)
+            ' nascondo eventuali FiloTop
+            m_CompoDimension.SetStatusVisibilityInLoopReference(nCmp, GDB_ST.OFF)
             Exit While
          End If
          nHLId = EgtGetNextName(nHLId, "HoleLabels")
@@ -462,21 +480,25 @@ Public Class DrawPageUC
                   EgtDeselectObj(nId)
                   EgtDeselectObj(nLayId)
                   Dim sLayName As String = ""
-                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo( nLayId, INFO_FILOTOP) Then
-                     EgtRemoveInfo( nLayId, INFO_FILOTOP)
-                     EgtRemoveInfo( nLayId, INFO_OFFSET)
-                     EgtRemoveInfo( nLayId, INFO_DEPTH)
-                     EgtResetColor( nLayId)
+                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
+                     EgtRemoveInfo(nLayId, INFO_FILOTOP)
+                     EgtRemoveInfo(nLayId, INFO_OFFSET)
+                     EgtRemoveInfo(nLayId, INFO_DEPTH)
+                     EgtResetColor(nLayId)
                   End If
+                  m_DeselectListHole.Add(nLayId)
+                  m_SelListHole.Remove(nLayId)
                Else
                   Dim sLayName As String = ""
-                  If EgtGetName( nLayId, sLayName) AndAlso sLayName = NAME_INLOOP Then
-                     EgtSelectObj( nId)
-                     EgtSelectObj( nLayId)
-                     EgtSetInfo( nLayId, INFO_FILOTOP, 1)
-                     EgtSetInfo( nLayId, INFO_OFFSET, m_FiloTopUC.FiloTopOffset)
-                     EgtSetInfo( nLayId, INFO_DEPTH, m_FiloTopUC.FiloTopDepth)
-                     EgtSetColor( nLayId, New Color3d(255, 255, 255))
+                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP Then
+                     EgtSelectObj(nId)
+                     EgtSelectObj(nLayId)
+                     EgtSetInfo(nLayId, INFO_FILOTOP, 1)
+                     EgtSetInfo(nLayId, INFO_OFFSET, m_FiloTopUC.FiloTopOffset)
+                     EgtSetInfo(nLayId, INFO_DEPTH, m_FiloTopUC.FiloTopDepth)
+                     EgtSetColor(nLayId, New Color3d(255, 255, 255))
+                     m_SelListHole.Add(nLayId)
+                     m_DeselectListHole.Remove(nLayId)
                   End If
                End If
                EgtDraw()
@@ -484,6 +506,8 @@ Public Class DrawPageUC
          End If
          nId = EgtGetNextObjInSelWin()
       End While
+      m_FiloTopUC.CreateFiloTopPreView(m_SelListHole)
+      m_FiloTopUC.EraseFiloTopPreview(m_DeselectListHole)
    End Sub
 
    Private Sub OnShowDistanceVector(sender As Object, vtDist As Vector3d) Handles DrawScene.OnShowDistanceVector
@@ -542,6 +566,7 @@ Public Class DrawPageUC
       OkBtn.IsEnabled = True
    End Sub
 
+   ' Navigazione nelle due pagine per la selezione dei componenti da disegnare
    Friend Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
       m_SceneButtons.MeasureBtn.IsChecked = False
       DrawPage_Unloaded(sender, e)
@@ -633,10 +658,17 @@ Public Class DrawPageUC
          m_CompoDimension.GetNameEdit(j).Text = m_CVars(i - 1).m_sName
          m_CompoDimension.GetNameEdit(j).Visibility = Windows.Visibility.Visible
          m_CompoDimension.GetValueEdit(j).Text = m_CVars(i - 1).ToString()
+         'Dim dVal As Double
+         'StringToLen(m_CVars(i - 1).ToString(), dVal)
+         'm_CompoDimension.GetValueEdit(j).Text = LenToString(dVal, 3)
          m_CompoDimension.GetValueEdit(j).Visibility = Windows.Visibility.Visible
          If m_CVars(i - 1).m_nType = 5 Then
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).Keyboard = EgtTextBox.KeyboardType.Alphanumeric
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).KeyboardDimension = 600
+         ElseIf m_CVars(i - 1).m_nType = 4 Then
+            TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).Keyboard = EgtTextBox.KeyboardType.Calculator
+            TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).IsLength = False
+            TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).KeyboardDimension = 300
          Else
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).Keyboard = EgtTextBox.KeyboardType.Calculator
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).KeyboardDimension = 300
@@ -882,7 +914,7 @@ Public Class DrawPageUC
 
    ' permette di inserire più di un part
    Private Function MakeMultipleInsert(ByVal nNbr As Integer, sName As String) As Boolean
-      
+
       Dim InsertColor As Color3d = CompoColor(m_MainWindow.GetIniFile())
 
       ' Imposto il contesto corrente
@@ -893,6 +925,9 @@ Public Class DrawPageUC
       ' Cancello layer regioni per selezione buchi
       Pz = EgtGetFirstGroupInGroup(GDB_ID.ROOT)
 
+      ' identificativo univoico del gruppo di pezzi, se più di un pezzo
+      Dim sGUICode As String = String.Empty
+
       While Pz <> -1
          ' imposto il contesto corrente
          EgtSetCurrentContext(DrawScene.GetCtx())
@@ -1040,6 +1075,11 @@ Public Class DrawPageUC
          EgtEraseEmptyParts()
          ' Area dei nuovi pezzi
          Dim dNewArea As Double = 0
+
+         If nNbr > 1 Then
+            sGUICode = System.Guid.NewGuid.ToString
+         End If
+
          ' Se esiste il file del pezzo
          If My.Computer.FileSystem.FileExists(sTmpFile) Then
             ' eseguo inserimento
@@ -1054,7 +1094,13 @@ Public Class DrawPageUC
                If m_bTrfData Then EgtSetInfo(nId2, "CsvPart", m_TrfOrderCode & "-" & nId2.ToString())
                ' Aggiorno l'area dei nuovi pezzi
                dNewArea += GeomCalc.GetPartArea(nId2)
-               ' Inserisco in parcheggio
+
+               ' assegno l'identificatico del pezzo, se esiste
+               If Not String.IsNullOrEmpty(sGUICode) Then
+                  Dim sPreGuid As String = CreatePreGuidCode(nId2)
+                  EgtSetInfo(nId2, INFO_REFGROUP, sPreGuid & sGUICode)
+               End If
+               ' muovo il pezzo nella prima posizione di parcheggio libera
                m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePart(nId2, True)
 
                ' ------------------------ AGGIUNGO PEZZO NEL VEINMATCH ----------------------------------
@@ -1092,6 +1138,33 @@ Public Class DrawPageUC
       Return True
    End Function
 
+   Private Function MakeSectionFrameInsert(ByVal nNbr As Integer) As Boolean
+      ' m_MainWindow.m_ImportPageUC.LoadFrame()
+      ' recupero il primo layer del primo pezzo
+      Dim nLayerId As Integer = EgtGetFirstLayer(EgtGetFirstPart())
+      If nLayerId = GDB_ID.NULL Then Return False
+      ' percorso in cui salvare tempora
+      Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\Frame.Nge"
+      If Not EgtSaveObjToFile(nLayerId, sTmpFile, NGE.BIN) Then Return False
+      ' Passo al contesto principale
+      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+      ' Inserisco il pezzo
+      If Not My.Computer.FileSystem.FileExists(sTmpFile) Then Return False
+      ' eseguo inserimento
+      For i As Integer = 1 To nNbr
+         EgtInsertFile(sTmpFile)
+         ' Ne recupero l'Id
+         Dim nPartId As Integer = EgtGetLastPart()
+         ' Creo la cornice
+         m_MainWindow.m_FrameCutPageUC.CreateFrame(nPartId)
+         ' Ricalcolo lavorazioni
+         AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim)
+      Next
+      ' Cancello il file
+      My.Computer.FileSystem.DeleteFile(sTmpFile)
+      Return True
+   End Function
+
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       m_bBackFromInternalCompo = False
       m_bInternalCompo = False
@@ -1107,22 +1180,45 @@ Public Class DrawPageUC
       Dim InsNbr As Integer = Int32.Parse(PartNumTxBx.Text)
       ' Passo al contesto principale
       'MakeInsert(InsNbr, sPartName)
-      MakeMultipleInsert(InsNbr, sPartName)
-      ' Aggiorno ambiente principale
-      EgtZoom(ZM.ALL)
-      ' Elimino nome del componente precedente
-      m_sCompoName = String.Empty
-      ' Reset inclinazioni
-      m_SideAngleUC.DeleteSideAngle()
-      ' Chiudo compo interni nel caso siano aperti
-      LeftButtonGrd.Children.Remove(m_MainComponentPage.m_SecondaryComponentPage)
-      LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
-      LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
-      ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
-      m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
-      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         MakeSectionFrameInsert(InsNbr)
+      Else
+         MakeMultipleInsert(InsNbr, sPartName)
+      End If
+      Dim bExitPage As Boolean = GetPrivateProfileInt(S_GENERAL, K_QUITDRAWPAGE, 1, m_MainWindow.GetIniFile) <> 0
+      ' Se Shift premuto eseguo il contrario
+      If Keyboard.Modifiers And ModifierKeys.Shift Then
+         bExitPage = Not bExitPage
+      End If
+      If bExitPage Then
+         ' Aggiorno ambiente principale
+         EgtZoom(ZM.ALL)
+         ' Elimino nome del componente precedente
+         m_sCompoName = String.Empty
+         ' Reset inclinazioni
+         m_SideAngleUC.DeleteSideAngle()
+         ' Chiudo compo interni nel caso siano aperti
+         LeftButtonGrd.Children.Remove(m_MainComponentPage.m_SecondaryComponentPage)
+         LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
+         LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
+         ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
+         m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
+         m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
+         m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)
+      Else
+         m_SceneButtons.MeasureBtn.IsChecked = False
+         DrawPage_Unloaded(sender, e)
+         ' Elimino nome del componente precedente
+         m_sCompoName = String.Empty
+         ' Reset inclinazioni
+         m_SideAngleUC.DeleteSideAngle()
+         If String.IsNullOrEmpty(m_MainComponentPage.m_SecondaryComponentPage.m_sCurrCompo) Then
+            DrawPage_Loaded(sender, e)
+         Else
+            LoadSecondaryPage()
+         End If
 
+      End If
    End Sub
 
    ' esco dalla pagina corrente
@@ -1142,14 +1238,16 @@ Public Class DrawPageUC
       ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
+      m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)
    End Sub
 
    Private Sub TrfDataBtn_Click(sender As Object, e As RoutedEventArgs) Handles TrfDataBtn.Click
       If m_bTrfData Then
          Dim DlgTrfData As New CompoTrfData(m_MainWindow)
+         ' carico i dati appena salvati nella pagina
          DlgTrfData.SetData(m_TrfOrderCode, m_TrfOrderDesc, m_TrfPartCode, m_TrfMatCode, m_TrfSurfCode, m_TrfThickness)
          If DlgTrfData.ShowDialog() Then
+            ' recupero i dati salvati nella pagina
             DlgTrfData.GetData(m_TrfOrderCode, m_TrfOrderDesc, m_TrfPartCode, m_TrfMatCode, m_TrfSurfCode, m_TrfThickness)
          End If
       ElseIf m_bCsvData Then
@@ -1228,6 +1326,8 @@ Public Class DrawPageUC
    Private Sub EngraveBtn_Click(sender As Object, e As RoutedEventArgs) Handles EngraveBtn.Click
       m_SceneButtons.MeasureBtn.IsChecked = False
       If EngraveBtn.IsChecked Then
+         ' Aumento lo spazio disponibile per inserirei i parametri (tolgo spazio ad eventuali messaggi)
+         Grid.SetRowSpan(VariablesGrd, 2)
          ' Imposto modalità
          m_SideAngleUC.m_Mode = SideAngleUC.ModeOpt.ENGRAVE
          If m_ActiveComponentPage = Pages.CompoDimension Then
@@ -1259,6 +1359,7 @@ Public Class DrawPageUC
          EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
          EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
       Else
+         Grid.SetRowSpan(VariablesGrd, 2)
          VariablesGrd.Children.Remove(m_SideAngleUC)
          If m_PrevSideAnglePage = Pages.CompoDimension Then
             VariablesGrd.Children.Add(m_CompoDimension)
@@ -1348,6 +1449,8 @@ Public Class DrawPageUC
    End Sub
 
    Private Sub FiloTopBtn_Click(sender As Object, e As RoutedEventArgs) Handles FiloTopBtn.Click
+      m_SelListHole.Clear()
+      m_DeselectListHole.Clear()
       m_SceneButtons.MeasureBtn.IsChecked = False
       If FiloTopBtn.IsChecked Then
          ' Imposto modalità
@@ -1361,25 +1464,25 @@ Public Class DrawPageUC
             m_PrevSideAnglePage = Pages.AlzFront
             LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
          End If
-         VariablesGrd.Children.Add( m_FiloTopUC)
+         VariablesGrd.Children.Add(m_FiloTopUC)
          SideAngleBtn.IsEnabled = False
          EngraveBtn.IsEnabled = False
          DripCutBtn.IsEnabled = False
          MessageGrid.Visibility = Windows.Visibility.Hidden
          BackBtn.Visibility = Windows.Visibility.Hidden
-         MessageTxBx.Text = EgtMsg( MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+         MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
          ' In ogni caso, nascondo layer delle misure
-         Dim PartId As Integer = EgtGetFirstInGroup( GDB_ID.ROOT)
-         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_AUX), GDB_ST.OFF)
-         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
-         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
+         Dim PartId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)
+         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_AUX), GDB_ST.OFF)
+         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
+         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
       Else
-         VariablesGrd.Children.Remove( m_FiloTopUC)
+         VariablesGrd.Children.Remove(m_FiloTopUC)
          If m_PrevSideAnglePage = Pages.CompoDimension Then
-            VariablesGrd.Children.Add( m_CompoDimension)
+            VariablesGrd.Children.Add(m_CompoDimension)
          ElseIf m_PrevSideAnglePage = Pages.InternalComponent Then
-            LeftButtonGrd.Children.Add( m_CompoDimension.m_InternalCompoPage)
+            LeftButtonGrd.Children.Add(m_CompoDimension.m_InternalCompoPage)
          End If
          SideAngleBtn.IsEnabled = m_bEnableSideAngle
          EngraveBtn.IsEnabled = True
@@ -1407,17 +1510,39 @@ Public Class DrawPageUC
       ' Seleziono la Tab e la Page di apertura
       Select Case m_ActiveComponentPage
          Case Pages.MainComponent
-            LeftButtonGrd.Children.Remove( m_MainComponentPage)
+            LeftButtonGrd.Children.Remove(m_MainComponentPage)
+
          Case Pages.SecondaryComponent
-            LeftButtonGrd.Children.Remove( m_MainComponentPage.m_SecondaryComponentPage)
+            LeftButtonGrd.Children.Remove(m_MainComponentPage.m_SecondaryComponentPage)
+
          Case Pages.InternalComponent
-            LeftButtonGrd.Children.Remove( m_MainWindow.m_DrawPageUC.m_CompoDimension.m_InternalCompoPage)
+            LeftButtonGrd.Children.Remove(m_MainWindow.m_DrawPageUC.m_CompoDimension.m_InternalCompoPage)
+
          Case Pages.CompoDimension
-            VariablesGrd.Children.Remove( m_CompoDimension)
+            VariablesGrd.Children.Remove(m_CompoDimension)
+
          Case Pages.SideAngle
-            VariablesGrd.Children.Remove( m_SideAngleUC)
+            Select Case m_SideAngleUC.m_Mode
+               Case SideAngleUC.ModeOpt.SIDEANGLE
+                  SideAngleBtn.IsChecked = False
+                  SideAngleBtn_Click(Nothing, Nothing)
+               Case SideAngleUC.ModeOpt.ENGRAVE
+                  EngraveBtn.IsChecked = False
+                  EngraveBtn_Click(Nothing, Nothing)
+               Case SideAngleUC.ModeOpt.DRIP
+                  DripCutBtn.IsChecked = False
+                  DripCutBtn_Click(Nothing, Nothing)
+            End Select
+            VariablesGrd.Children.Remove(m_SideAngleUC)
+
          Case Pages.FiloTop
+            FiloTopBtn.IsChecked = False
+            FiloTopBtn_Click(Nothing, Nothing)
             VariablesGrd.Children.Remove(m_FiloTopUC)
+
+         Case Pages.AlzFront
+            LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
+
       End Select
 
       ' Pulisco l'ambiente lua
@@ -1453,7 +1578,10 @@ Public Class DrawPageUC
             Case 2        ' intero
                Return m_nVal.ToString()
             Case 3        ' lunghezza
-               Return DoubleToString(EgtToUiUnits(m_dVal), 4)
+               'Dim dVal As Double
+               'StringToLen(m_sVal, dVal)
+               Return LenToString(m_dVal, 4)
+               'Return DoubleToString(EgtToUiUnits(m_dVal), 4)
             Case 4        ' double
                Return DoubleToString(m_dVal, 4)
             Case 5        ' stringa
@@ -1478,12 +1606,13 @@ Public Class DrawPageUC
                End If
             Case 3        ' lunghezza
                Dim dVal As Double
-               If StringToDouble(sVal, dVal) Then
-                  If bConvertUnits Then
-                     m_dVal = EgtFromUiUnits(dVal)
-                  Else
-                     m_dVal = dVal
-                  End If
+               If bConvertUnits Then
+                  StringToLen(sVal, dVal)
+                  m_dVal = dVal
+                  Return True
+               Else
+                  StringToDouble(sVal, dVal)
+                  m_dVal = dVal
                   Return True
                End If
             Case 4        ' double

DrawImport/FiloTopUC.xaml

@@ -41,7 +41,11 @@
                FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <EgtWPFLib:EgtTextBox Name="Parameter2TxBx" Grid.Column="1" Grid.Row="11" Width="90"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-   </Grid>
+      <TextBlock Name="Parameter3TxBl" Grid.Row="12" Text="Arrotonda"
+               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+      <CheckBox Name="Parameter3ChBx" Grid.Row="12" Grid.Column="1" Style="{StaticResource OmagCut_CheckBox_Single}"
+             HorizontalAlignment="Center" Margin="0,0,6,0"/>
+    </Grid>
 
 </UserControl>

DrawImport/FiloTopUC.xaml.vb

@@ -7,6 +7,8 @@ Public Class FiloTopUC
    ' Riferimento alla pagina che ha aperto SideAngleUC
    Private m_CallingPage As MainWindow.Pages
 
+   Private m_SelList As New List(Of Integer)
+
    ' Offset della sfilettatura
    Private m_dFiloTopOffset As Double = 0
    Friend ReadOnly Property FiloTopOffset As Double
@@ -23,34 +25,46 @@ Public Class FiloTopUC
       End Get
    End Property
 
+   ' esegue l'arrotindamento sugli angoli del percorso utensile
+   Private m_bCornerradius As Boolean = False
+   Friend ReadOnly Property bCornerRadius As Boolean
+      Get
+         Return m_bCornerradius
+      End Get
+   End Property
 
    Private Sub FiloTopUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Imposto riferimenti ad altre pagine
       m_CallingPage = m_MainWindow.m_ActivePage
 
       ' Imposto messaggi
-      ParameterTxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 10)       ' Offset
-      Parameter2TxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 11)      ' Affondamento
+      ParameterTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 10)       ' Offset
+      Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11)      ' Affondamento
+      Parameter3TxBl.Text = EgtMsg(91138)
 
       If m_CallingPage = MainWindow.Pages.Draw Then
          ' Imposto questa come pagina correntemente visualizzata nella drawpage
          m_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.FiloTop
          ' Imposto contesto corrente
-         EgtSetCurrentContext( m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
+         EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
       ElseIf m_CallingPage = MainWindow.Pages.Import Then
          ' Imposto contesto corrente
-         EgtSetCurrentContext( m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())
+         EgtSetCurrentContext(m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())
       End If
 
       ' Gestisco visualizzazione dei parametri
-      Parameter2TxBl.Visibility = Windows.Visibility.Visible
+      ParameterTxBl.Visibility = Windows.Visibility.Visible
       Parameter2TxBx.Visibility = Windows.Visibility.Visible
+      Parameter3TxBl.Visibility = Windows.Visibility.Visible
 
       ' Aggiorno valori
-      m_dFiloTopOffset = GetPrivateProfileDouble( S_SIDES, K_FILOTOPOFFSET, 5, m_MainWindow.GetIniFile())
-      ParameterTxBx.Text = LenToString( m_dFiloTopOffset, 3)
-      m_dFiloTopDepth = GetPrivateProfileDouble( S_SIDES, K_FILOTOPDEPTH, 5, m_MainWindow.GetIniFile())
-      Parameter2TxBx.Text = LenToString( m_dFiloTopDepth, 3)
+      m_dFiloTopOffset = GetPrivateProfileDouble(S_SIDES, K_FILOTOPOFFSET, 5, m_MainWindow.GetIniFile())
+      ParameterTxBx.Text = LenToString(m_dFiloTopOffset, 3)
+      m_dFiloTopDepth = GetPrivateProfileDouble(S_SIDES, K_FILOTOPDEPTH, 5, m_MainWindow.GetIniFile())
+      Parameter2TxBx.Text = LenToString(m_dFiloTopDepth, 3)
+      m_bCornerradius = GetPrivateProfileInt(S_SIDES, K_ROUNDOFF, 0, m_MainWindow.GetIniFile()) <> 0
+      Parameter3ChBx.IsChecked = m_bCornerradius
+      m_SelList.Clear()
    End Sub
 
    Private Sub FiloTopUC_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
@@ -67,13 +81,15 @@ Public Class FiloTopUC
          Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
          While nLayId <> GDB_ID.NULL
             Dim sLayName As String = ""
-            If EgtGetName( nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo( nLayId, INFO_FILOTOP) Then
-               EgtSetInfo( nLayId, INFO_OFFSET, m_dFiloTopOffset)
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
+               EgtSetInfo(nLayId, INFO_OFFSET, m_dFiloTopOffset)
             End If
             nLayId = EgtGetNextLayer(nLayId)
          End While
          nPartId = EgtGetNextPart(nPartId)
       End While
+      ' aggiorno la preview
+      CreateFiloTopPreView(m_SelList, False)
    End Sub
 
    Private Sub Parameter2TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter2TxBx.EgtClosed
@@ -86,8 +102,8 @@ Public Class FiloTopUC
          Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
          While nLayId <> GDB_ID.NULL
             Dim sLayName As String = ""
-            If EgtGetName( nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo( nLayId, INFO_FILOTOP) Then
-               EgtSetInfo( nLayId, INFO_DEPTH, m_dFiloTopDepth)
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
+               EgtSetInfo(nLayId, INFO_DEPTH, m_dFiloTopDepth)
             End If
             nLayId = EgtGetNextLayer(nLayId)
          End While
@@ -95,4 +111,164 @@ Public Class FiloTopUC
       End While
    End Sub
 
+   Private Sub Parameter3ChBx_Checked() Handles Parameter3ChBx.Click
+      ' Assegno il valore
+      m_bCornerradius = Parameter3ChBx.IsChecked
+      WritePrivateProfileString(S_SIDES, K_ROUNDOFF, If(m_bCornerradius, "1", "0"), m_MainWindow.GetIniFile())
+      ' Aggiorno le info del profilo
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
+         While nLayId <> GDB_ID.NULL
+            Dim sLayName As String = ""
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
+               EgtSetInfo(nLayId, INFO_ROUNDOFF, If(m_bCornerradius, 1, 0))
+            End If
+            nLayId = EgtGetNextLayer(nLayId)
+         End While
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+      ' aggiorno la preview (False = blocco la lettura dei dati della componente)
+      CreateFiloTopPreView(m_SelList, False)
+   End Sub
+
+   Public Sub CreateFiloTopPreView(SelList As List(Of Integer), Optional bReadInfo As Boolean = True)
+      m_SelList = SelList
+      If m_SelList.Count < 1 Then Return
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
+         While nLayId <> GDB_ID.NULL
+            Dim sLayName As String = ""
+            ' verifico che lemento corrente appartenga all'elenco degli elementi selezionati
+            Dim bIsSelected As Boolean = m_SelList.Find(Function(value As Integer)
+                                                           Return value = nLayId
+                                                        End Function) <> 0
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) AndAlso bIsSelected Then
+               ' ---------------------- Inizio GESTIONE PREVIEW percorso -------------------------------
+               Dim nLayFiloTop As Integer = GDB_ID.NULL
+               Dim nInLoopRef As Integer = GDB_ID.NULL
+               nLayFiloTop = EgtGetFirstNameInGroup(nPartId, "FiloTop")
+               EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               ' verifico il Layer "FiloTop" sia associato all'InLoop corrente
+               While (nLayFiloTop <> GDB_ID.NULL AndAlso nInLoopRef <> nLayId)
+                  nLayFiloTop = EgtGetNextName(nLayFiloTop, "FiloTop")
+                  EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               End While
+
+               ' se non esiste il Layer "FiloTop"
+               If nLayFiloTop = GDB_ID.NULL Then
+                  ' lo creo
+                  nLayFiloTop = EgtCreateGroup(nPartId)
+                  EgtSetName(nLayFiloTop, "FiloTop")
+                  EgtSetInfo(nLayFiloTop, "InLoopRef", nLayId)
+                  EgtSetInfo(nLayId, "FiloTopRef", nLayFiloTop)
+               End If
+
+               ' carico i dati del filo top selezionato
+               If bReadInfo Then
+                  EgtGetInfo(nLayFiloTop, INFO_OFFSET, m_dFiloTopOffset)
+                  ParameterTxBx.Text = LenToString(m_dFiloTopOffset, 3)
+                  EgtGetInfo(nLayFiloTop, INFO_DEPTH, m_dFiloTopDepth)
+                  Parameter2TxBx.Text = LenToString(m_dFiloTopDepth, 3)
+                  Dim nVal As Integer = If(m_bCornerradius, 1, 0)
+                  EgtGetInfo(nLayFiloTop, INFO_ROUNDOFF, nVal)
+                  Parameter3ChBx.IsChecked = If(nVal = 1, True, False)
+                  m_bCornerradius = Parameter3ChBx.IsChecked
+               End If
+
+               ' procedo alla creazione della curva
+               Dim nIdCompoCurve As Integer = GDB_ID.NULL
+               ' cancello un eventuale curva composita creata in precedenza
+               nIdCompoCurve = EgtGetFirstNameInGroup(nLayFiloTop, "OffsetPreView")
+               If nIdCompoCurve <> GDB_ID.NULL Then
+                  EgtErase(nIdCompoCurve)
+               End If
+               Dim nCompoCurve As New List(Of Integer)
+               ' costruisco il percorso chiuso dati i lati di contorno 
+               Dim nLine As Integer = EgtGetFirstInGroup(nLayId)
+               While nLine <> GDB_ID.NULL
+                  nCompoCurve.Add(nLine)
+                  nLine = EgtGetNext(nLine)
+               End While
+               Dim PtNearStart As Point3d
+               Dim nInfoRoundOff As Integer = If(m_bCornerradius, 1, 0)
+
+               nIdCompoCurve = EgtCreateCurveCompoByChain(nLayFiloTop, nCompoCurve.ToArray, PtNearStart, False)
+               EgtSetName(nIdCompoCurve, "OffsetPreView")
+
+               ' salvo i dati nel layer FiloTop
+               EgtSetInfo(nLayFiloTop, INFO_OFFSET, m_dFiloTopOffset)
+               EgtSetInfo(nLayFiloTop, INFO_DEPTH, m_dFiloTopDepth)
+               EgtSetInfo(nLayFiloTop, INFO_ROUNDOFF, nInfoRoundOff)
+
+               Dim bOk As Boolean = False
+               ' leggo che tipo di offset applicare (Round, Extend)
+               If nInfoRoundOff <> 1 Then
+                  bOk = EgtOffsetCurve(nIdCompoCurve, -m_dFiloTopOffset, OFF_TYPE.EXTEND)
+               Else
+                  bOk = EgtOffsetCurve(nIdCompoCurve, -m_dFiloTopOffset, OFF_TYPE.FILLET)
+               End If
+
+               ' se la generazione della curva non va a buon fine
+               If Not bOk Then
+                  EgtErase(nLayFiloTop)
+                  EgtRemoveInfo(nLayId, "FiloTopRef")
+                  EgtOutLog("Error in generation OffsetPreView in TopEgde ")
+               Else
+                  m_MainWindow.m_DrawPageUC.MessageTxBx.Text = ""
+                  m_MainWindow.m_DrawPageUC.MessageBrd.Background = Brushes.Transparent
+               End If
+               ' ---------------------- Fine GESTIONE PREVIEW percorso -------------------------------
+            End If
+            nLayId = EgtGetNextLayer(nLayId)
+         End While
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+      EgtDraw()
+   End Sub
+
+   ' riceve la lista dei LayerFiloTop che devono essere eliminati
+   Public Sub EraseFiloTopPreview(EraseList As List(Of Integer))
+      Dim m_EraseList As List(Of Integer) = EraseList
+      If m_EraseList.Count < 1 Then Return
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
+         While nLayId <> GDB_ID.NULL
+            Dim sLayName As String = ""
+            Dim bIsSelected As Boolean = m_EraseList.Find(Function(value As Integer)
+                                                             Return value = nLayId
+                                                          End Function) <> 0
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso bIsSelected Then
+               ' ---------------------- Inizio GESTIONE PREVIEW percorso -------------------------------
+               Dim nLayFiloTop As Integer = GDB_ID.NULL
+               Dim nInLoopRef As Integer = GDB_ID.NULL
+               nLayFiloTop = EgtGetFirstNameInGroup(nPartId, "FiloTop")
+               EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               ' cerco il Layer associato all'InLoop corrente
+               While (nLayFiloTop <> GDB_ID.NULL AndAlso nInLoopRef <> nLayId)
+                  nLayFiloTop = EgtGetNextName(nLayFiloTop, "FiloTop")
+                  EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               End While
+
+               ' se non esiste il Layer
+               If nLayFiloTop = GDB_ID.NULL Then
+                  ' esco 
+                  Return
+               Else
+                  ' lo elimino
+                  EgtErase(nLayFiloTop)
+                  EraseList.Remove(nLayId)
+               End If
+               ' ---------------------- Fine GESTIONE PREVIEW percorso -------------------------------
+            End If
+            nLayId = EgtGetNextLayer(nLayId)
+         End While
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+      EgtDraw()
+   End Sub
+
+
 End Class

DrawImport/ImportPageUC.xaml

@@ -7,116 +7,131 @@
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="ImportPage_Initialized" Loaded="ImportPage_Loaded" Unloaded="ImportPage_Unloaded">
 
-   <!-- Definizione della ImportPage -->
-   <Border>
-      <Grid Name="ImportPageGrid" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="12*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="8*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-
-         
-         <!-- Definizione della Grid superiore per Button -->
-         <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
+    <!-- Definizione della ImportPage -->
+    <Border>
+        <Grid Name="ImportPageGrid" >
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="7*"/>
+                <ColumnDefinition Width="3*"/>
+                <ColumnDefinition Width="12*"/>
             </Grid.ColumnDefinitions>
-
-            <ToggleButton Name="SideAngleBtn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-            <ToggleButton Name="FiloTopBtn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-            <ToggleButton Name="DripCutBtn" Grid.Column="2" Padding="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-            <ToggleButton Name="DripDrillBtn" Grid.Column="3" Padding="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-            <Button Name="Cad2dBtn" Grid.Column="4" Padding="0"
-               Style="{DynamicResource OmagCut_YellowTextButton}"/>
-         </Grid>
-
-         <!-- Definizione della Grid laterale -->
-         <Grid Name="LeftGrid" Grid.RowSpan="3">
             <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="8*"/>
-               <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="8*"/>
+                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
-                ItemsSource="{Binding ItemList}"/>
 
-            <Border Name="MessageBrd" Grid.Row="4" BorderThickness="0,1,0,0" BorderBrush="Gray">
-               <TextBlock Name="MessageTxBx" TextAlignment="Center"
-                   Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Border>
+            <!-- Definizione della Grid superiore per Button -->
+            <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="7*"/>
+                </Grid.ColumnDefinitions>
 
-         </Grid>
-
-         <!-- Definizione della Grid inferiore per Button -->
-         <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-
-            <Button Name="UseLayerBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-            <Button Name="UseClosedCurveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-            <Button Name="UseRegionBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-            <Button Name="ResetBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
-            <RadioButton Name="mmBtn" Grid.Column="4" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
-            <RadioButton Name="inchBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-
-            <Button Name="OrderListBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
-            <ToggleButton Name="TopBtn" Grid.Column="7" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
-
-            <Grid Name="PartNumberGrd" Grid.Column="8" Grid.ColumnSpan="2">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
-                  TextAlignment="Right"/>
-               <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60"
-                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                <ToggleButton Name="SideAngleBtn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                <ToggleButton Name="FiloTopBtn" Grid.Column="1"
+               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                <ToggleButton Name="DripCutBtn" Grid.Column="2" Padding="0"
+               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                <ToggleButton Name="EngraveBtn" Grid.Column="2"
+               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                <ToggleButton Name="DripDrillBtn" Grid.Column="3" Padding="0"
+               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                <Button Name="Cad2dBtn" Grid.Column="4" Padding="0"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
             </Grid>
 
-            <Button Name="OkBtn" Grid.Column="10" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
+            <!-- Definizione della Grid laterale -->
+            <Grid Name="LeftGrid" Grid.RowSpan="3">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="7.25*"/>
+                    <RowDefinition Height="0.75*"/>
+                    <RowDefinition Height="1*"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
+                     ItemsSource="{Binding ItemList}"/>
+
+                <Grid Name="FinderGrd"  Grid.Row="3" Margin="0,0,8,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="4*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <EgtWPFLib:EgtTextBox Name="FindTxBx" Grid.Column="0"
+                               Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}"/>
+                    <Button Name="ClearFindBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Margin="0,6,2,6">
+                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}" Width="30" />
+                    </Button>
+                </Grid>
+
+                <Border Name="MessageBrd" Grid.Row="5" BorderThickness="0,1,0,0" BorderBrush="Gray">
+                    <TextBlock Name="MessageTxBx" TextAlignment="Center"
+                   Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                </Border>
+
+            </Grid>
+
+            <!-- Definizione della Grid inferiore per Button -->
+            <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <Button Name="UseLayerBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                <Button Name="UseClosedCurveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                <Button Name="UseRegionBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                <Button Name="ResetBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+
+                <RadioButton Name="mmBtn" Grid.Column="4" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
+                <RadioButton Name="inchBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+
+                <Button Name="OrderListBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+
+                <ToggleButton Name="TopBtn" Grid.Column="7" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
+
+                <Grid Name="PartNumberGrd" Grid.Column="8" Grid.ColumnSpan="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
+                  TextAlignment="Right"/>
+                    <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
+                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                </Grid>
+
+                <Button Name="OkBtn" Grid.Column="10" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+
+                <Button Name="ExitBtn" Grid.Column="11" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+
+            </Grid>
+
+        </Grid>
+
+    </Border>
 
-            <Button Name="ExitBtn" Grid.Column="11" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-            
-         </Grid>
-         
-      </Grid>
-      
-   </Border>
-   
 </UserControl>

DrawImport/ImportPageUC.xaml.vb

@@ -19,6 +19,9 @@ Public Class ImportPageUC
    Friend WithEvents ImportScene As New Scene
    Private ImportSceneHost As New System.Windows.Forms.Integration.WindowsFormsHost
 
+   Private m_SelListHole As New List(Of Integer)
+   Private m_DeselectListHole As New List(Of Integer)
+
    ' Properties
    Private m_sCurrDir As String = String.Empty
    Private m_sCurrFile As String = String.Empty
@@ -85,6 +88,7 @@ Public Class ImportPageUC
       SideAngleBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 7)             'Inclina lati
       FiloTopBtn.Content = EgtMsg( 90400)                             'Filo Top
       DripCutBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 8)               'Incidi da sotto
+      EngraveBtn.Content = "Engrave"
       DripDrillBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 14)            'Foro da sotto
       Cad2dBtn.Content = "Cad 2d"
 
@@ -101,6 +105,8 @@ Public Class ImportPageUC
       ' abilitazione Ordine e Distinta per importazione DXF
       m_bEnableOrderList = (m_MainWindow.m_PrevActivePage = MainWindow.Pages.CadCut And
                             GetPrivateProfileInt(S_COMPO, K_CSVDATA, 0, m_MainWindow.GetIniFile()) <> 0)
+      ' rendo visibilie il pulsante di ricerca file
+      FinderGrd.Visibility = Visibility.Visible
 
       If m_bFirst Then
          ' imposto colore di default
@@ -158,6 +164,10 @@ Public Class ImportPageUC
 
       ' Pulisco tutto
       ClearView()
+      ' Definizione di quale comando deve essere visualizzato
+      DripCutBtn.Visibility = If(String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw), Visibility.Hidden, Visibility.Visible)
+      EngraveBtn.Visibility = If(DripCutBtn.Visibility <> Visibility.Visible, Visibility.Visible, Visibility.Hidden)
+
       FileListBox.UnselectAll()
       ' inibisco selezione diretta da Scene
       ImportScene.SetStatusNull()
@@ -196,7 +206,6 @@ Public Class ImportPageUC
       PartNumTxBx.Text = "1"
       ' disabilito ok
       OkBtn.IsEnabled = False
-
    End Sub
 
    Private Sub LoadGridData()
@@ -297,6 +306,36 @@ Public Class ImportPageUC
       End Select
    End Sub
 
+   Private Sub FindTxBx_EgtClosed(sender As Object, e As EventArgs) Handles FindTxBx.EgtClosed
+      ' Elimino spazi iniziali e finali
+      FindTxBx.Text = FindTxBx.Text.Trim()
+      ' ricarico la lista dei file
+      LoadCurrDir()
+      Dim UpdateListFile As New List(Of IconListBoxItem)
+      ' Se esiste un nome
+      If Not String.IsNullOrWhiteSpace(FindTxBx.Text) Then
+         For Each Item As IconListBoxItem In FileListBox.ItemsSource
+            If Item.Name.ToLower.Contains(FindTxBx.Text.ToLower) Then
+               UpdateListFile.Add(Item)
+            End If
+         Next
+      End If
+      If UpdateListFile.Count > 0 Then
+         FileListBox.ItemsSource = UpdateListFile
+      Else
+         FileListBox.ItemsSource = m_MainWindow.m_ImportItemList
+      End If
+   End Sub
+
+   Private Sub ClearFindBtn_Click() Handles ClearFindBtn.Click
+      ' svuoto la text
+      FindTxBx.Text = ""
+      ' ricarico la lista dei file
+      LoadCurrDir()
+      ' e aggiorno la lista dei file
+      FileListBox.ItemsSource = m_MainWindow.m_ImportItemList
+   End Sub
+
    Private Function ClearView() As Boolean
       ' Pulisco il DB geometrico locale
       EgtNewFile()
@@ -309,13 +348,18 @@ Public Class ImportPageUC
       ResetBtn.IsEnabled = False
       SideAngleBtn.IsEnabled = False
       FiloTopBtn.IsEnabled = False
-      DripCutBtn.IsEnabled = False
+      ' Evito di settare le proprietà di oggeti che sono con visibilità Hidden
+      If DripCutBtn.Visibility = Visibility.Visible Then
+         DripCutBtn.IsEnabled = False
+      Else
+         EngraveBtn.IsEnabled = False
+      End If
       DripDrillBtn.IsEnabled = False
       Return True
    End Function
 
    Private Function LoadCurrFile() As Boolean
-      ' Pulisco il DB geometrico locale
+      ' Pulisco il DB geometrico locale      
       Dim bOk As Boolean = EgtNewFile()
       ' Costruisco path completa del file
       Dim sPath = IO.Path.Combine(m_sCurrDir, m_sCurrFile)
@@ -327,6 +371,10 @@ Public Class ImportPageUC
          Dim dScale As Double = If(m_bMM, ONEMM, ONEINCH)
          ' Importo file DXF
          bOk = bOk AndAlso EgtImportDxf(sPath, dScale)
+         ' riporto al piano tutte le superifici
+         EgtSelectAll()
+         EgtScale(GDB_ID.SEL, Frame3d.GLOB, 1, 1, 0)
+         EgtDeselectAll()
       ElseIf m_nFileType = FT.NGE Then
          ' Carico Nge
          bOk = bOk AndAlso EgtOpenFile(sPath)
@@ -366,7 +414,11 @@ Public Class ImportPageUC
             OkBtn.IsEnabled = False
             SideAngleBtn.IsEnabled = False
             FiloTopBtn.IsEnabled = False
-            DripCutBtn.IsEnabled = False
+            If DripCutBtn.Visibility = Visibility.Visible Then
+               DripCutBtn.IsEnabled = False
+            Else
+               EngraveBtn.IsEnabled = False
+            End If
             DripDrillBtn.IsEnabled = False
          ElseIf m_nFileType = FT_TRF Or m_nFileType = FT_CUT Then
             ' abilito bottone Insert, disabilito bottoni UseLayer, UseClosedCurve, UseRegion e Reset
@@ -382,10 +434,14 @@ Public Class ImportPageUC
             OkBtn.IsEnabled = True
             SideAngleBtn.IsEnabled = False
             FiloTopBtn.IsEnabled = False
-            DripCutBtn.IsEnabled = False
+            If DripCutBtn.Visibility = Visibility.Visible Then
+               DripCutBtn.IsEnabled = False
+            Else
+               EngraveBtn.IsEnabled = False
+            End If
             DripDrillBtn.IsEnabled = False
          End If
-      ' altrimenti import per cornici
+         ' altrimenti import per cornici
       Else
          mmBtn.IsEnabled = (m_nFileType = FT.DXF)
          inchBtn.IsEnabled = (m_nFileType = FT.DXF)
@@ -395,10 +451,10 @@ Public Class ImportPageUC
    End Function
 
    Private Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles ImportScene.OnMouseDownScene
-      If SideAngleBtn.IsChecked() Or DripCutBtn.IsChecked() Then
-         OnMouseDownSceneSideAngle( e)
+      If SideAngleBtn.IsChecked() Or DripCutBtn.IsChecked() Or EngraveBtn.IsChecked Then
+         OnMouseDownSceneSideAngle(e)
       ElseIf DripDrillBtn.IsChecked() Then
-         OnMouseDownSceneUnderDrill( e)
+         OnMouseDownSceneUnderDrill(e)
       ElseIf FiloTopBtn.IsChecked() Then
          OnMouseDownSceneFiloTop( e)
       End If
@@ -539,6 +595,8 @@ Public Class ImportPageUC
                         EgtSetColor(nEntId, New Color3d(127, 63, 0))
                         nEntId = EgtGetNext( nEntId)
                      End While
+                     m_DeselectListHole.Add(nLayId)
+                     m_SelListHole.Remove(nLayId)
                   End If
                Else
                   Dim nLayId As Integer = GDB_ID.NULL
@@ -555,6 +613,8 @@ Public Class ImportPageUC
                         EgtSetColor(nEntId, New Color3d(255, 255, 255))
                         nEntId = EgtGetNext( nEntId)
                      End While
+                     m_SelListHole.Add(nLayId)
+                     m_DeselectListHole.Remove(nLayId)
                   End If
                End If
                EgtDraw()
@@ -562,6 +622,12 @@ Public Class ImportPageUC
          End If
          nId = EgtGetNextObjInSelWin()
       End While
+      m_FiloTopUC.CreateFiloTopPreView(m_SelListHole)
+      m_FiloTopUC.EraseFiloTopPreview(m_DeselectListHole)
+      If m_SelListHole.Count > 0 Then
+         MessageTxBx.Text = ""
+         MessageBrd.Background = Brushes.Transparent
+      End If
    End Sub
 
    Private Sub OnShowDistanceVector(sender As Object, vtDist As Vector3d) Handles ImportScene.OnShowDistanceVector
@@ -571,7 +637,7 @@ Public Class ImportPageUC
 
    Private Sub SelectedPartChanged()
       ' Se sono in modalità inclinazioni o gocciolatoio calcolo lati inclinabili e creo testi
-      If SideAngleBtn.IsChecked() Or DripCutBtn.IsChecked() Then
+      If SideAngleBtn.IsChecked() Or DripCutBtn.IsChecked() Or EngraveBtn.IsChecked() Then
          m_SideAngleUC.ReLoadSideAnglePage()
       End If
    End Sub
@@ -632,8 +698,12 @@ Public Class ImportPageUC
       ' abilito bottone angoli su lati esterni
       SideAngleBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
       FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
-      DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+      If DripCutBtn.Visibility = Visibility.Visible Then
+         DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                              Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
+      Else
+         EngraveBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+      End If
       DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)
    End Sub
@@ -664,8 +734,12 @@ Public Class ImportPageUC
       ' abilito bottone angoli su lati esterni
       SideAngleBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
       FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
-      DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+      If DripCutBtn.Visibility = Visibility.Visible Then
+         DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                              Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
+      Else
+         EngraveBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+      End If
       DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)
    End Sub
@@ -696,8 +770,12 @@ Public Class ImportPageUC
       ' abilito bottone angoli su lati esterni
       SideAngleBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
       FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
-      DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+      If DripCutBtn.Visibility = Visibility.Visible Then
+         DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                              Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
+      Else
+         EngraveBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+      End If
       DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)
    End Sub
@@ -808,6 +886,10 @@ Public Class ImportPageUC
          EgtErase(EgtGetFirstNameInGroup(PartId, SELECT_REGION_LAYER))
          PartId = EgtGetNextPart(PartId)
       End While
+
+      ' identificativo univoico del gruppo di pezzi, se più di un "Repeat"
+      Dim sGUICode As New List(Of String)
+
       ' Scrivo testi per nesting
       SideAngle.WriteSideAngleForNest(ImportScene.GetCtx())
       ' Imposto riferimento sul centro geometrico di ogni pezzo
@@ -817,26 +899,54 @@ Public Class ImportPageUC
       ' Salvo tutti i pezzi in un file temporaneo
       Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\FlatPart" & ".Nge"
       If Not EgtSaveFile(sTmpFile, NGE.BIN) Then Return
+
+      ' Determino numero ripetizioni
+      Dim nRepeat = 1
+      StringToInt(PartNumTxBx.Text, nRepeat)
+      nRepeat = Math.Min(Math.Max(1, nRepeat), 50)
+      ' creo il riferimento
+      If nRepeat > 1 Then
+         ' per ogni pezze del file DXF creo un gruppo
+         Dim nIdTemp As Integer = EgtGetFirstPart()
+         While nIdTemp <> GDB_ID.NULL
+            Dim sPreGuid As String = CreatePreGuidCode(nIdTemp)
+            sGUICode.Add(sPreGuid & System.Guid.NewGuid.ToString)
+            nIdTemp = EgtGetNextPart(nIdTemp)
+         End While
+      End If
+
       ' Passo al contesto principale
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Recupero flag per inserimento diretto in grezzo (altrimenti in parcheggio)
       Dim bDirect As Boolean = (GetPrivateProfileInt(S_NEST, K_DIRECT, 0, m_MainWindow.GetIniFile()) <> 0)
       ' Elimino eventuali precedenti pezzi vuoti
       EgtEraseEmptyParts()
-      ' Determino numero ripetizioni
-      Dim nRepeat = 1
-      StringToInt(PartNumTxBx.Text, nRepeat)
-      nRepeat = Math.Min(Math.Max(1, nRepeat), 50)
+
       ' Inserisco i pezzi nell'ambiente principale e recupero Id primo pezzo inserito
       Dim nFirstId As Integer = EgtGetLastPart()
       For nInd As Integer = 1 To nRepeat
          Dim nFirst2Id As Integer = EgtGetLastPart()
          EgtInsertFile(sTmpFile)
+
+         Dim FirstOfImport As Integer = EgtGetNextPart(nFirst2Id)
+         If FirstOfImport = GDB_ID.NULL Then FirstOfImport = EgtGetFirstPart()
+         Dim Index As Integer = 1
+         While FirstOfImport <> GDB_ID.NULL And Index <= sGUICode.Count
+            If Not String.IsNullOrEmpty(sGUICode(Index - 1)) Then
+               EgtSetInfo(FirstOfImport, INFO_REFGROUP, sGUICode(Index - 1))
+               Index += 1
+            Else
+               Exit While
+            End If
+            FirstOfImport = EgtGetNextPart(FirstOfImport)
+         End While
+
          nFirst2Id = If(nFirst2Id <> GDB_ID.NULL, EgtGetNextPart(nFirst2Id), EgtGetFirstPart())
          ' Eventuale inserimento pezzi in VeinMatching
          VeinMatching.AddParts(sTmpFile, nFirst2Id)
       Next
       nFirstId = If(nFirstId <> GDB_ID.NULL, EgtGetNextPart(nFirstId), EgtGetFirstPart())
+
       ' Cancello il file
       If My.Computer.FileSystem.FileExists(sTmpFile) Then
          My.Computer.FileSystem.DeleteFile(sTmpFile)
@@ -845,7 +955,7 @@ Public Class ImportPageUC
       Dim dNewArea As Double = 0
       Dim nId As Integer = nFirstId
       While nId <> GDB_ID.NULL
-         dNewArea += GeomCalc.GetPartArea( nId)
+         dNewArea += GeomCalc.GetPartArea(nId)
          ' Passo al pezzo successivo
          nId = EgtGetNextPart(nId)
       End While
@@ -856,6 +966,7 @@ Public Class ImportPageUC
          ' Passo al pezzo successivo
          nId = EgtGetNextPart(nId)
       End While
+
       ' Ciclo sui pezzi inseriti
       nId = nFirstId
       While nId <> GDB_ID.NULL
@@ -868,26 +979,26 @@ Public Class ImportPageUC
          If m_nFileType = FT.DXF Or m_nFileType = FT.NGE Then
             ' Eventuale testo per indicare il sopra
             If TopBtn.IsChecked() Then
-               Utility.AddTopToPartRegion( nRegId)
+               Utility.AddTopToPartRegion(nRegId)
             End If
             ' Se richiesti, inserisco dati Ordine, Distinta, Nome, Origine
             If m_bEnableOrderList Then
                ' Cerco il nome del pezzo
                Dim sName As String = ""
-               EgtGetName( nId, sName)
+               EgtGetName(nId, sName)
                ' Recupero il box del pezzo
-               Dim b3Reg As New BBox3d : EgtGetBBox( nRegId, GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Reg)
+               Dim b3Reg As New BBox3d : EgtGetBBox(nRegId, GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Reg)
                ' Aggiungo info equivalenti a CSV
                EgtSetInfo(nId, INFO_CSV_PART, sName)
                EgtSetInfo(nId, INFO_CSV_ORD, m_sOrder)
                EgtSetInfo(nId, INFO_CSV_DIST, m_sList)
                EgtSetInfo(nId, INFO_CSV_MAT, m_MainWindow.m_CurrentMachine.CurrMat.sName)
-               EgtSetInfo(nId, INFO_CSV_V1, DoubleToString( b3Reg.DimX(), 1))
-               EgtSetInfo(nId, INFO_CSV_V2, DoubleToString( b3Reg.DimY(), 1))
+               EgtSetInfo(nId, INFO_CSV_V1, DoubleToString(b3Reg.DimX(), 1))
+               EgtSetInfo(nId, INFO_CSV_V2, DoubleToString(b3Reg.DimY(), 1))
             End If
          End If
          ' Imposto colore testi
-         Utility.SetTextColor( nRegId)
+         Utility.SetTextColor(nRegId)
          ' Imposto path di provenienza
          EgtSetInfo(nId, INFO_SOU_PATH, IO.Path.Combine(m_sCurrDir, m_sCurrFile))
          ' Inserisco in parcheggio
@@ -907,7 +1018,7 @@ Public Class ImportPageUC
       ' Eventuale aggiornamento VeinMatching
       VeinMatching.ZoomAll()
       ' Aggiorno Aree totale e da lavorare dei pezzi
-      m_MainWindow.m_CurrentProjectPageUC.UpdateTotalArea( dNewArea)
+      m_MainWindow.m_CurrentProjectPageUC.UpdateTotalArea(dNewArea)
       m_MainWindow.m_CurrentProjectPageUC.UpdateToProduceArea()
       m_MainWindow.m_CurrentProjectPageUC.ShowAreas()
       ' Aggiorno ambiente principale
@@ -948,22 +1059,24 @@ Public Class ImportPageUC
       ' Salvo direttorio corrente
       WritePrivateProfileString(S_FLATPARTS, K_FLPCURRDIR, m_sCurrDir, m_MainWindow.GetIniFile())
       ' Tolgo pagina inclinazioni/gocciolatoi se attiva
-      If SideAngleBtn.IsChecked() Or DripCutBtn.IsChecked() Then
+      If SideAngleBtn.IsChecked() Or DripCutBtn.IsChecked() Or EngraveBtn.IsChecked() Then
          FilePathTxBl.Visibility = Windows.Visibility.Visible
          FileListBox.Visibility = Windows.Visibility.Visible
          LeftGrid.Children.Remove(m_SideAngleUC)
          If SideAngleBtn.IsChecked() Then
             SideAngleBtn.IsChecked = False
+         ElseIf EngraveBtn.IsChecked() Then
+            EngraveBtn.IsChecked = False
          Else
             DripCutBtn.IsChecked() = False
          End If
-      ' Tolgo pagina fori da sotto se attiva
+         ' Tolgo pagina fori da sotto se attiva
       ElseIf DripDrillBtn.IsChecked() Then
          FilePathTxBl.Visibility = Windows.Visibility.Visible
          FileListBox.Visibility = Windows.Visibility.Visible
          LeftGrid.Children.Remove(m_UnderDrillUC)
          DripDrillBtn.IsChecked() = False
-      ' Tolgo pagina Filo Top se attiva
+         ' Tolgo pagina Filo Top se attiva
       ElseIf FiloTopBtn.IsChecked() Then
          FilePathTxBl.Visibility = Windows.Visibility.Visible
          FileListBox.Visibility = Windows.Visibility.Visible
@@ -977,6 +1090,7 @@ Public Class ImportPageUC
 
    Private Sub SideAngleBtn_Click(sender As Object, e As RoutedEventArgs) Handles SideAngleBtn.Click
       If SideAngleBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Aggiungo regioni per percorsi interni
          AdjustSelectRegions()
          ' Dichiaro nessuna selezione
@@ -989,7 +1103,11 @@ Public Class ImportPageUC
          FileListBox.Visibility = Windows.Visibility.Hidden
          ' Disabilito FiloTopBtn, DripCutBtn, DripDrillBtn e unità di misura
          FiloTopBtn.IsEnabled = False
-         DripCutBtn.IsEnabled = False
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = False
+         Else
+            EngraveBtn.IsEnabled = False
+         End If
          DripDrillBtn.IsEnabled = False
          mmBtn.IsEnabled = False
          inchBtn.IsEnabled = False
@@ -999,6 +1117,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          ' Rimuovo regioni per percorsi interni
          RemoveSelectRegions()
          FilePathTxBl.Visibility = Windows.Visibility.Visible
@@ -1010,8 +1129,72 @@ Public Class ImportPageUC
          EgtDeselectAll()
          ' Riabilito FiloTopBtn, DripCutBtn, DripDrillBtn e unità di misura
          FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
-         DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                 Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
+         Else
+            EngraveBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+         End If
+         DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+                                  Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)
+         mmBtn.IsEnabled = True
+         inchBtn.IsEnabled = True
+         ' Elimino scritte angoli per input e inserisco quelle definitive
+         SideAngle.WriteSideAngleForNest(ImportScene.GetCtx())
+         ' Riabilito bottone reset
+         ResetBtn.IsEnabled = True
+         ' Pulisco area messaggi
+         MessageTxBx.Text = ""
+         MessageBrd.Background = Brushes.Transparent
+      End If
+      EgtZoom(ZM.ALL)
+   End Sub
+
+   Private Sub EngraveBtn_Click(sender As Object, e As RoutedEventArgs) Handles EngraveBtn.Click
+      If EngraveBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
+         ' Aggiungo regioni per percorsi interni
+         AdjustSelectRegions()
+         ' Dichiaro nessuna selezione
+         m_nSelectedPart = GDB_ID.NULL
+         m_nSelectedLayer = GDB_ID.NULL
+         ' Imposto modalità sideangle
+         m_SideAngleUC.m_Mode = SideAngleUC.ModeOpt.ENGRAVE
+         LeftGrid.Children.Add(m_SideAngleUC)
+         FilePathTxBl.Visibility = Windows.Visibility.Hidden
+         FileListBox.Visibility = Windows.Visibility.Hidden
+         ' Disabilito FiloTopBtn, DripCutBtn, DripDrillBtn e unità di misura
+         SideAngleBtn.IsEnabled = False
+         FiloTopBtn.IsEnabled = False
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = False
+         End If
+         DripDrillBtn.IsEnabled = False
+         mmBtn.IsEnabled = False
+         inchBtn.IsEnabled = False
+         ' Disabilito bottone reset
+         ResetBtn.IsEnabled = False
+         ' Messaggio di selezione da effettuare
+         MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+         MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
+      Else
+         FinderGrd.Visibility = Visibility.Visible
+         ' Rimuovo regioni per percorsi interni
+         RemoveSelectRegions()
+         FilePathTxBl.Visibility = Windows.Visibility.Visible
+         FileListBox.Visibility = Windows.Visibility.Visible
+         LeftGrid.Children.Remove(m_SideAngleUC)
+         ' Deseleziono eventuali pezzi rimasti selezionati
+         m_nSelectedPart = GDB_ID.NULL
+         m_nSelectedLayer = GDB_ID.NULL
+         EgtDeselectAll()
+         ' Riabilito FiloTopBtn, DripCutBtn, DripDrillBtn e unità di misura
+         FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
+         SideAngleBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+                                Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
+         End If
          DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                   Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)
          mmBtn.IsEnabled = True
@@ -1029,6 +1212,7 @@ Public Class ImportPageUC
 
    Private Sub DripCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles DripCutBtn.Click
       If DripCutBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Dichiaro nessuna selezione
          m_nSelectedPart = GDB_ID.NULL
          m_nSelectedLayer = GDB_ID.NULL
@@ -1040,6 +1224,9 @@ Public Class ImportPageUC
          ' Disabilito SideAngleBtn,FiloTop,  DripDrillBtn e unità di misura
          SideAngleBtn.IsEnabled = False
          FiloTopBtn.IsEnabled = False
+         If DripCutBtn.Visibility <> Visibility.Visible Then
+            EngraveBtn.IsEnabled = False
+         End If
          DripDrillBtn.IsEnabled = False
          mmBtn.IsEnabled = False
          inchBtn.IsEnabled = False
@@ -1049,6 +1236,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          FilePathTxBl.Visibility = Windows.Visibility.Visible
          FileListBox.Visibility = Windows.Visibility.Visible
          LeftGrid.Children.Remove(m_SideAngleUC)
@@ -1059,8 +1247,9 @@ Public Class ImportPageUC
          ' Riabilito SideAngleBtn, FiloTop, DripDrillBtn e unità di misura
          SideAngleBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
          FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
-         DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
-                                  Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)
+         If DripCutBtn.Visibility <> Visibility.Visible Then
+            EngraveBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+         End If
          mmBtn.IsEnabled = True
          inchBtn.IsEnabled = True
          ' Elimino scritte angoli per input e inserisco quelle definitive
@@ -1079,6 +1268,7 @@ Public Class ImportPageUC
 
    Private Sub DripDrillBtn_Click(sender As Object, e As RoutedEventArgs) Handles DripDrillBtn.Click
       If DripDrillBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Aggiungo regioni di selezione per percorsi interni
          AdjustSelectRegions()
          ' Imposto modalità fori da sotto
@@ -1088,7 +1278,11 @@ Public Class ImportPageUC
          ' Disabilito SideAngleBtn, FiloTop, DripCutBtn e unità di misura
          SideAngleBtn.IsEnabled = False
          FiloTopBtn.IsEnabled = False
-         DripCutBtn.IsEnabled = False
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = False
+         Else
+            EngraveBtn.IsEnabled = False
+         End If
          mmBtn.IsEnabled = False
          inchBtn.IsEnabled = False
          ' Disabilito bottone reset
@@ -1097,6 +1291,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 15)   ' Selezionare uno o più fori
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          ' Rimuovo regioni per percorsi interni
          RemoveSelectRegions()
          FilePathTxBl.Visibility = Windows.Visibility.Visible
@@ -1109,8 +1304,12 @@ Public Class ImportPageUC
          ' Riabilito SideAngleBtn, FiloTop, DripCutBtn e unità di misura
          SideAngleBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
          FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
-         DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                 Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
+         Else
+            EngraveBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+         End If
          mmBtn.IsEnabled = True
          inchBtn.IsEnabled = True
          ' Riabilito bottone reset
@@ -1124,6 +1323,7 @@ Public Class ImportPageUC
 
    Private Sub FiloTopBtn_Click(sender As Object, e As RoutedEventArgs) Handles FiloTopBtn.Click
       If FiloTopBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Aggiungo regioni per percorsi interni
          AdjustSelectRegions()
          ' Dichiaro nessuna selezione
@@ -1135,7 +1335,11 @@ Public Class ImportPageUC
          FileListBox.Visibility = Windows.Visibility.Hidden
          ' Disabilito SideAngleBtn, DripCutBtn, DripDrillBtn e unità di misura
          SideAngleBtn.IsEnabled = False
-         DripCutBtn.IsEnabled = False
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = False
+         Else
+            EngraveBtn.IsEnabled = False
+         End If
          DripDrillBtn.IsEnabled = False
          mmBtn.IsEnabled = False
          inchBtn.IsEnabled = False
@@ -1145,6 +1349,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno interno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          ' Rimuovo regioni per percorsi interni
          RemoveSelectRegions()
          FilePathTxBl.Visibility = Windows.Visibility.Visible
@@ -1156,8 +1361,12 @@ Public Class ImportPageUC
          EgtDeselectAll()
          ' Riabilito SideAngleBtn, DripCutBtn, DripDrillBtn e unità di misura
          SideAngleBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
-         DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
+         If DripCutBtn.Visibility = Visibility.Visible Then
+            DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                 Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
+         Else
+            EngraveBtn.IsEnabled = m_MainWindow.m_DrawPageUC.bEnableSideAngle
+         End If
          DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
                                   Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)
          mmBtn.IsEnabled = True

DrawImport/InternalComponentPageUC.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.IO
+Imports EgtUILib
 
 Public Class InternalComponentPageUC
 
@@ -286,12 +287,22 @@ Public Class InternalComponentPageUC
          If sCompoImage.Length <> 0 Then
             Try
                Dim sPath As String = m_MainWindow.GetResourcesDir() & "\" & sCompoImage
-               sCompoImageSource = ImageConverter.ConvertFromString(sPath)
-               GetImage(index).Height = 65
-               GetImage(index).Width = 65
-               GetImage(index).Source = sCompoImageSource
-               GetLabel(index).SetValue(Grid.ColumnProperty, 1)
-               GetLabel(index).SetValue(Grid.ColumnSpanProperty, 1)
+               If File.Exists(sPath) Then
+                  sCompoImageSource = ImageConverter.ConvertFromString(sPath)
+                  GetImage(index).Height = 65
+                  GetImage(index).Width = 65
+                  GetImage(index).Source = sCompoImageSource
+                  GetLabel(index).SetValue(Grid.ColumnProperty, 1)
+                  GetLabel(index).SetValue(Grid.ColumnSpanProperty, 1)
+               Else
+                  sCompoImage = String.Empty
+                  GetImage(index).Height = 0
+                  GetImage(index).Width = 0
+                  CustomThickness.Right = 0
+                  GetImage(index).Margin = CustomThickness
+                  GetLabel(index).SetValue(Grid.ColumnProperty, 0)
+                  GetLabel(index).SetValue(Grid.ColumnSpanProperty, 2)
+               End If
             Catch ex As Exception
                EgtOutLog("Error loading image " & sCompoImage)
                sCompoImage = String.Empty

DrawImport/MainComponentPageUC.xaml.vb

@@ -33,14 +33,31 @@ Public Class MainComponentPageUC
       m_bIsFirstPage = True
       LoadPage()
       CurrentBtn = Nothing
-      Compo9.SetValue(Grid.ColumnProperty, 0)
-      Compo9.SetValue(Grid.ColumnSpanProperty, 2)
-      ImageCompo9.Visibility = Windows.Visibility.Hidden
-      LabelCompo9.Visibility = Windows.Visibility.Visible
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         ' se il numero delle componenti è superiore a 8 allora inserisco la seconda pagina
+         If GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile()) > 8 Then
+            OthersBackGr.Visibility = Visibility.Visible
+            Compo9.SetValue(Grid.ColumnProperty, 0)
+            Compo9.SetValue(Grid.ColumnSpanProperty, 2)
+            ImageCompo9.Visibility = Windows.Visibility.Hidden
+            LabelCompo9.Visibility = Windows.Visibility.Visible
+         Else
+            OthersBackGr.Visibility = Visibility.Hidden
+         End If
+      Else
+         OthersBackGr.Visibility = Visibility.Visible
+         Compo9.SetValue(Grid.ColumnProperty, 0)
+         Compo9.SetValue(Grid.ColumnSpanProperty, 2)
+         ImageCompo9.Visibility = Windows.Visibility.Hidden
+         LabelCompo9.Visibility = Windows.Visibility.Visible
+      End If
+
+
       m_MainWindow.m_DrawPageUC.SideAngleBtn.IsEnabled = False
       m_MainWindow.m_DrawPageUC.FiloTopBtn.IsEnabled = False
       m_MainWindow.m_DrawPageUC.EngraveBtn.IsEnabled = False
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
+      m_MainWindow.m_DrawPageUC.m_bBackFromInternalCompo = False
    End Sub
 
    Private Function GetButton(ByVal nInd As Integer) As Button
@@ -167,7 +184,7 @@ Public Class MainComponentPageUC
 
    Private Sub Compo_Click(sender As Object, e As RoutedEventArgs) Handles Compo1.Click, Compo2.Click, Compo3.Click, Compo4.Click, Compo5.Click, Compo6.Click, Compo7.Click, Compo8.Click
       CurrentBtn = DirectCast(e.Source, Button)
-      Dim CompoName As String = S_COMPO & GetIndexFromButton(CurrentBtn).ToString
+      Dim CompoName As String = If(m_MainWindow.FrameCutBtn.IsChecked, S_FRAMECOMPO, S_COMPO) & GetIndexFromButton(CurrentBtn).ToString
       m_sCurrCompoFam = CompoName
       m_SecondaryComponentPage.m_sCurrCompo = String.Empty
       Dim nCount As Integer = GetPrivateProfileInt(CompoName, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
@@ -251,13 +268,18 @@ Public Class MainComponentPageUC
    End Sub
 
    Private Sub LoadPage()
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         LoadFramePage()
+         Return
+      End If
+
       Dim nDeltaSecondPage As Integer = 8
       ' Leggo numero di componenti presenti
       Dim nCompoNumber As Integer = GetPrivateProfileInt(S_COMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
       ' Calcolo indici a seconda della pagina in cui sono
       If m_bIsFirstPage Then
          ClearButton(nCompoNumber)
-      nDeltaSecondPage = 0
+         nDeltaSecondPage = 0
       Else
          ClearButton(nCompoNumber)
          nDeltaSecondPage = 8
@@ -325,16 +347,86 @@ Public Class MainComponentPageUC
 
    End Sub
 
+   Private Sub LoadFramePage()
+      Dim nDeltaSecondPage As Integer = 8
+      ' Leggo numero di componenti presenti
+      Dim nCompoNumber As Integer = GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
+      ' Calcolo indici a seconda della pagina in cui sono
+      If m_bIsFirstPage Then
+         ClearButton(nCompoNumber)
+         nDeltaSecondPage = 0
+      Else
+         ClearButton(nCompoNumber)
+         nDeltaSecondPage = 8
+      End If
+
+      ' Creazione converter da String a ImageSource
+      Dim ImageConverter As New ImageSourceConverter
+      Dim ThicknessConverter As New ThicknessConverter
+
+      'Assegnazione immagine e testo ai Button
+      For index As Integer = 1 To 8
+         Dim CustomThickness As New Thickness(0)
+         Dim nCompoName As Integer = GetPrivateProfileInt(S_FRAMECOMPO & index + nDeltaSecondPage, "Name", 0, m_MainWindow.GetIniFile())
+         Dim sCompoImage As String = ""
+         Dim sCompoImageSource As ImageSource
+
+         'verifico presenza immagine e la aggiungo
+         If GetPrivateProfileString(S_FRAMECOMPO & index + nDeltaSecondPage, "Image", "", sCompoImage, m_MainWindow.GetIniFile()) <> 0 Then
+            Try
+               sCompoImageSource = ImageConverter.ConvertFromString(m_MainWindow.GetResourcesDir() & "\" & sCompoImage)
+               GetImage(index).Height = 65
+               GetImage(index).Width = 65
+               GetImage(index).Source = sCompoImageSource
+            Catch ex As Exception
+               EgtOutLog("Error loading image " & sCompoImage)
+               sCompoImage = String.Empty
+               GetImage(index).Height = 0
+               GetImage(index).Width = 0
+               CustomThickness.Right = 0
+               GetImage(index).Margin = CustomThickness
+            End Try
+         Else
+            'Se non c'è l'immagine azzero la distanza tra testo e immagine
+            CustomThickness.Right = 0
+            GetImage(index).Margin = CustomThickness
+         End If
+
+         'verifico presenza testo
+         If nCompoName > 0 Then
+            Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName)
+            'verifico presenza immagine
+            If sCompoImage.Length > 0 Then
+               'se la lunghezza del testo è maggiore di 15 lo taglio
+               If sCompoName.Length > 15 Then
+                  sCompoName = sCompoName.Substring(0, 15)
+               End If
+               GetLabel(index).Text = sCompoName
+               'Se ci sono sia testo che immagine imposto un margine di 10
+               CustomThickness.Right = 10
+               GetImage(index).Margin = CustomThickness
+            Else
+               'se l'immagine non c'è e il testo è maggiore di 20 lo taglio
+               If sCompoName.Length > 20 Then
+                  sCompoName = sCompoName.Substring(0, 20)
+               End If
+               GetLabel(index).Text = sCompoName
+            End If
+         Else
+            'Se non c'è testo azzero la distanza tra testo e immagine
+            CustomThickness.Right = 0
+            GetImage(index).Margin = CustomThickness
+         End If
+
+      Next
+
+   End Sub
+
    ' Gestione bottone altri componenti
    Private Sub Compo9_Click(sender As Object, e As RoutedEventArgs) Handles Compo9.Click
       If m_bIsFirstPage Then
          m_bIsFirstPage = False
          LoadPage()
-         'Compo9.SetValue(Grid.ColumnProperty, 1)
-         'Compo9.SetValue(Grid.ColumnSpanProperty, 1)
-         'ImageCompo9.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NumericKeyboardArrow.png", UriKind.Relative))
-         'ImageCompo9.Visibility = Windows.Visibility.Visible
-         'LabelCompo9.Visibility = Windows.Visibility.Hidden
          Compo9.SetValue(Grid.ColumnProperty, 0)
          Compo9.SetValue(Grid.ColumnSpanProperty, 2)
          ImageCompo9.Visibility = Windows.Visibility.Hidden

DrawImport/SideAngle.vb

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

DrawImport/SideAngleUc.xaml

@@ -5,7 +5,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
-   d:DesignHeight="597.1" d:DesignWidth="255.9">
+   d:DesignHeight="636.9" d:DesignWidth="255.9">
 
    <!-- Definizione della Grid Laterale -->
    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
@@ -28,7 +28,7 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="0.2*"/>
-         <RowDefinition Height="4*"/>
+         <RowDefinition Height="5*"/>
          <!--<RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>-->
@@ -56,7 +56,7 @@
       <TextBlock Name="Entity1" Grid.Row="1" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A1" Grid.Column="1" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H1TxBx" Grid.Column="3" Grid.Row="1" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -64,7 +64,7 @@
       <TextBlock Name="Entity2" Grid.Row="2" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A2" Grid.Column="1" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H2TxBx" Grid.Column="3" Grid.Row="2" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -72,7 +72,7 @@
       <TextBlock Name="Entity3" Grid.Row="3" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A3" Grid.Column="1" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H3TxBx" Grid.Column="3" Grid.Row="3" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -80,7 +80,7 @@
       <TextBlock Name="Entity4" Grid.Row="4" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A4" Grid.Column="1" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H4TxBx" Grid.Column="3" Grid.Row="4" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -88,7 +88,7 @@
       <TextBlock Name="Entity5" Grid.Row="5" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A5" Grid.Column="1" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H5TxBx" Grid.Column="3" Grid.Row="5" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -96,7 +96,7 @@
       <TextBlock Name="Entity6" Grid.Row="6" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A6" Grid.Column="1" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H6TxBx" Grid.Column="3" Grid.Row="6" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -104,7 +104,7 @@
       <TextBlock Name="Entity7" Grid.Row="7" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A7" Grid.Column="1" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H7TxBx" Grid.Column="3" Grid.Row="7" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -112,7 +112,7 @@
       <TextBlock Name="Entity8" Grid.Row="8" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A8" Grid.Column="1" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H8TxBx" Grid.Column="3" Grid.Row="8" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -120,7 +120,7 @@
       <TextBlock Name="Entity9" Grid.Row="9" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A9" Grid.Column="1" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60" IsLength="False"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H9TxBx" Grid.Column="3" Grid.Row="9" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -128,14 +128,14 @@
       <TextBlock Name="Entity10" Grid.Row="10" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A10" Grid.Column="1" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
           Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60"
+      <EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60" IsLength="False"
                             Margin="0,0,0,-2"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H10TxBx" Grid.Column="3" Grid.Row="10" Width="60"
                             Margin="0,0,0,-2"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4">
+      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4" >
           <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1.5*"/>
                 <ColumnDefinition Width="0.3*"/>
@@ -143,10 +143,11 @@
                 <ColumnDefinition Width="0.6*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
             </Grid.RowDefinitions>
 
             <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
@@ -168,7 +169,7 @@
             <UniformGrid Rows="1" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Width="90" >
                 <EgtWPFLib:EgtTextBox Name="Parameter2aTxBx" 
                                       Grid.Column="2" Grid.Row="12"
-                                      Width="40" Height="30"
+                                      Width="40" Height="30" IsLength="False"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                 <EgtWPFLib:EgtTextBox Name="Parameter2bTxBx" 
                                       Grid.Column="3" Grid.Row="12" 
@@ -196,6 +197,16 @@
                                   Margin="0,0,0,-2"
                                   Width="85" Height="30"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="Parameter5TxBl" Grid.Row="4" Grid.ColumnSpan="2"
+               Text="Angolo"
+               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+            <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
+                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="4" 
+                                  Margin="0,0,0,-2"
+                                  Width="85" Height="30" IsLength="False"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
         </Grid>
 
         <!--<TextBlock Name="Parameter1TxBl" Grid.Row="11" Text="Offset"

DrawImport/SideAngleUc.xaml.vb

@@ -34,7 +34,9 @@ Public Class SideAngleUC
    Friend m_dDripOffset2 As Double = 0
    Friend m_nEngrNbr2 As Integer = 1
    Friend m_dDripDepth As Double = 10
+   Friend m_dEngraveDepth2 As Double = 15
    Friend m_dDripShort As Double = 0
+   Friend m_dEngraveAngle As Double = 0
 
    Private CurrEntityDrip As DripEntity
 
@@ -105,6 +107,9 @@ Public Class SideAngleUC
          ' Accorciamento
          Parameter4TxBl.Visibility = Windows.Visibility.Hidden
          Parameter4TxBx.Visibility = Windows.Visibility.Hidden
+         ' Angolo 
+         Parameter5TxBl.Visibility = Windows.Visibility.Hidden
+         Parameter5TxBx.Visibility = Windows.Visibility.Hidden
       Else
          ' se aggiungo gli ENGRAVE e i DRIP
 
@@ -116,10 +121,12 @@ Public Class SideAngleUC
             GetAngleTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
             GetHeelTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
          Next
+
          ' Offset
          Parameter1TxBl.Visibility = Windows.Visibility.Visible
          Parameter1TxBx.Visibility = Windows.Visibility.Visible
          Parameter2TxBl.Visibility = Windows.Visibility.Visible
+
          ' Offset2
          If m_Mode <> ModeOpt.ENGRAVE Then
             Parameter2TxBx.Visibility = Windows.Visibility.Visible
@@ -130,12 +137,33 @@ Public Class SideAngleUC
             Parameter2aTxBx.Visibility = Windows.Visibility.Visible
             Parameter2bTxBx.Visibility = Windows.Visibility.Visible
          End If
+
          ' Affondamento
          Parameter3TxBl.Visibility = Windows.Visibility.Visible
          Parameter3TxBx.Visibility = Windows.Visibility.Visible
+
          ' Accorciamento
-         Parameter4TxBl.Visibility = Windows.Visibility.Hidden
-         Parameter4TxBx.Visibility = Windows.Visibility.Hidden
+         If m_Mode = ModeOpt.ENGRAVE Then
+            ' modifico il nome del messaggio 
+            Parameter4TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11) & "2"     ' Affondamento2
+            Parameter4TxBl.Visibility = Windows.Visibility.Visible
+            Parameter4TxBx.Visibility = Windows.Visibility.Visible
+         Else
+            Parameter4TxBl.Visibility = Windows.Visibility.Hidden
+            Parameter4TxBx.Visibility = Windows.Visibility.Hidden
+         End If
+
+         ' Angolo
+         If m_Mode = ModeOpt.ENGRAVE Then
+            ' modifico il nome del messaggio 
+            Parameter5TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 9)            ' Angolo
+            Parameter5TxBl.Visibility = Windows.Visibility.Visible
+            Parameter5TxBx.Visibility = Windows.Visibility.Visible
+         Else
+            Parameter5TxBl.Visibility = Windows.Visibility.Hidden
+            Parameter5TxBx.Visibility = Windows.Visibility.Hidden
+         End If
+
       End If
 
       ' Gestisco Checkbox e nomi in base al numero di lati inclinabili
@@ -156,12 +184,14 @@ Public Class SideAngleUC
          m_nEngrNbr2 = GetPrivateProfileInt( S_SIDES, K_ENGRAVENUMBER2, 1, m_MainWindow.GetIniFile())
          m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
          m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
-         m_dDripShort = GetPrivateProfileDouble( S_SIDES, K_ENGRAVESHORT, 0, m_MainWindow.GetIniFile())
-         Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
+         m_dEngraveDepth2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH2, 0, m_MainWindow.GetIniFile())
+         m_dEngraveAngle = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEANGLE, 0, m_MainWindow.GetIniFile())
+         Parameter1TxBx.Text = LenToString(m_dDripOffset, 3)
          Parameter2aTxBx.Text = m_nEngrNbr2.ToString()
          Parameter2bTxBx.Text = LenToString( m_dDripOffset2, 3)
          Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
-         Parameter4TxBx.Text = LenToString( m_dDripShort, 3)
+         Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
+         Parameter5TxBx.Text = DoubleToString(m_dEngraveAngle, 3)
       End If
 
       ' Aggiorno visualizzazione
@@ -489,7 +519,9 @@ Public Class SideAngleUC
          WritePrivateProfileString( S_SIDES, K_ENGRAVENUMBER2, m_nEngrNbr2.ToString(), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEOFFSET2, LenToString(m_dDripOffset2, 3), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH, LenToString(m_dDripDepth, 3), m_MainWindow.GetIniFile())
+         WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH2, LenToString(m_dEngraveDepth2, 3), m_MainWindow.GetIniFile())
          'WritePrivateProfileString( S_SIDES, K_ENGRAVESHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
+         WritePrivateProfileString(S_SIDES, K_ENGRAVEANGLE, LenToString(m_dEngraveAngle, 3), m_MainWindow.GetIniFile())
       End If
 
       EgtDraw()
@@ -635,7 +667,7 @@ Public Class SideAngleUC
       SideAngle.AddTextToLine(sEntityName, TextLayer, CurrLine, 20, dBBoxRad, True)
    End Sub
 
-   ' Funzione che crea le geometrie dei gocciolatoi
+   ' Funzione che crea le geometrie dei gocciolatoi (NON UTILIZZATA)
    Friend Sub CreateDripGeomOLD(nPartId As Integer)
       ' Recupero Id layer di contorno esterno
       Dim nOutLoopId = EgtGetFirstNameInGroup(nPartId, NAME_OUTLOOP)
@@ -755,6 +787,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
@@ -826,6 +862,9 @@ Public Class SideAngleUC
       Dim nCrvId = EgtGetFirstInGroup(DripLayer)
       While nCrvId <> GDB_ID.NULL
          EgtOffsetCurve(nCrvId, -m_dDripOffset, OFF_TYPE.EXTEND)
+         If m_Mode = ModeOpt.ENGRAVE Then
+            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
+         End If
          nCrvId = EgtGetNext(nCrvId)
       End While
       ' Eventuali curve aggiuntive con offset2
@@ -836,10 +875,16 @@ Public Class SideAngleUC
             For i As Integer = 1 To m_nEngrNbr2
                Dim nNewId As Integer = EgtCopy(nCrvId, nCrvId, GDB_POS.AFTER)
                EgtOffsetCurve(nNewId, -i * m_dDripOffset2, OFF_TYPE.EXTEND)
+               If m_Mode = ModeOpt.ENGRAVE Then
+                  EgtSetInfo(nNewId, INFO_DEPTH, m_dEngraveDepth2)
+               End If
             Next
             nCrvId = nNextCrvId
          End While
       End If
+
+      Dim ListEngraveSideAng As New List(Of Integer)
+
       If m_Mode = ModeOpt.DRIP Then
          ' Esplodo nelle curve componenti
          nCrvId = EgtGetFirstInGroup(DripLayer)
@@ -859,14 +904,70 @@ Public Class SideAngleUC
          End While
       Else
          ' Assegno colore e attributi
+         Dim nInd As Integer = 0
          nCrvId = EgtGetFirstInGroup(DripLayer)
          While nCrvId <> GDB_ID.NULL
             EgtSetColor(nCrvId, COL_MCH_DRIPCUT())
-            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
+            'EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
             EgtSetInfo(nCrvId, INFO_STRICT, If(m_dDripShort > EPS_SMALL, "3", "0"))
+            If nInd = 0 Then
+               ' solo se m_dEngraveAngle > 0
+               If Math.Abs(m_dEngraveAngle) > EPS_ANG_SMALL Then
+                  ' salvo l'Id della curva che deve essere manipolato separatamente
+                  ListEngraveSideAng.Add(nCrvId)
+               Else
+                  EgtRemoveInfo(nCrvId, INFO_SIDE_ANGLE)
+                  EgtModifyCurveThickness(nCrvId, -m_dEngraveDepth2)
+               End If
+            Else
+               If nInd = m_nEngrNbr2 Then
+                  nInd = -1
+               End If
+               EgtModifyCurveThickness(nCrvId, -m_dEngraveDepth2)
+            End If
+            nInd = nInd + 1
+            If nInd > m_nEngrNbr2 Then nInd = 0
             nCrvId = EgtGetNext(nCrvId)
          End While
       End If
+      SplitJointedSideEngrave(ListEngraveSideAng)
+   End Sub
+
+   Private Sub SplitJointedSideEngrave(ListEngraveSideAngId As List(Of Integer))
+      For Each nCrvId As Integer In ListEngraveSideAngId
+         ' eventualmente separo il taglio inclinato
+         Dim dUs, dUe As Double
+         EgtCurveDomain(nCrvId, dUs, dUe)
+         Dim dU As Double = dUs
+         While dU < dUe ' + EPS_ZERO
+            Dim ptCurr As Point3d
+            EgtAtParamPoint(nCrvId, dU + 1, nCrvId, ptCurr)
+            ' separa la curva in questo punto
+            Dim nNewCurvId As Integer = GDB_ID.NULL
+            If dUe > 1 Then
+               nNewCurvId = EgtSplitCurveAtPoint(nCrvId, ptCurr, GDB_RT.LOC)
+            Else
+               nNewCurvId = nCrvId
+            End If
+            EgtSetColor(nCrvId, COL_MCH_ONENGRAVE_ANG())
+            EgtSetInfo(nCrvId, INFO_SIDE_ANGLE, m_dEngraveAngle)
+            ' recupero il vettore di estrusione della curva e la direzione della curva
+            Dim vtAux As Vector3d
+            EgtStartVector(nCrvId, vtAux)
+            Dim vtExtrusion As Vector3d
+            EgtCurveExtrusion(nCrvId, vtExtrusion)
+            ' ruoto il vetottore nella nuova direzione
+            vtExtrusion.Rotate(vtAux, -m_dEngraveAngle)
+            ' assegno il vettore di estrusione nella nuova direzione indicata (segno negativo perchè dentro il pezzo)
+            EgtModifyCurveExtrusion(nCrvId, vtExtrusion)
+            Dim ExtendFactor As Double = New Vector3d(0, 0, 1) * vtExtrusion
+            EgtModifyCurveThickness(nCrvId, -m_dDripDepth / ExtendFactor)
+            If dUe = 1 Then Exit While
+            nCrvId = nNewCurvId
+            ' aggiorno i valori del dominio della curva che rimane
+            EgtCurveDomain(nCrvId, dUs, dUe)
+         End While
+      Next
    End Sub
 
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
@@ -1300,11 +1401,25 @@ Public Class SideAngleUC
    End Sub
 
    Private Sub Parameter4TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter4TxBx.EgtClosed
-      If m_Mode = ModeOpt.DRIP Or m_Mode = ModeOpt.ENGRAVE Then
+      If m_Mode = ModeOpt.DRIP Then
          ' Recupero il valore
          StringToLen(Parameter4TxBx.Text, m_dDripShort)
          ' Creo le geometrie dei gocciolatoi
          RefreshSideAngleText()
+      ElseIf m_Mode = ModeOpt.ENGRAVE Then
+         ' Recupero il valore
+         StringToLen(Parameter4TxBx.Text, m_dEngraveDepth2)
+         ' Creo le geometrie dei gocciolatoi
+         RefreshSideAngleText()
+      End If
+   End Sub
+
+   Private Sub Parameter5TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter5TxBx.EgtClosed
+      If m_Mode = ModeOpt.ENGRAVE Then
+         ' Recupero il valore
+         StringToDouble(Parameter5TxBx.Text, m_dEngraveAngle)
+         ' Creo le geometrie dei gocciolatoi
+         RefreshSideAngleText()
       End If
    End Sub
 

EgtDictionary.xaml

@@ -1,16 +1,48 @@
-<ResourceDictionary
-   x:Class="EgtDictionary"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:Project="clr-namespace:OmagCUT"
-   xmlns:ControlExtensions="clr-namespace:OmagCUT.ControlExtensions">
+<ResourceDictionary x:Class="EgtDictionary"
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:Project="clr-namespace:OmagCUT"
+                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
+                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                    xmlns:ControlExtensions="clr-namespace:OmagCUT.ControlExtensions">
 
-   <!--Template che permette di andare a capo-->
+    <EgtWPFLib5:StatusBarVM x:Key="StatusBarVM"/>
+    <EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
+    <EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
+    <EgtWPFLib5:InstrumentPanelVM x:Key="InstrumentPanelVM"/>
+
+    <EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
+    <EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
+    <EgtPHOTOLib:ListPageSlabVM x:Key="ListPageSlabVM"/>
+    <EgtPHOTOLib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
+    <EgtPHOTOLib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
+    <EgtPHOTOLib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>
+
+    <!--Colori predefiniti-->
+    <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
+    <SolidColorBrush x:Key="Omag_Yellow" Color="#FFFFCE5B" />
+    <SolidColorBrush x:Key="Omag_Red" Color="Red" />
+    <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
+    <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
+    <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
+    <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
+    <SolidColorBrush x:Key="Omag_DarkGray" Color="#FF444444" />
+    <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
+
+    <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF095CA8" />
+    <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
+
+    <!--Template che permette di andare a capo-->
    <DataTemplate x:Key="Button_DataTemplate_Wrap">
       <TextBlock TextWrapping="Wrap" Text="{Binding}"/>
    </DataTemplate>
 
-   <!--ButtonBase-->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- Button Style -->
+
    <Style TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle">
          <Setter.Value>
@@ -71,7 +103,44 @@
       </Setter>
    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________ -->
+    <!--Template che permette di andare a capo-->
+    <DataTemplate x:Key="WrapButton_DataTemplate">
+        <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
+    </DataTemplate>
+
+    <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
+    <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="80"/>
+    </Style>
+    <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="60"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
+    <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+    </Style>
+    <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
+        <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+        <Setter Property="Height" Value="45"/>
+    </Style>
+    <Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="60"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
+    <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="40"/>
+    </Style>
+    <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________ -->
 
    <!--Template che permette di andare a capo-->
    <DataTemplate x:Key="CheckBox_DataTemplate_Wrap">
@@ -375,7 +444,59 @@
       </Setter>
    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________ -->
+    <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
+
+    <Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="70"/>
+    </Style>
+
+    <Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="30"/>
+    </Style>
+
+    <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="60"/>
+        <Setter Property="Width" Value="60"/>
+    </Style>
+
+    <Style x:Key="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Height" Value="40"/>
+    </Style>
+
+    <Style x:Key="CompoWindow_WrapToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
+        <Setter Property="TextBlock.TextAlignment" Value="Center" />
+        <Setter Property="Height" Value="40"/>
+    </Style>
+
+    <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Padding" Value="5"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#FFB8C3CD"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="OpacityMask" Value="#33FF0000"/>
+            </Trigger>
+            <Trigger Property="ToggleButton.IsChecked" Value="True">
+                <Setter Property="Background" Value="Transparent"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Background" Value="#FFF4F4F4"/>
+                <Setter Property="BorderBrush" Value="#FFADB2B5"/>
+                <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________ -->
 
    <!--TreeViewBase-->
    <!--Style e colori della freccia di espansione, necessari per modificare il ContainerItemStyle perchè contiene riferimenti ad essi-->
@@ -431,6 +552,32 @@
       </Setter>
    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- EgtCustomWindow -->
+
+    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+        <Setter Property="TitleBarHeight" Value="32"/>
+        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+    <!-- EgtFloatingPanel -->
+
+    <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+    </Style>
+
+    <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+        <Setter Property="IsToolBar" Value="False"/>
+        <Setter Property="TitleBarOrientation" Value="Vertical"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________ -->
 
 </ResourceDictionary>

Frames/FrameCutPageUC.xaml

@@ -7,124 +7,146 @@
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280">
 
-   <!-- Definizione della FrameCutPage -->
-   <Grid Name="FrameCutPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      
-      <!-- Definizione della Grid superiore -->
-      <Grid Grid.Column="1" Grid.Row="0" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         
-         <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
-         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
-         <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
-            <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </ToggleButton>
-
-      </Grid>
-
-      <Grid Name="LeftGrid" Grid.Row="1">
-         <Grid.RowDefinitions>
+    <!-- Definizione della FrameCutPage -->
+    <Grid Name="FrameCutPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="7*"/>
-         </Grid.RowDefinitions>
-      
-      <Grid Grid.Row="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="0.6*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="2.5*"/>
-         </Grid.RowDefinitions>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
 
-         <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
-               Width="200" MaxDropDownHeight="300">
-            <ComboBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-               </DataTemplate>
-            </ComboBox.ItemTemplate>
-         </ComboBox>
+        <!-- Definizione della Grid superiore -->
+        <Grid Grid.Column="1" Grid.Row="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="4*"/>
+            </Grid.ColumnDefinitions>
 
-         <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="SelSectionBtn" 
-                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="CompoBtn" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="SelSectionBtn" Grid.Column="3" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                 <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
-             
-            <Grid>
-               <Button Name="SelGuideBtn" 
-                       Style="{DynamicResource OmagCut_YellowTextButton}"/>
-               <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-                  <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
-                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                  <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
-                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-               </UniformGrid>
-            </Grid>  
-         </UniformGrid>
 
-         <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+            <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
+                <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+
+        </Grid>
+
+        <Grid Name="LeftGrid" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="7*"/>
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.6*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="1.7*"/>
+                </Grid.RowDefinitions>
+
+                <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
+               Width="200" MaxDropDownHeight="300">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                    <!--<Button Name="SelSectionBtn" 
+                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                        <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+                    </Button>-->
+
+                    <Grid>
+                        <Button Name="SelGuideBtn" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                        <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                            <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                            <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                            <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                        </UniformGrid>
+                    </Grid>
+                </UniformGrid>
+
+                <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
-            Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
+               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
+               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="MirrorPartBtn" 
+                <TextBlock Name="OffsXInteryTxBl"  Grid.Row="5" Grid.ColumnSpan="2"
+               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsXInteryTxBx" Grid.Column="2" Grid.Row="5" Width="50"
+               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+                <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
+                    <Button Name="MirrorPartBtn" 
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                         <Image Source="{DynamicResource SpecchiaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="RemovePartBtn" 
+                    </Button>
+                    <Button Name="RemovePartBtn" 
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                         <Image Source="{DynamicResource Rimuovi_eliminaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </UniformGrid>
+                    </Button>
+                </UniformGrid>
 
-         <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
+                <!--<UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2" >
+                    <Button Name="CompoBtn" 
+                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                        <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+                    </Button>
+                </UniformGrid>-->
+
+                <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
             Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
          <ComboBox Name="SawRoughingCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
@@ -182,10 +204,10 @@
             </ComboBox.ItemTemplate>
          </ComboBox>-->
 
-      </Grid>
-         
-      </Grid>
+            </Grid>
 
-   </Grid>
+        </Grid>
+
+    </Grid>
 
 </UserControl>

Frames/FrameCutPageUC.xaml.vb

@@ -52,6 +52,8 @@ Public Class FrameCutPageUC
       OffsXyTxBx.Text = LenToString(dOffsXY, 3)
       Dim dOffsYY As Double = GetPrivateProfileDouble(S_FRAME, K_OFFSYY, 5, m_MainWindow.GetIniFile())
       OffsYyTxBx.Text = LenToString(dOffsYY, 3)
+      Dim dOffsXInterY As Double = GetPrivateProfileDouble(S_FRAME, K_OFFSXINTERY, 5, m_MainWindow.GetIniFile())
+      OffsXInteryTxBx.Text = LenToString(dOffsXInterY, 3)
 
       ' Imposto i messaggi letti dal file dei messaggi
       m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 1))            'Lungo X
@@ -70,6 +72,7 @@ Public Class FrameCutPageUC
       OffsZTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 8)           'Distanza sopra
       OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9)          'Distanza inizio
       OffsYyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 22)         'Distanza Y
+      OffsXInteryTxBl.Text = EgtMsg(90645)                      'Interasse
    End Sub
 
    Private Sub FrameCutPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -81,6 +84,12 @@ Public Class FrameCutPageUC
       m_ProjectMgr.CSVBtn.Visibility = Windows.Visibility.Hidden
       m_ProjectMgr.VeinMatchingBtn.Visibility = Windows.Visibility.Hidden
       m_ProjectMgr.RegisterBtn.Visibility = Windows.Visibility.Hidden
+      ' Visualizzo il bottone per l'importazione dei compo frame
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.COMPOFRAME) AndAlso GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile()) > 0 Then
+         CompoBtn.Visibility = Visibility.Visible
+      Else
+         CompoBtn.Visibility = Visibility.Hidden
+      End If
       ' Recupero dimensioni e kerf del grezzo
       m_nRawId = EgtGetFirstRawPart()
       GetRawBox(m_RawBox)
@@ -271,7 +280,7 @@ Public Class FrameCutPageUC
       End If
    End Sub
 
-   Private Sub OffsXXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsZTxBx.EgtClosed, OffsXyTxBx.EgtClosed, OffsYyTxBx.EgtClosed
+   Private Sub OffsXXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsZTxBx.EgtClosed, OffsXyTxBx.EgtClosed, OffsYyTxBx.EgtClosed, OffsXInteryTxBx.EgtClosed
       ' Forzo aggiornamento grezzo nella pagina di Nesting
       m_MainWindow.m_CadCutPageUC.m_NestPage.CalcRawPart()
       ' Parcheggio pezzi presenti nel grezzo
@@ -296,9 +305,13 @@ Public Class FrameCutPageUC
          WritePrivateProfileString(S_FRAME, K_OFFSXY, DoubleToString(dOffsXy, 3), m_MainWindow.GetIniFile())
       End If
       Dim dOffsYy As Double = 0
-      If StringToLen(OffsYyTxBx.Text, dOffsYY) Then
+      If StringToLen(OffsYyTxBx.Text, dOffsYy) Then
          WritePrivateProfileString(S_FRAME, K_OFFSYY, DoubleToString(dOffsYy, 3), m_MainWindow.GetIniFile())
       End If
+      Dim dOffsXIntery As Double = 0
+      If StringToLen(OffsXInteryTxBx.Text, dOffsXIntery) Then
+         WritePrivateProfileString(S_FRAME, K_OFFSXINTERY, DoubleToString(dOffsXIntery, 3), m_MainWindow.GetIniFile())
+      End If
    End Sub
 
    Private Sub MirrorPartBtn_Click(sender As Object, e As RoutedEventArgs) Handles MirrorPartBtn.Click
@@ -436,6 +449,16 @@ Public Class FrameCutPageUC
       End If
    End Sub
 
+   Private Sub CompoBtn_Click(sender As Object, e As RoutedEventArgs) Handles CompoBtn.Click
+      m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
+      m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
+      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_DrawPageUC)
+      m_MainWindow.m_ActivePage = MainWindow.Pages.Draw
+   End Sub
+
    Friend Function CreateFrame(nPartId As Integer) As Boolean
       If Not MyCreateFrame( nPartId) Then
          EgtErase( nPartId)
@@ -936,12 +959,18 @@ Public Class FrameCutPageUC
       ' Determino distanza da spessore lama
       Dim dMinDist As Double = 0
       Dim dSawThick As Double = 0
+      Dim dOffsXIntery As Double = 0
+      StringToLen(OffsXInteryTxBx.Text, dOffsXIntery)
       If EgtTdbSetCurrTool(m_MainWindow.m_CurrentMachine.sCurrSaw) AndAlso
          EgtTdbGetCurrToolParam(MCH_TP.THICK, dSawThick) Then
-         dMinDist = dSawThick + 5 * EPS_SMALL
+         If dOffsXIntery <= dSawThick Then
+            dMinDist = dSawThick + 5 * EPS_SMALL
+         Else
+            dMinDist = dOffsXIntery + 5 * EPS_SMALL
+         End If
       Else
          EgtOutLog("Not found current saw for frames mindist")
-         dMinDist = 0
+         dMinDist = dOffsXIntery
       End If
       ' Inserisco il pezzo nel grezzo
       Dim ptIns As Point3d

LicenseWindow.xaml

@@ -0,0 +1,63 @@
+<Window x:Class="LicenseWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        Title="OpenFile" Height="500.6" Width="426.6" WindowStyle="None"         
+        ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
+        Background="Transparent">
+    <Border Style="{DynamicResource OmagCut_Border}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="4*"/>
+                <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="5.5*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="0.5*"/>
+            </Grid.RowDefinitions>
+
+            <StackPanel Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Center">
+                <TextBlock Name="IconTxBl" Foreground="White" FontSize="32" 
+                           VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                <TextBlock Name="LicenseTxBl"  
+                   Foreground="White" FontSize="20" 
+                   VerticalAlignment="Center" HorizontalAlignment="Left"
+                   TextWrapping="Wrap"/>
+            </StackPanel>
+
+            <StackPanel Grid.Column="1" Grid.Row="2"  Orientation="Horizontal"
+                        HorizontalAlignment="Center">
+                <ScrollViewer Name="MyScrollViewer" VerticalScrollBarVisibility="Auto">
+                <TextBlock Name="LicenseMsgTxBl" MaxWidth="340"
+                       HorizontalAlignment="Center"
+                       Foreground="{DynamicResource Omag_White}" FontSize="20" VerticalAlignment="Center"
+                       TextWrapping="Wrap"/>
+                </ScrollViewer>
+            </StackPanel>
+            <Grid Grid.Column="1" Grid.Row="4">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                </Grid.ColumnDefinitions>
+
+                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+
+            </Grid>
+
+        </Grid>
+
+    </Border>
+</Window>

LicenseWindow.xaml.vb

@@ -0,0 +1,37 @@
+Public Class LicenseWindow
+
+   Private m_sMessage As String = String.Empty
+   Private m_sTitle As String = String.Empty
+
+   Public Sub New(Owner As Window, sMsg As String, sTitle As String)
+      Me.Owner = Owner
+      m_sMessage = sMsg
+      m_sTitle = sTitle
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+
+   End Sub
+
+   Public Sub Init() Handles Me.Initialized
+      IconTxBl.Text = "⚠️"
+      LicenseTxBl.Text = "Warning" & vbCrLf & m_sTitle
+      m_sMessage = m_sMessage.Replace("/n", "£")
+      Dim sItems As String() = m_sMessage.Split("£")
+      For Index As Integer = 0 To sItems.Count - 1
+         If Index = 0 Then
+            m_sMessage = sItems(Index)
+         Else
+            m_sMessage &= vbCrLf & sItems(Index)
+         End If
+      Next
+      LicenseMsgTxBl.Text = m_sMessage
+   End Sub
+
+   Public Sub Exit_Click() Handles ExitBtn.Click
+      Me.Close()
+   End Sub
+
+End Class

Machine/AlarmsPageUC.xaml

@@ -20,7 +20,7 @@
          <Grid.RowDefinitions>
             <RowDefinition Height="2*"/>
             <RowDefinition Height="0.5*"/>
-             
+
             <RowDefinition Height="1.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="1*"/>
@@ -30,195 +30,246 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-          <!--Costruisco le riche per la colonna 3-->
-            <Grid Grid.Column="2" Grid.RowSpan="9">
-                <Grid.RowDefinitions>
-                    <!--GruopBox: taglio lama-->
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <!--GruopBoxs: Fresatura/>Foratura/WaterJet-->
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <!--GroupBox: vai ad Home-->
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="0.375*"/>
-                </Grid.RowDefinitions>
-                
-                <!--Parametri Taglio Lama: 5 Parametri-->
-                <GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.RowSpan="4">
-                    <!--definizione della grigli ainterna-->
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="2*"/>
-                            <ColumnDefinition Width="2*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="0.5*"/>
-                            <RowDefinition Height="0.5*"/>
-                            <RowDefinition Height="0.5*"/>
-                            <RowDefinition Height="0.5*"/>
-                            <RowDefinition Height="0.5*"/>
-                        </Grid.RowDefinitions>
+         <!--Costruisco le riche per la colonna 3-->
+         <Grid Grid.Column="2" Grid.RowSpan="9">
+            <Grid.RowDefinitions>
+               <!--GruopBox: taglio lama-->
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <!--GruopBoxs: Fresatura/>Foratura/WaterJet-->
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="0.5*"/>
+               <!--GroupBox: vai ad Home-->
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="0.375*"/>
+            </Grid.RowDefinitions>
 
-                        <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
+            <!--Parametri Taglio Lama: 5 Parametri-->
+            <GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.RowSpan="4">
+               <!--definizione della grigli ainterna-->
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="2*"/>
+                     <ColumnDefinition Width="2*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="0.5*"/>
+                     <RowDefinition Height="0.5*"/>
+                     <RowDefinition Height="0.5*"/>
+                     <RowDefinition Height="0.5*"/>
+                     <RowDefinition Height="0.5*"/>
+                  </Grid.RowDefinitions>
+
+                  <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
                                    Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
+                  <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
                                    Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
-                        <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1"
+                  <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1" 
                                    Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+                  <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0" IsLength="False"
                                    Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
-                        <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
+                  <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
                                    Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
+                  <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
                                    Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                        <TextBlock Name="IntArcMaxSideAngTxBl" Grid.Column="0" Grid.Row="3"
+                  <TextBlock Name="IntArcMaxSideAngTxBl" Grid.Column="0" Grid.Row="3"
                                    Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="IntArcMaxSideAngTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
+                  <EgtWPFLib:EgtTextBox Name="IntArcMaxSideAngTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0" IsLength="False"
                                    Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                        <TextBlock Name="PreCutExitTxBl" Grid.Column="0" Grid.Row="4"
+                  <TextBlock Name="PreCutExitTxBl" Grid.Column="0" Grid.Row="4"
                                    Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <CheckBox Name="PreCutExitChBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
+                  <CheckBox Name="PreCutExitChBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
                                   Style="{StaticResource OmagCut_CheckBox_Single}" 
-                                  HorizontalAlignment="Right"/>                        
-                        
-                    </Grid>
+                                  HorizontalAlignment="Right"/>
 
-                </GroupBox>
+               </Grid>
 
-                <Grid Grid.Column="2" Grid.Row="4" Grid.RowSpan="8">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
+            </GroupBox>
 
-                    <!--Parametri fori: 4 Parametri-->
-                    <GroupBox Name="HolesGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="3" 
+            <Grid Grid.Column="2" Grid.Row="4" Grid.RowSpan="8">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="*"/>
+                  <RowDefinition Height="*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="*"/>
+                  <RowDefinition Height="*"/>
+               </Grid.RowDefinitions>
+
+               <!--Parametri fori: 4 Parametri-->
+               <GroupBox Name="HolesGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="3" 
                               Style="{DynamicResource OmagCut_GroupBox}">
 
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="145*"/>
-                                <ColumnDefinition Width="23*"/>
-                                <ColumnDefinition Width="169*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="0.5*"/>
-                                <RowDefinition Height="0.5*"/>
-                                <RowDefinition Height="0.5*"/>
-                                <RowDefinition Height="0.5*"/>
-                            </Grid.RowDefinitions>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="145*"/>
+                        <ColumnDefinition Width="23*"/>
+                        <ColumnDefinition Width="169*"/>
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                     </Grid.RowDefinitions>
 
-                            <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
+                     <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
                                        Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                            <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="2" Grid.Row="0" Margin="10,0,10,0"
+                     <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="2" Grid.Row="0" Margin="10,0,10,0"
                                        Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
-                            <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
+                     <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
                                        Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                            <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
+                     <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
                                        Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
-                            <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
+                     <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
                                        Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                            <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
+                     <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
                                        Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
-                            <TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"
+                     <TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"
                                        Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                            <CheckBox Name="OneHoleInCornerChBx" Grid.Column="2" Grid.Row="3" Style="{StaticResource OmagCut_CheckBox_Single}"
+                     <CheckBox Name="OneHoleInCornerChBx" Grid.Column="2" Grid.Row="3" Style="{StaticResource OmagCut_CheckBox_Single}"
                                       HorizontalAlignment="Right" Margin="10,0,10,0"/>
 
-                        </Grid>
+                  </Grid>
 
-                    </GroupBox>
+               </GroupBox>
 
-                    <!--Parametri Fresatura: 3 Parametri-->
-                    <GroupBox Name="MillingsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="2">
-                        <Grid Grid.Column="3" Grid.Row="2">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="2*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
+               <!--Parametri Fresatura: 3 Parametri-->
+               <GroupBox Name="MillingsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="2">
+                  <Grid Grid.Column="3" Grid.Row="2">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
 
-                            <TextBlock Name="CornerCutsTxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                     <TextBlock Name="CornerCutsTxBl" Grid.Row="0" Grid.ColumnSpan="2"
                                        Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                            <CheckBox Name="CornerCutsChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                     <CheckBox Name="CornerCutsChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
                                       HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-                            <TextBlock Name="InternalCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
+                     <TextBlock Name="InternalCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
                                        Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
-                            <CheckBox Name="InternalCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                     <CheckBox Name="InternalCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
                                       HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-                            <TextBlock Name="ShortTxBl" Grid.Column="0" Grid.Row="2"
+                     <TextBlock Name="ShortTxBl" Grid.Column="0" Grid.Row="2"
                                        Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="ShortTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
+                     <EgtWPFLib:EgtTextBox Name="ShortTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                        </Grid>
+                  </Grid>
 
-                    </GroupBox>
+               </GroupBox>
 
-                    <!--Parametri WaterJet: 1 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
-                    <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="1" 
+               <!--Parametri rettifica tagli sottosquadra: 1 Parametro -->
+               <GroupBox Name="RectificationWJParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" >
+                   <Grid Grid.Column="3" Grid.Row="2">
+                       <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="2*"/>
+                       </Grid.ColumnDefinitions>
+                       <Grid.RowDefinitions>
+                           <RowDefinition Height="*"/>
+                       </Grid.RowDefinitions>
+
+                       <TextBlock Name="EnableRectificationTxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+                       <CheckBox Name="EnableRectificationChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                                 HorizontalAlignment="Right" Margin="0,0,10,0"/>
+
+                       <!--<TextBlock Name="OffsetRectificationTxBl" Grid.Row="1" Grid.Column="0" 
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                       <EgtWPFLib:EgtTextBox Name="OffsetRectificationTxBx" Grid.Row="1" Grid.Column="1" Margin="10,0,10,0"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>-->
+
+                   </Grid>
+
+               </GroupBox>
+
+               <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
+               <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="4" 
                               Style="{DynamicResource OmagCut_GroupBox}">
-                        <Grid Grid.Column="3" Grid.Row="2">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="2*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
+                  <Grid Grid.Column="3" Grid.Row="2">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="145*"/>
+                        <ColumnDefinition Width="23*"/>
+                        <ColumnDefinition Width="169*"/>
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                     </Grid.RowDefinitions>
 
-                            <TextBlock Name="WjIntCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
-                            <CheckBox Name="WjIntCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                      HorizontalAlignment="Right" Margin="0,0,10,0"/>
-                        
-                        </Grid>
-                    </GroupBox>
+                     <TextBlock Name="WjIntCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
+                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
+                     <CheckBox Name="WjIntCutsChBx" Grid.Column="2" Grid.Row="0" Style="{StaticResource OmagCut_CheckBox_Single}"
+                                      HorizontalAlignment="Right" Margin="10,0,10,0"/>
 
-                </Grid>
+                     <TextBlock Name="HolesDiameterWJTxBl" Grid.Column="0" Grid.Row="1"
+                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+                     <EgtWPFLib:EgtTextBox Name="HolesDiameterWJTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
+                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
-                <!--Parametri Taglio diretto: 1 Parametro-->
-                <GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="12" Grid.RowSpan="2">
-                    <Grid>
-                        <TextBlock Name="FinalHomeTxBl"
-                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                        <CheckBox Name="FinalHomeChBx" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
-                    </Grid>
+                     <TextBlock Name="HolesOffsetWJTxBl" Grid.Column="0" Grid.Row="2"
+                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+                     <EgtWPFLib:EgtTextBox Name="HolesOffsetWJTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
+                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
-                </GroupBox>
+                     <TextBlock Name="MinRadiusWJTxBl" Grid.Column="0" Grid.Row="3"
+                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
+                     <EgtWPFLib:EgtTextBox Name="MinRadiusWJTxBx" Grid.Column="2" Grid.Row="3" Margin="10,0,10,0"
+                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+                     <TextBlock Name="OneHoleInCornerWJTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
+                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
+                     <CheckBox Name="OneHoleInCornerWJChBx" Grid.Column="2" Grid.Row="4" Style="{StaticResource OmagCut_CheckBox_Single}"
+                                      HorizontalAlignment="Right" Margin="10,0,10,0"/>
+
+
+                  </Grid>
+               </GroupBox>
 
             </Grid>
-          
+
+            <!--Parametri Taglio diretto: 1 Parametro-->
+            <GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="12" Grid.RowSpan="2">
+               <Grid>
+                  <TextBlock Name="FinalHomeTxBl"
+                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+                  <CheckBox Name="FinalHomeChBx" Style="{StaticResource OmagCut_CheckBox_Single}"
+                                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
+               </Grid>
+
+            </GroupBox>
+
+         </Grid>
+
          <Grid Grid.RowSpan="3">
             <Grid.RowDefinitions>
                <RowDefinition Height="1.75*"/>
@@ -292,15 +343,15 @@
                   <TextBlock Name="CurrCupWheelTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
                      Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
                      Visibility="Hidden"/>
-                        <ComboBox Name="CurrCupWheelCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
+                  <ComboBox Name="CurrCupWheelCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
 
-                        <TextBlock Name="CurrWJetTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
+                  <TextBlock Name="CurrWJetTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
                      Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
                      Visibility="Hidden"/>
                   <ComboBox Name="CurrWJetCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
@@ -479,9 +530,9 @@
                <EgtWPFLib:EgtTextBox Name="CurrSawingTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-                  <TextBlock Name="CurrDrillingTxBl" Grid.Column="0" Grid.Row="1"
+               <TextBlock Name="CurrDrillingTxBl" Grid.Column="0" Grid.Row="1"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="CurrDrillingTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+               <EgtWPFLib:EgtTextBox Name="CurrDrillingTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
                Style="{DynamicResource OmagCut_FixedTextBox}" />
 
                <TextBlock Name="CurrMillingTxBl" Grid.Column="0" Grid.Row="2"
@@ -496,8 +547,18 @@
 
                <TextBlock Name="CurrWaterJettingTxBl" Grid.Column="0" Grid.Row="4"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CurrWaterJettingTxBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
-                  Style="{DynamicResource OmagCut_FixedTextBox}" />
+
+               <Grid Grid.Column="1" Grid.Row="4">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="5*"/>
+                     <ColumnDefinition Width="1.5*"/>
+                  </Grid.ColumnDefinitions>
+                  <EgtWPFLib:EgtTextBox Name="CurrWaterJettingTxBx" Grid.Column="0" Margin="10,0,5,0"
+                                         Style="{DynamicResource OmagCut_FixedTextBox}" />
+                  <EgtWPFLib:EgtTextBox Name="CurrWaterJettingQualityTxBx" Grid.Column="1" Margin="0,0,10,0"
+                                         Style="{DynamicResource OmagCut_FixedTextBox}" />
+               </Grid>
+
 
                <TextBlock Name="CurrDripSawingTxBl" Grid.Column="0" Grid.Row="5"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
@@ -614,7 +675,7 @@
                <Grid.RowDefinitions>
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/> 
+                  <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
 
@@ -623,27 +684,27 @@
                <CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-                <!--Allineato-->
+               <!--Allineato-->
                <TextBlock Name="AlignTxBl" Grid.Row="1" Grid.ColumnSpan="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="AlignChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-                <!--Ghigliottina-->
-                <TextBlock Name="GhigliottinaTxBl" Grid.Row="2" Grid.ColumnSpan="2"
+               <!--Ghigliottina-->
+               <TextBlock Name="GhigliottinaTxBl" Grid.Row="2" Grid.ColumnSpan="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="GhigliottinaChBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
-                
-                <!--Automatico-->
+
+               <!--Automatico-->
                <TextBlock Name="AutomaticTxBl" Grid.Row="3" Grid.ColumnSpan="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="AutomaticChBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-               
 
-                </Grid>
+
+            </Grid>
 
          </GroupBox>
 
@@ -661,9 +722,9 @@
 
                <Grid Grid.ColumnSpan="2">
                   <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="0.5*"/>
+                     <ColumnDefinition Width="0.5*"/>
+                     <ColumnDefinition Width="2*"/>
+                     <ColumnDefinition Width="0.5*"/>
                   </Grid.ColumnDefinitions>
 
                   <Button Name="BackImageBtn" Grid.Column="1"
@@ -702,13 +763,13 @@
                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
                <TextBlock Name="CfrPercTxBl" Grid.Column="0" Grid.Row="1"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CfrPercTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+               <EgtWPFLib:EgtTextBox Name="CfrPercTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0" IsLength="False"
                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             </Grid>
 
          </GroupBox>
 
-          <!--Incisioni--> 
+         <!--Incisioni-->
          <GroupBox Name="TopMillGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3"
             Grid.Row="3" Grid.RowSpan="3">
             <Grid>
@@ -722,17 +783,17 @@
                   <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
 
-                <!--Utilizza fresa-->
+               <!--Utilizza fresa-->
                <TextBlock Name="TmEnableTxBl" Grid.Column="0" Grid.Row="0"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="TmEnableChBx" Grid.Column="1" Grid.Row="0" Style="{DynamicResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="10,0,10,0"/>
-                <!--Affondamento-->
+               <!--Affondamento-->
                <TextBlock Name="TmDepthTxBl" Grid.Column="0" Grid.Row="1"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
                <EgtWPFLib:EgtTextBox Name="TmDepthTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                <!--Larghezza-->
+               <!--Larghezza-->
                <TextBlock Name="TmWidthTxBl" Grid.Column="0" Grid.Row="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
                <EgtWPFLib:EgtTextBox Name="TmWidthTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
@@ -774,30 +835,43 @@
 
          <!--Cornici-->
          <GroupBox Name="FrameGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="8">
-                <Grid >
-                 <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="1*"/>
-                 </Grid.ColumnDefinitions>
+            <Grid >
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
 
-                 <TextBlock Name="FramePauseTxBl" Grid.Column="0" Grid.Row="0"
+               <TextBlock Name="FramePauseTxBl" Grid.Column="0" Grid.Row="0"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                 <CheckBox Name="FramePauseChBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_CheckBox_Single}"
+               <CheckBox Name="FramePauseChBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_CheckBox_Single}"
                HorizontalAlignment="Right" Margin="0,0,10,0"/>
-             </Grid>
+            </Grid>
 
          </GroupBox>
 
-            <UniformGrid Columns="4" Grid.Row="8">
+         <Grid Grid.Column="0" Grid.Row="8">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="2.5*"/>
+               <ColumnDefinition Width="2.5*"/>
+               <ColumnDefinition Width="4.5*"/>
+               <ColumnDefinition Width="1.8*"/>
+            </Grid.ColumnDefinitions>
             <Button x:Name="SawProbingBtn"
-         	   Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
                <Image Source="{DynamicResource SawProbeImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
             </Button>
+            <Button x:Name="ExecLuaBtn" Grid.Column="1"
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+               <Image Source="{DynamicResource PlayImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            </Button>
 
-         </UniformGrid>
+            <TextBlock Name="UseLaserOriginTxBl" Grid.Column="2"
+                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+            <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="3"
+                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
+         </Grid>
 
       </Grid>
-
    </Border>
 
 </UserControl>

Machine/AlarmsPageUC.xaml.vb

@@ -29,7 +29,7 @@ Public Class AlarmsPageUC
 
    Private Sub AlarmsPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
 
-      'Assegno liste a combobox
+      ' Assegno liste a combobox
       CurrSawCmBx.ItemsSource = m_SawList
       CurrDrillCmBx.ItemsSource = m_DrillList
       CurrMillCmBx.ItemsSource = m_MillList
@@ -37,14 +37,24 @@ Public Class AlarmsPageUC
       CurrWJetCmBx.ItemsSource = m_WaterJetList
       AuxiliaryToolCmBx.ItemsSource = m_AuxToolTypeList
 
+      ' Variabile che accorcia il riferimento alla macchina corrente
+      m_CurrentMachine = m_MainWindow.m_CurrentMachine
+
       ' Assegno lista ad elenco materiali
-      MaterialsLstBx.ItemsSource = m_MainWindow.m_CurrentMachine.Materials
+      MaterialsLstBx.ItemsSource = m_CurrentMachine.Materials
 
       ' Se non è impostato il controllo numerico, nascondo il bottone di tastatura lama
       If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
          SawProbingBtn.Visibility = Windows.Visibility.Hidden
       End If
 
+      ' Se esiste un file lua valido allora mostro il pulsante per l'esecuzione dello script
+      If Not String.IsNullOrEmpty(GetExecLuaFile()) And
+         ExecLuaBtn.Visibility = Visibility.Visible Then
+      Else
+         ExecLuaBtn.Visibility = Visibility.Hidden
+      End If
+
       ' Imposto i messaggi letti dal file dei messaggi
       CurrSawTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 1)
       AuxiliaryToolTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 2)
@@ -81,7 +91,16 @@ Public Class AlarmsPageUC
       TmDepthTxBl.Text = EgtMsg( 91063)                                  ' Profondità
       TmWidthTxBl.Text = EgtMsg( 91064)                                  ' Larghezza
       WJsParamGpBx.Header = EgtMsg( 91058)                               ' Parametri waterjet
-      WjIntCutsTxBl.Text = EgtMsg( 90930)                                ' Sempre sugli interni
+      WjIntCutsTxBl.Text = EgtMsg(90930)                                 ' Sempre sugli interni
+      '-- INIZIO -- nuovi parametri per preforo lavello
+      HolesDiameterWJTxBl.Text = "Diameter"
+      HolesOffsetWJTxBl.Text = "Offset"
+      MinRadiusWJTxBl.Text = "Min Radius"
+      OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
+      '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
+      REctificationWJParamGpBx.Header = "Rectification"
+      EnableRectificationTxBl.Text = "Enable (on subsquare angle)"
+      '--  FINE  -- nuovi parametro Rettifica tagli sottosquadra WJ
       NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31)            ' Nesting
       AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato
       GhigliottinaTxBl.Text = EgtMsg(91066)                              ' Ghigliottina
@@ -109,14 +128,21 @@ Public Class AlarmsPageUC
       CurrDripDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 6)          ' DripDrilling
       FrameGpBx.Header = EgtMsg(91068)                                   ' Cornici
       FramePauseTxBl.Text = EgtMsg(91067)                                ' Inserisci pausa
+      UseLaserOriginTxBl.Text = EgtMsg(91129)                            ' Usa laser per origine
       AutoRawImageParamGpBx.Visibility = Windows.Visibility.Hidden
    End Sub
 
    Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
 
       If m_bFirst Then
-         ' Variabile che accorcia il riferimento alla macchina corrente
-         m_CurrentMachine = m_MainWindow.m_CurrentMachine
+
+         ' in assenza dell'uscita H1 nascondo i parametri lama
+         If EgtGetHeadId("H1") = GDB_ID.NULL Then
+            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
@@ -132,7 +158,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
@@ -151,7 +177,8 @@ 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
+            RectificationWJParamGpBx.Visibility = Visibility.Hidden
          End If
 
          ' Abilitazione box per contorni grezzo da foto
@@ -164,7 +191,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
@@ -184,6 +211,11 @@ Public Class AlarmsPageUC
       ' Seleziono lama corrente
       CurrSawCmBx.SelectedItem = m_CurrentMachine.sCurrSaw
 
+      ' nascondo la lista dei materiali solo se macchina WaterJet
+      If m_CurrentMachine.bWaterJet Then
+         MaterialsGpBx.Visibility = Visibility.Hidden
+      End If
+
       ' Verifico la configurazione della macchina per creare i combobox
       Select Case m_CurrentMachine.MountedToolConfig
          Case CurrentMachine.MountedToolConfigs.SAW
@@ -311,12 +343,24 @@ Public Class AlarmsPageUC
       EgtMdbSave()
       ' Leggo lavorazione angoli con fresa
       CornerCutsChBx.IsChecked =
-             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
       ' Leggo lavorazione interni con fresa
       InternalCutsChBx.IsChecked =
-             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
       WjIntCutsChBx.IsChecked =
-             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
+      ' Lavorazione preforo lavello con WaterJet
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_DIAMITERWJ, 0, m_MainWindow.GetMachIniFile())
+      HolesDiameterWJTxBx.Text = LenToString(dVal, 2)
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_OFFSETWJ, 0, m_MainWindow.GetMachIniFile())
+      HolesOffsetWJTxBx.Text = LenToString(dVal, 2)
+      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MIN_RADIUSWJ, 0, m_MainWindow.GetMachIniFile())
+      MinRadiusWJTxBx.Text = LenToString(dVal, 2)
+      OneHoleInCornerWJChBx.IsChecked =
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
+      ' leggo se attiva la rettifica degli angoli per WaterJet
+      EnableRectificationChBx.IsChecked =
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, 0, m_MainWindow.GetMachIniFile()) <> 0)
       ' Leggo accorciamento angoli con fresa
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
       ShortTxBx.Text = LenToString(dVal, 2)
@@ -329,7 +373,7 @@ Public Class AlarmsPageUC
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_ENGRAVING_WIDTH, 0, m_MainWindow.GetMachIniFile())
       TmWidthTxBx.Text = LenToString(dVal, 2)
       ' Flag per movimento in home alla fine dei tagli diretti
-      FinalHomeChBx.IsChecked = m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome
+      FinalHomeChBx.IsChecked = m_CurrentMachine.bDirectCutsFinalHome
       ' Leggo tagli ridotti per interferenza in nesting
       CompleteCutsChBx.IsChecked =
              (GetPrivateProfileInt(S_MACH_NEST, K_MACH_REDUCEDCUT, 0, m_MainWindow.GetMachIniFile()) = 0)
@@ -351,7 +395,7 @@ Public Class AlarmsPageUC
          AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36) & " " & GetCurrentTable().ToString()
       End If
       ' Leggo altezza sovratavola
-      dVal = m_MainWindow.m_CurrentMachine.dAdditionalTable
+      dVal = m_CurrentMachine.dAdditionalTable
       AdditionalTableTxBx.Text = LenToString(dVal, 2)
       ' Leggo soglia e tolleranza per contorno grezzo da foto
       ThresholdTxBx.Text = m_MainWindow.m_Camera.Threshold.ToString()
@@ -369,11 +413,22 @@ Public Class AlarmsPageUC
       If nWashing = -1 Then
          WashingGpBx.Visibility = Visibility.Hidden
       Else
-         WashingChBx.IsChecked = ( nWashing <> 0)
+         WashingChBx.IsChecked = (nWashing <> 0)
       End If
       ' Leggo parametri per variazione feed in tagli
       CfrLenTxBx.Text = LenToString(m_CurrentMachine.dFsevLength, 3)
       CfrPercTxBx.Text = DoubleToString(m_CurrentMachine.dFsevPerc, 0)
+
+      ' leggo flag per tavola definita da laser
+      Dim nUseLaserOrigin As Integer = GetPrivateProfileInt(S_TABLE, K_USELASERORIGIN, -1, m_MainWindow.GetMachIniFile())
+      If nUseLaserOrigin = -1 Then
+         UseLaserOriginTxBl.Visibility = Visibility.Hidden
+         UseLaserOriginChBx.Visibility = Visibility.Hidden
+      Else
+         UseLaserOriginTxBl.Visibility = Visibility.Visible
+         UseLaserOriginChBx.IsChecked = (nUseLaserOrigin <> 0)
+      End If
+
    End Sub
 
    ' aggiorna le text delle lavorazioni (la selezione avviene nella pagina del grezzo o dalla pagina del progetto corrente)
@@ -414,9 +469,26 @@ Public Class AlarmsPageUC
          CurrWaterJettingTxBx.Text = m_CurrentMachine.sCurrWaterJetting
          CurrWaterJettingTxBl.Visibility = Windows.Visibility.Visible
          CurrWaterJettingTxBx.Visibility = Windows.Visibility.Visible
+         If 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
+         CurrWaterJettingQualityTxBx.Visibility = Windows.Visibility.Hidden
       End If
       If m_CurrentMachine.sCurrDripSawing <> String.Empty Then
          CurrDripSawingTxBx.Text = m_CurrentMachine.sCurrDripSawing
@@ -536,6 +608,33 @@ Public Class AlarmsPageUC
          String.Compare(sMchTool, m_CurrentMachine.sCurrSaw, True) <> 0 Then
          m_CurrentMachine.sCurrSawing = String.Empty
       End If
+
+      'Dim sVal As String = String.Empty
+      'Dim dVal As Double = 0
+      'If m_CurrentMachine.GetUserNote("FsevLength", sVal, m_CurrentMachine.sCurrSawing, false) Then
+      '   StringToDouble(sVal, dVal)
+      '   m_CurrentMachine.SetFsevLength(dVal)
+      'End If
+      'If m_CurrentMachine.GetUserNote("FsevPerc", sVal, m_CurrentMachine.sCurrSawing, false) Then
+      '   StringToDouble(sVal, dVal)
+      '   m_CurrentMachine.SetFsevPerc(dVal)
+      'End If
+
+      Dim sVal As String = String.Empty
+      Dim dVal As Double = 0
+      If m_CurrentMachine.GetUserNote("FsevLength", sVal, m_CurrentMachine.sCurrSaw) Then
+         StringToDouble(sVal, dVal)
+         m_CurrentMachine.SetFsevLength(dVal)
+      End If
+      If m_CurrentMachine.GetUserNote("FsevPerc", sVal, m_CurrentMachine.sCurrSaw) Then
+         StringToDouble(sVal, dVal)
+         m_CurrentMachine.SetFsevPerc(dVal)
+      End If
+
+      ' Leggo parametri per variazione feed in tagli aggiornati in funzione della lama
+      CfrLenTxBx.Text = LenToString(m_CurrentMachine.dFsevLength, 3)
+      CfrPercTxBx.Text = DoubleToString(m_CurrentMachine.dFsevPerc, 0)
+
       ' Aggiorno utensili per lavoro in corso
       m_MainWindow.m_WorkInProgressPageUC.UpdateTools()
       ' aggiorno la lista delle lavorazioni
@@ -549,7 +648,7 @@ Public Class AlarmsPageUC
       If CurrDrillCmBx.SelectedItem.ToString() = NO_TOOL Then
          m_CurrentMachine.sCurrDrill = String.Empty
          m_CurrentMachine.sCurrDrilling = String.Empty
-      ' Assegno foretto
+         ' Assegno foretto
       Else
          m_CurrentMachine.sCurrDrill = CurrDrillCmBx.SelectedItem.ToString()
          ' Reset fresa, waterjet e relative lavorazioni
@@ -584,7 +683,7 @@ Public Class AlarmsPageUC
       If CurrMillCmBx.SelectedItem.ToString() = NO_TOOL Then
          m_CurrentMachine.sCurrMill = String.Empty
          m_CurrentMachine.sCurrMilling = String.Empty
-      ' Assegno fresa
+         ' Assegno fresa
       Else
          m_CurrentMachine.sCurrMill = CurrMillCmBx.SelectedItem.ToString()
          ' Reset foretto, waterjet e relative lavorazioni
@@ -654,7 +753,7 @@ Public Class AlarmsPageUC
       If CurrWJetCmBx.SelectedItem.ToString() = NO_TOOL Then
          m_CurrentMachine.sCurrWaterJet = String.Empty
          m_CurrentMachine.sCurrWaterJetting = String.Empty
-      ' Assegno Waterjet
+         ' Assegno Waterjet
       Else
          m_CurrentMachine.sCurrWaterJet = CurrWJetCmBx.SelectedItem.ToString()
          ' Reset foretto, fresa e relative lavorazioni
@@ -851,13 +950,51 @@ Public Class AlarmsPageUC
       End If
    End Sub
 
+   ' -- INIZIO -- nuovi parametri per prefori WaterJet
+   Private Sub HolesDiameterWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesDiameterWJTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(HolesDiameterWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_HOLES_DIAMITERWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub HolesOffsetWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesOffsetWJTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(HolesOffsetWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_HOLES_OFFSETWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub MinRadiusWJTxBx_Click(sender As Object, e As EventArgs) Handles MinRadiusWJTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(MinRadiusWJTxBx.Text, dVal)
+      WritePrivateProfileString(S_MACH_NEST, K_MIN_RADIUSWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub OneHoleInCornerWJChBx_Click(sender As Object, e As EventArgs) Handles OneHoleInCornerWJChBx.Click
+      If OneHoleInCornerWJChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+   ' --   FINE   -- nuovi parametri per prefori WaterJet
+
+   ' -- INIZIO -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+   Private Sub EnableRectificationChBx_Click(sender As Object, e As EventArgs) Handles EnableRectificationChBx.Click
+      If EnableRectificationChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "1", m_MainWindow.GetMachIniFile)
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "0", m_MainWindow.GetMachIniFile)
+      End If
+   End Sub
+   ' --   FINE   -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+
    Private Sub TmEnableChBx_Click(sender As Object, e As RoutedEventArgs) Handles TmEnableChBx.Click
       If TmEnableChBx.IsChecked() Then
          WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "1", m_MainWindow.GetMachIniFile())
       Else
          WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "0", m_MainWindow.GetMachIniFile())
       End If
-   End Sub 
+   End Sub
 
    Private Sub TmDepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles TmDepthTxBx.EgtClosed
       Dim dVal As Double = 0
@@ -873,9 +1010,9 @@ Public Class AlarmsPageUC
 
    Private Sub FinalHomeChBx_Click(sender As Object, e As RoutedEventArgs) Handles FinalHomeChBx.Click
       If FinalHomeChBx.IsChecked() Then
-         m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome = True
+         m_CurrentMachine.bDirectCutsFinalHome = True
       Else
-         m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome = False
+         m_CurrentMachine.bDirectCutsFinalHome = False
       End If
    End Sub
 
@@ -917,7 +1054,7 @@ Public Class AlarmsPageUC
    Private Sub AdditionalTableTxBx_EgtClosed(sender As Object, e As EventArgs) Handles AdditionalTableTxBx.EgtClosed
       Dim dVal As Double = 0
       StringToLen(AdditionalTableTxBx.Text, dVal)
-      m_MainWindow.m_CurrentMachine.dAdditionalTable = dVal
+      m_CurrentMachine.dAdditionalTable = dVal
    End Sub
 
    Private Sub NewMatBtn_Click(sender As Object, e As RoutedEventArgs) Handles NewMatBtn.Click
@@ -993,6 +1130,14 @@ Public Class AlarmsPageUC
       End If
    End Sub
 
+   Private Sub UseLaserOriginChBx_Click() Handles UseLaserOriginChBx.Click
+      If UseLaserOriginChBx.IsChecked() Then
+         WritePrivateProfileString(S_TABLE, K_USELASERORIGIN, "1", m_MainWindow.GetMachIniFile())
+      Else
+         WritePrivateProfileString(S_TABLE, K_USELASERORIGIN, "0", m_MainWindow.GetMachIniFile())
+      End If
+   End Sub
+
    Private Sub WashingChBx_Click(sender As Object, e As RoutedEventArgs) Handles WashingChBx.Click
       If WashingChBx.IsChecked() Then
          WritePrivateProfileString(S_MACH_NEST, K_MACH_WASHING, "1", m_MainWindow.GetMachIniFile())
@@ -1033,9 +1178,13 @@ Public Class AlarmsPageUC
          Case 3
             Dim nResult As Short = m_CN.DGeneralFunctions_WriteCncMode(0)
             EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
+         Case 4
+            ' FANUC - Manual:7, Edit:1
+            Dim nResult As Short = m_CN.DGeneralFunctions_WriteCncMode(7)
+            EgtOutLog("Impostata modalità manuale: esito " & nResult.ToString)
       End Select
       ' Recupero file LUA
-      EgtLuaExecFile(m_MainWindow.m_CurrentMachine.sMachDir() & "\DirectCmd\SawProbing.lua")
+      EgtLuaExecFile(m_CurrentMachine.sMachDir() & "\DirectCmd\SawProbing.lua")
       ' Recupero utensile da tastare
       Dim ToolForProbing As ToolPos = ChooseToolForProbing()
       If IsNothing(ToolForProbing) OrElse String.IsNullOrWhiteSpace(ToolForProbing.m_ToolName) Then Return
@@ -1044,6 +1193,7 @@ Public Class AlarmsPageUC
       Dim dToolDiam As Double = 0
       Dim dToolThick As Double = 0
       Dim dToolLen As Double = 0
+      Dim dCore As Double = 0
       Dim sToolParam As String = String.Empty
       EgtTdbGetCurrToolParam(MCH_TP.HEAD, sToolParam)
       EgtLuaSetGlobStringVar("CMD.HEAD", sToolParam)
@@ -1055,6 +1205,14 @@ Public Class AlarmsPageUC
       EgtLuaSetGlobNumVar("CMD.THICK", dToolThick * 1000)
       EgtTdbGetCurrToolParam(MCH_TP.LEN, dToolLen)
       EgtLuaSetGlobNumVar("CMD.LENGTH", dToolLen * 1000)
+      EgtTdbGetCurrToolParam(MCH_TP.CORE, dCore)
+      EgtLuaSetGlobNumVar("CMD.CORE", dCore * 1000)
+      ' Nuova varibile per gestione tastatura utensili Frankfurt (Polishing)
+      Dim nType As Integer
+      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
+      If m_CurrentMachine.bPolishingWheel AndAlso nType = MCH_TY.MILL_POLISHING Then
+         EgtLuaSetGlobStringVar("CMD.POLISHING", "1")
+      End If
       EgtLuaSetGlobBoolVar("CMD.INCHES", m_MainWindow.m_CNCommunication.GetMachineInInches())
       EgtLuaCallFunction("CMD.CmdString")
       ' Leggo variabili
@@ -1074,7 +1232,7 @@ Public Class AlarmsPageUC
       ' Modifico stringa per inserire i newline
       CmdString = CmdString.Replace("<br/>", Environment.NewLine)
       ' Creo file...
-      Dim FilePath As String = m_MainWindow.GetCncDir() & "\SawProbing" & m_MainWindow.m_CurrentMachine.sIsoFileExt
+      Dim FilePath As String = m_MainWindow.GetCncDir() & "\SawProbing" & m_CurrentMachine.sIsoFileExt
       ' ...e ci scrivo
       Dim Writer As New IO.StreamWriter(FilePath, False)
       Writer.Write(CmdString)
@@ -1098,11 +1256,16 @@ Public Class AlarmsPageUC
          Return
       End If
       m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+      ' Se fanuc passo in modalità AUTO e attivo
+      If m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         Dim nResult As Short = m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_WriteCncMode(0)
+         EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
+      End If
       ' Aspetto e lo avvio
       System.Threading.Thread.Sleep(300)
       m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_CycleStart()
       ' Creo MsgBox di attesa
-      Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, EgtMsg(MSG_DIRECTCUTPAGEUC + 41), EgtMsg(MSG_DIRECTCUTPAGEUC + 42), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL)
+      Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, String.Format(EgtMsg(MSG_DIRECTCUTPAGEUC + 41), ToolForProbing.m_ToolName), EgtMsg(MSG_DIRECTCUTPAGEUC + 42), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL)
       m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0
       ' Definisco flag tastatura
       Dim bProbingOk As Boolean = False
@@ -1147,6 +1310,10 @@ Public Class AlarmsPageUC
          Dim bRead As Boolean = False
          Dim SawDiameterNameVar As String = String.Empty
          GetPrivateProfileString(S_MACH_PROBING, K_SAWDIAMETER, "", SawDiameterNameVar, m_MainWindow.GetMachIniFile())
+         ' Se utensile non lama, allora la variabile in cui leggo il dato potrebbe essere differente
+         If Not ToolForProbing.m_IsSaw Then
+            GetPrivateProfileString(S_MACH_PROBING, K_TOOLLENGTH, SawDiameterNameVar, SawDiameterNameVar, m_MainWindow.GetMachIniFile())
+         End If
          m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0
          For I As Integer = 0 To 20
             ' Devo rileggere la variabile ad ogni ciclo
@@ -1155,7 +1322,10 @@ Public Class AlarmsPageUC
             If m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 3 Then
                bRead = True
                Dim dVal As Double = m_MainWindow.m_CNCommunication.m_CN.d_DReadELS_value
-               dVal = dVal / 1000
+               ' Se fanuc il dato è in mm (NON MICRON)
+               If m_MainWindow.m_CNCommunication.m_nNCType <> 4 Then
+                  dVal = dVal / 1000
+               End If
                MsgBoxStateInfo.LoadingPrBr_Value = 100
                ' Tastatura conclusa con successo
                Dim sOut As String = EgtMsg(MSG_DIRECTCUTPAGEUC + 43) & " : " & DoubleToString(dVal, 1)
@@ -1202,9 +1372,9 @@ Public Class AlarmsPageUC
    End Sub
 
    Private Function ChooseToolForProbing() As ToolPos
-      Select Case m_MainWindow.m_CurrentMachine.MountedToolConfig
+      Select Case m_CurrentMachine.MountedToolConfig
          Case CurrentMachine.MountedToolConfigs.SAW
-            Return New ToolPos(m_MainWindow.m_CurrentMachine.sCurrSaw, "T100", True)
+            Return New ToolPos(m_CurrentMachine.sCurrSaw, "T100", True)
          Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL, CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER
             Dim ChooseTool As New ChooseToolWD(m_MainWindow)
             If ChooseTool.ShowDialog Then
@@ -1250,4 +1420,36 @@ Public Class AlarmsPageUC
 
    End Sub
 
+   Private Sub ExecLuaBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExecLuaBtn.Click
+      Dim sExecFile As String = GetExecLuaFile()
+      ' Eseguo file LUA e recupero risultato
+      Dim nErr As Integer = 999
+      EgtLuaExecFile(sExecFile)
+      EgtLuaGetGlobIntVar("ELS.ERR", nErr)
+      ' Reset lua
+      EgtLuaResetGlobVar("ELS")
+      ' Verifico condizioni di errore
+      If nErr Then
+         ' Errore...
+         EgtOutLog("Error executing file: " & sExecFile & ", ELS.ERR=" & nErr.ToString)
+         ' Error executing script
+         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90259), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+         Return
+      End If
+   End Sub
+
+   ' Recupero il percorso del file lua da eseguire
+   Private Function GetExecLuaFile() As String
+      Dim sFile As String = String.Empty
+      If GetPrivateProfileString(S_EXECLUA, K_FILESCRIPT_LUA, "", sFile, m_MainWindow.GetMachIniFile()) <> 0 Then
+         ' Sistemo nome file
+         sFile = sFile.Trim()
+         If Not sFile.EndsWith(".lua") Then sFile = sFile & ".lua"
+         ' Creo path
+         Dim sPath As String = m_CurrentMachine.sMachDir() & "\Scripts\" & sFile
+         If File.Exists(sPath) Then Return sPath
+      End If
+      Return String.Empty
+   End Function
+
 End Class

Machine/CurrentMachine.vb

@@ -1,5 +1,7 @@
 Imports System.Collections.ObjectModel
+Imports EgtWPFLib5
 Imports EgtUILib
+Imports System.IO
 
 Public Class CurrentMachine
 
@@ -50,6 +52,10 @@ Public Class CurrentMachine
    Private m_sProdLiProbingState2Var As String = ""
    Private m_sProdLiProbingTcPos2Var As String = ""
    Private m_sProdLiSawDiameter2Var As String = ""
+   Private m_sClickState As String = "E80028"
+   Private m_sClickDir As String = ""
+   ' Gestione speciale per canali CN
+   Private m_sExtFileCN As String = ".0"
 
    ' Numero e tipo di utensili correntemente disponibili sulla macchina
    Private m_MountedToolConfig As MountedToolConfigs = MountedToolConfigs.SAW
@@ -76,6 +82,12 @@ Public Class CurrentMachine
    Private m_bPolishingWheel As Boolean = False
    Private m_bWaterJet As Boolean = False
 
+   ' Flag che indica se gesire l'inversione del taglio nei tagli singoli
+   Private m_bEnableInvetrt As Boolean = True
+
+   ' 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
@@ -114,6 +126,7 @@ Public Class CurrentMachine
    Private m_sCurrDripSawing As String = String.Empty
    Private m_sCurrDripDrilling As String = String.Empty
    Private m_sCurrWaterJetting As String = String.Empty
+   Private m_sCurrWaterJettingQuality As String = String.Empty
 
    ' Spessore sottopezzo
    Private m_dAdditionalTable As Double = 0
@@ -126,6 +139,8 @@ Public Class CurrentMachine
    Private m_dPhotoOffsetY As Double = 0
    Private m_dTab2PhotoOffsetX As Double = 0
    Private m_dTab2PhotoOffsetY As Double = 0
+   Private m_dHQPhotoOffsetX As Double = 0
+   Private m_dHQPhotoOffsetY As Double = 0
 
    ' Abilitazione scelta restart
    Private m_bEnableRestart As Boolean = False
@@ -157,6 +172,9 @@ Public Class CurrentMachine
    ' Lista dei materiali
    Private m_Materials As New ObservableCollection(Of Material)
 
+   ' Lista delle qualità di lavorazioni disponibili nel WaterJet
+   Private m_Qualities As New ObservableCollection(Of String)
+
    ' Massimo id della lista materiali nel file ini
    Private m_MaxIdMat As Integer = 0
 
@@ -183,8 +201,15 @@ Public Class CurrentMachine
    ' Massimo numero di utensili su Tc manuale
    Friend MAX_TCMAN_TOOLS As Integer = 60
 
+   ' Massima profondità lavorabile nei tagli diretti
+   Private m_MaxTabDepth As Double = 10.0
 
 #Region "Proprietà che leggono e scrivono i valori anche da o su file ini"
+   Friend ReadOnly Property MaxTabDepth As Double
+      Get
+         Return m_MaxTabDepth
+      End Get
+   End Property
 
    Friend ReadOnly Property sMachineName As String
       Get
@@ -305,7 +330,7 @@ Public Class CurrentMachine
          Return m_bAskNewOnResend
       End Get
    End Property
-   
+
 
    Friend ReadOnly Property nProdLiSawProbe As Integer
       Get
@@ -313,6 +338,24 @@ Public Class CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property sClickState As String
+      Get
+         Return m_sClickState
+      End Get
+   End Property
+
+   Friend ReadOnly Property sClickDir As String
+      Get
+         Return m_sClickDir
+      End Get
+   End Property
+
+   Friend ReadOnly Property sExtFileCN As String
+      Get
+         Return m_sExtFileCN
+      End Get
+   End Property
+
    Friend Function sProdLiProbingStateVar(nI As Integer) As String
       If nI = 1 Then Return m_sProdLiProbingStateVar
       If nI = 2 Then Return m_sProdLiProbingState2Var
@@ -431,6 +474,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
@@ -595,6 +644,18 @@ Public Class CurrentMachine
          If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWING, value, sMachIniFile) Then
             m_sCurrSawing = value
             m_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
+            '' aggiorno il file ini della macchina con i valori correnti della lavorazione
+            'Dim sVal As String = String.Empty
+            'Dim dVal As Double = m_dFsevLength
+            'If GetUserNote("FsevLength", sVal, m_sCurrSawing, False) Then
+            '   StringToDouble(sVal, dVal)
+            '   SetFsevLength(dVal)
+            'End If
+            'dVal = m_dFsevPerc
+            'If GetUserNote("FsevPerc", sVal, m_sCurrSawing, False) Then
+            '   StringToDouble(sVal, m_dFsevPerc)
+            '   SetFsevPerc(dVal)
+            'End If
          End If
       End Set
    End Property
@@ -705,6 +766,21 @@ Public Class CurrentMachine
       Set(value As String)
          If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING, value, sMachIniFile) Then
             m_sCurrWaterJetting = value
+            If m_MainWindow.m_CurrentMachine.bWaterJet And EgtGetHeadId("H1") = GDB_ID.NULL Then
+               m_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
+            End If
+
+         End If
+      End Set
+   End Property
+
+   Friend Property sCurrWaterJettingQuality As String
+      Get
+         Return m_sCurrWaterJettingQuality
+      End Get
+      Set(value As String)
+         If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, value, sMachIniFile) Then
+            m_sCurrWaterJettingQuality = value
          End If
       End Set
    End Property
@@ -715,6 +791,12 @@ Public Class CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property bEnableInvert As Boolean
+      Get
+         Return m_bEnableInvetrt
+      End Get
+   End Property
+
    Friend Property dAdditionalTable As Double
       Get
          Select Case GetCurrentTable()
@@ -727,6 +809,7 @@ Public Class CurrentMachine
          End Select
       End Get
       Set(value As Double)
+         Dim dValue As Double = 0
          Select Case GetCurrentTable()
             Case 3
                If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
@@ -735,6 +818,11 @@ Public Class CurrentMachine
                   m_dTab3AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, value)
+                  End If
                End If
             Case 2
                If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
@@ -743,6 +831,11 @@ Public Class CurrentMachine
                   m_dTab2AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, value)
+                  End If
                End If
             Case Else
                If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
@@ -751,6 +844,11 @@ Public Class CurrentMachine
                   m_dAdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, value)
+                  End If
                End If
          End Select
       End Set
@@ -768,6 +866,10 @@ Public Class CurrentMachine
             Case 2
                Return New Vector3d(m_dTab2PhotoOffsetX, m_dTab2PhotoOffsetY, 0)
             Case Else
+               ' verifico quale delle due fotocamere è attualmente attiva
+               If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
+                  Return New Vector3d(m_dHQPhotoOffsetX, m_dHQPhotoOffsetY, 0)
+               End If
                Return New Vector3d(m_dPhotoOffsetX, m_dPhotoOffsetY, 0)
          End Select
       End Get
@@ -820,9 +922,18 @@ Public Class CurrentMachine
       Set(value As Double)
          If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVLEN, DoubleToString(value, 3), sMachIniFile) Then
             m_dFsevLength = value
+            ' salvo il dato nelle UserNote della lavorazione
+            'MdbSetCurrMachiningUserNote("FsevLength", m_dFsevLength.ToString, sCurrSawing, false)
+            ' salvo il dato nelle UserNote dell'utensile
+            TdbSetCurrToolUserNote("FsevLength", m_dFsevLength.ToString, sCurrSaw)
          End If
       End Set
    End Property
+   Friend Sub SetFsevLength(value As Double)
+      If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVLEN, DoubleToString(value, 3), sMachIniFile) Then
+         m_dFsevLength = value
+      End If
+   End Sub
 
    Friend Property dFsevPerc As Double
       Get
@@ -831,9 +942,18 @@ Public Class CurrentMachine
       Set(value As Double)
          If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVPERC, DoubleToString(value, 3), sMachIniFile) Then
             m_dFsevPerc = value
+            '' salvo il dato nelle UserNote della lavorazione
+            'MdbSetCurrMachiningUserNote("FsevPerc", m_dFsevPerc.ToString, sCurrSawing)
+            ' salvo il dato nelle UserNote dell'utensile
+            TdbSetCurrToolUserNote("FsevPerc", m_dFsevPerc.ToString, sCurrSaw)
          End If
       End Set
    End Property
+   Friend Sub SetFsevPerc(value As Double)
+      If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVPERC, DoubleToString(value, 3), sMachIniFile) Then
+         m_dFsevPerc = value
+      End If
+   End Sub
 
    Friend ReadOnly Property ToolChangerNbr As Integer
       Get
@@ -903,6 +1023,12 @@ Public Class CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property Qualities As ObservableCollection(Of String)
+      Get
+         Return m_Qualities
+      End Get
+   End Property
+
    Friend Sub AddMaterial(value As Material)
       For Each Material As Material In Materials
          If Material.nId = value.nId Then
@@ -984,7 +1110,11 @@ Public Class CurrentMachine
       End Get
       Set(value As Material)
          Dim CurrMatId As String = If(Not IsNothing(value), value.nId.ToString, "")
-         WritePrivateProfileString(S_MATERIALS, K_CURRMATERIAL, CurrMatId, sMachIniFile)
+         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)
+         End If
          m_CurrMat = value
       End Set
    End Property
@@ -1030,6 +1160,8 @@ Public Class CurrentMachine
       m_sMachIniFile = m_MainWindow.GetMachinesRootDir & "\" & sMachineName & "\" & sMachineName & ".ini"
       ' Leggo estensione del file programma pezzo
       GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, "xpi", m_sIsoFileExt, sMachIniFile)
+      ' per gestione canali separati (macchina NUM con più di 5 Assi) ver. 2.5g1
+      GetPrivateProfileString(S_PARTPROGRAM, K_EXTFILECN, ".0", m_sExtFileCN, sMachIniFile)
       If m_sIsoFileExt(0) <> "." Then m_sIsoFileExt = "." & m_sIsoFileExt
       ' Leggo flag incremento asse C
       m_dDeltaC = GetPrivateProfileDouble(S_AXES, K_DELTA_C, 0.0, sMachIniFile)
@@ -1063,6 +1195,13 @@ Public Class CurrentMachine
       GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGTCPOS2VAR, "0", m_sProdLiProbingTcPos2Var, sMachIniFile)
       GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLISAWDIAMETER2VAR, "", m_sProdLiSawDiameter2Var, sMachIniFile)
 
+      GetPrivateProfileString(S_POLISHLINE, K_CLICKSTATE, "", m_sClickState, sMachIniFile)
+      GetPrivateProfileString(S_POLISHLINE, k_CLICKDIR, "", m_sClickDir, sMachIniFile)
+      If Not Directory.Exists(m_sClickDir) Then
+         m_sClickState = ""
+         EgtOutLog("Directory " & m_sClickDir & " does not exist")
+      End If
+
       ' Leggo configurazione degli utensili in macchina
       m_MountedToolConfig = GetPrivateProfileInt(S_TOOLS, K_MOUNTEDTOOLCONFIG, 0, sMachIniFile)
       ' Leggo flag presenza tipologie utensili
@@ -1082,6 +1221,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)
@@ -1117,6 +1258,8 @@ Public Class CurrentMachine
                         m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.ENABLE_WJ)
       ' possibilità di definire attacco speciale per materiali ceramici
       m_bSawingSpecialLeadIn = (GetPrivateProfileInt(S_MACHININGS, K_SAWINGSPECIALLEADIN, 0, sMachIniFile) > 0)
+      ' mantengo la direzione del taglio definita nel taglio diretto
+      m_bEnableInvetrt = (GetPrivateProfileInt(S_DIRECTCUTS, K_ENABLEINVERT, 1, sMachIniFile) <> 0)
 
       ' Leggo utensili correnti
       ' lama
@@ -1157,6 +1300,8 @@ Public Class CurrentMachine
       GetPrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILLING, Nothing, m_sCurrDripDrilling, sMachIniFile)
       ' waterjetting
       GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING, Nothing, m_sCurrWaterJetting, sMachIniFile)
+      ' waterjettingquality
+      GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, Nothing, m_sCurrWaterJettingQuality, sMachIniFile)
 
       ' Leggo numero di portautensili
       m_ToolChangerNbr = GetPrivateProfileInt(S_TOOLCHANGER, K_NUMBER, 0, sMachIniFile)
@@ -1197,6 +1342,8 @@ Public Class CurrentMachine
       m_dPhotoOffsetY = GetPrivateProfileDouble(S_PHOTO, K_PHOTO_OFFSETY, 0, sMachIniFile)
       m_dTab2PhotoOffsetX = GetPrivateProfileDouble(S_PHOTO, K_PHOTO_TAB2_OFFSETX, 0, sMachIniFile)
       m_dTab2PhotoOffsetY = GetPrivateProfileDouble(S_PHOTO, K_PHOTO_TAB2_OFFSETY, 0, sMachIniFile)
+      m_dHQPhotoOffsetX = GetPrivateProfileDouble(S_PHOTO, K_PHOTO_HQ_OFFSETX, 0, sMachIniFile)
+      m_dHQPhotoOffsetY = GetPrivateProfileDouble(S_PHOTO, K_PHOTO_HQ_OFFSETY, 0, sMachIniFile)
 
       ' Leggo abilitazione per restart
       m_bEnableRestart = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENABLERESTART, 0, sMachIniFile) <> 0)
@@ -1210,6 +1357,7 @@ Public Class CurrentMachine
 
       ' Leggo dati per feed ridotta all'inizio/fine dei tagli
       m_bFsevEnable = (GetPrivateProfileInt(S_NEST, K_MACH_CUTFSEVENABLE, 0, sMachIniFile) <> 0)
+      ' sposto la lettura nel DB delle lavorazioni della lama corrente!
       m_dFsevLength = GetPrivateProfileDouble(S_NEST, K_MACH_CUTFSEVLEN, 0, sMachIniFile)
       m_dFsevPerc = GetPrivateProfileDouble(S_NEST, K_MACH_CUTFSEVPERC, 0, sMachIniFile)
 
@@ -1218,27 +1366,287 @@ Public Class CurrentMachine
       ' Leggo la lista dei materiali
       Dim Material As Material = Nothing
       Dim nIndex As Integer = 1
-      While (GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & nIndex, Material, sMachIniFile))
-         m_Materials.Add(Material)
-         nIndex += 1
-      End While
+
+      If m_bWaterJet And m_bFromDBWaterJet Then
+         LoadWJMaterial(True)
+      Else
+         While (GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & nIndex, Material, sMachIniFile))
+            m_Materials.Add(Material)
+            nIndex += 1
+         End While
+      End If
+
       ' Salvo massimo indice a cui sono arrivato per usarlo quando devo aggiungere nuovi elementi alla lista
       m_MaxIdMat = nIndex - 1
 
       ' Leggo materiale correntemente attivo
-      Dim CurrMatId As Integer = GetPrivateProfileInt(S_MATERIALS, K_CURRMATERIAL, 0, sMachIniFile)
-      For Each Material In Materials
-         If Material.nId = CurrMatId Then
-            m_CurrMat = Material
-            Exit For
+      Dim sCurrMatId As String = String.Empty
+      EgtUILib.GetPrivateProfileString(S_MATERIALS, K_CURRMATERIAL, "0", sCurrMatId, sMachIniFile)
+      If bWaterJet And bFromDBWaterJet Then
+         Dim sCurrMatIds As String()
+         sCurrMatIds = sCurrMatId.Split("."c)
+         If sCurrMatIds.Length > 1 Then
+            Dim nCurrMatId As Integer
+            Dim nCurrSubMatId As Integer
+            If Not Integer.TryParse(sCurrMatIds(0), nCurrMatId) Then nCurrMatId = 0
+            If Not Integer.TryParse(sCurrMatIds(1), nCurrSubMatId) Then nCurrSubMatId = 0
+            For Each Material In Materials
+               If Material.nId = nCurrMatId AndAlso Material.SubId = nCurrSubMatId Then
+                  m_CurrMat = Material
+                  Exit For
+               End If
+            Next
          End If
-      Next
+      Else
+         Dim nCurrMatId As Integer
+         If Not Integer.TryParse(sCurrMatId, nCurrMatId) Then nCurrMatId = 0
+         For Each Material In Materials
+            If Material.nId = nCurrMatId Then
+               m_CurrMat = Material
+               Exit For
+            End If
+         Next
+      End If
       ' leggo se la macchina ha il tastatore dello spessore tavola
       m_HasRawProbe = (GetPrivateProfileInt(S_MACH_PROBING, K_ENABLERAWPROBE, 1, sMachIniFile) <> 0)
       ' leggo se la macchina ha il lettore di codice a barre della lastra
       m_nEnableBarCodeReader = GetPrivateProfileInt(S_MACH_BARCODEREADER, K_ENABLEBCR, 0, sMachIniFile)
+
+      ' affonadamento massimo oltre la tavola (inidicata in positivo!)
+      m_MaxTabDepth = GetPrivateProfileDouble(S_MACH_NEST, "MaxTabDepth", 10.0, m_MainWindow.GetMachIniFile())
+      If m_MaxTabDepth < 0 Then
+         m_MaxTabDepth = 10.0
+      End If
    End Sub
 
+   ' Per il controllo FANUC al momento dell'inizializzazione del CN devono essere lette alcune variabili
+   Public Sub InitFANUC(CN_Generic As CN_generico)
+      ' Leggo ritardo tra reset e send per NUM
+      m_nResetSendDelay = GetPrivateProfileInt(S_NCFANUC, K_RESETSENDDELAY, 1000, sMachIniFile)
+      ' Leggo ritardo tra reset e send per NUM
+      m_nThreadSleep = GetPrivateProfileInt(S_NCFANUC, K_THREADSLEEP, 150, sMachIniFile)
+      ' Leggo i dati strettamente correlati alla comunicazione NC-PC
+      Dim CN As CN_generico = CN_Generic
+      ' Leggo l'indirizzo in cui scrivere lo stato macchina
+      Dim dAddNcMode As String = CN.s_addr_set_nc_mode
+      GetPrivateProfileString(S_NCFANUC, K_SETNCMODE, CN.s_addr_set_nc_mode, CN.s_addr_set_nc_mode, sMachIniFile)
+      ' Leggo primo indirizzo libero delle variabili di tipo intero
+      CN.n_Base_addr_int_vars = GetPrivateProfileInt(S_NCFANUC, K_BASEADDRINT, CN.n_Base_addr_int_vars, sMachIniFile)
+      ' Leggo primo indirizzo libero delle variabili di tipo bit
+      CN.n_Base_addr_byte_for_bits_vars = GetPrivateProfileInt(S_NCFANUC, K_BASEADDRBIT, CN.n_Base_addr_byte_for_bits_vars, sMachIniFile)
+      ' Leggo numero di variabili di tipo intero
+      CN.n_num_var_int_to_read = CShort(GetPrivateProfileInt(S_NCFANUC, K_NUMVARINT, CInt(CN.n_num_var_int_to_read), sMachIniFile))
+      ' Leggo numero di varibili di tipo bit
+      CN.n_num_var_byte_for_bits_to_read = CShort(GetPrivateProfileInt(S_NCFANUC, K_NUMVARBIT, CInt(CN.n_num_var_byte_for_bits_to_read), sMachIniFile))
+      ' Leggo variabile abilitata alla gestione di FeedHold
+      GetPrivateProfileString(S_NCFANUC, K_SETNCMODE, CN.s_addr_feedhold, CN.s_addr_feedhold, sMachIniFile)
+   End Sub
+
+   Public Sub LoadWJMaterial(Optional bIsStart As Boolean = False)
+      Dim TempCurrMat As Material = CurrMat
+      ' Svuoto l'attuale lista di materiali
+      m_Materials.Clear()
+      ' Leggo valori da file Data e li carico nelle proprietà
+      Dim sFilePath As String = sMachDir & "\" &  MACHININGS_DIR & "\" & WATERJETDB_FILE
+      Dim Local_MaterialList = New ObservableCollection(Of EgtWPFLib5.WjMaterial)
+      Local_MaterialList = WaterjetDbWindowVM_OmagCUT.LoadWjMaterials(sFilePath)
+      ' definisco la lista delle qualità (solo se è vuota)
+      If m_Qualities.Count < 1 Then
+         m_Qualities.Add("Q1")
+         m_Qualities.Add("Q2")
+         m_Qualities.Add("Q3")
+         m_Qualities.Add("Q4")
+         m_Qualities.Add("Q5")
+         m_Qualities.Add("QExtra")
+      End If
+      ' inserisco il materiale generico di default -- IN SOSPESO
+      'm_Materials.Add(New Material(0, "***", 0))
+      ' costruiscoi la lista 
+      Dim i As Integer = 0
+      Dim sName As String = String.Empty
+      For i = 0 To Local_MaterialList.Count - 1
+         sName = Local_MaterialList(i).Name
+         Dim j As Integer = 0
+         For j = 0 To Local_MaterialList(i).SubMaterialList.Count - 1
+            m_Materials.Add(New Material(i + 1, sName & "." & Local_MaterialList(i).SubMaterialList(j).Name, j + 1))
+         Next
+      Next
+      If Not bIsStart Then CurrMat = TempCurrMat
+   End Sub
+
+   Public Function GetMaxThicknessCurrMaterial(sCurMat As String) As Double
+      Dim bFound As Boolean = False
+      Dim dMaxThick As Double = 0
+      ' Leggo valori da file Data e li carico nelle proprietà
+      Dim sFilePath As String = sMachDir & "\" & MACHININGS_DIR & "\" & WATERJETDB_FILE
+      Dim Local_MaterialList = New ObservableCollection(Of EgtWPFLib5.WjMaterial)
+      Local_MaterialList = WaterjetDbWindowVM_OmagCUT.LoadWjMaterials(sFilePath)
+      Dim sItems() As String = sCurMat.Split("."c)
+      If sItems.Count > 1 Then
+         Dim sMat As String = sItems(0)
+         Dim sSubMat As String = sItems(1)
+         For Each ItemMat As EgtWPFLib5.WjMaterial In Local_MaterialList
+            If ItemMat.Name = sMat Then
+               For Each ItemSubMat As EgtWPFLib5.WjSubMaterial In ItemMat.SubMaterialList
+                  If ItemSubMat.Name = sSubMat Then
+                     For Each ItemParam As EgtWPFLib5.WjParam In ItemSubMat.ParamList
+                        Dim dParamThick As Double
+                        StringToDouble(ItemParam.Thickness, dParamThick)
+                        If dParamThick > dMaxThick Then
+                           dMaxThick = dParamThick
+                        End If
+                     Next
+                     bFound = True
+                     Exit For
+                  End If
+                  If bFound Then Exit For
+               Next
+            End If
+            If bFound Then Exit For
+         Next
+      End If
+      ' il valore resituito è già nell'unità corrente del programma -> converto il dato in mm
+      Dim dValmm As Double = 0
+      StringToLen(DoubleToString(dMaxThick, 3), dValmm)
+      Return dValmm
+   End Function
+
+#Region "USERNOTE"
+
+   ' recupero le note UserNote associate alla LAVORAZIONE Machining
+   Friend Function MdbGetCurrMachiningUserNote(Machining As String) As String
+      Dim UserNotes As String = String.Empty
+      ' lavorazione corrente
+      Dim CurrMach As String = String.Empty
+      EgtMdbGetCurrMachiningParam(MCH_MP.NAME, CurrMach)
+      ' Imposto utensile lama corrente
+      If Not String.IsNullOrWhiteSpace(Machining) AndAlso EgtMdbSetCurrMachining(Machining) Then
+         ' leggo nel db corrente della lavorazione questa info
+         EgtMdbGetCurrMachiningParam(MCH_MP.USERNOTES, UserNotes)
+         ' reimposto lavorazione corrente
+         EgtMdbSetCurrMachining(CurrMach)
+      End If
+      Return UserNotes
+   End Function
+
+   ' recupero le note UserNote associate all'UTENSILE Tool
+   Friend Function TdbGetCurrToolUserNote(Tool As String) As String
+      Dim UserNotes As String = String.Empty
+      ' lavorazione corrente
+      Dim CurrTool As String = String.Empty
+      EgtTdbGetCurrToolParam(MCH_TP.NAME, CurrTool)
+      ' Imposto utensile lama corrente
+      If Not String.IsNullOrWhiteSpace(Tool) AndAlso EgtTdbSetCurrTool(Tool) Then
+         ' leggo nel db corrente della lavorazione questa info
+         EgtTdbGetCurrToolParam(MCH_TP.USERNOTES, UserNotes)
+         ' reimposto lavorazione corrente
+         EgtTdbSetCurrTool(CurrTool)
+      End If
+      Return UserNotes
+   End Function
+
+   ' imposta il nuovo valore in UserNote della LAVORAZIONE Machining
+   Friend Sub MdbSetCurrMachiningUserNote(sKeyUserNote As String, sValUserNote As String, Machining As String)
+      ' lavorazione corrente
+      Dim CurrMach As String = String.Empty
+      EgtMdbGetCurrMachiningParam(MCH_MP.NAME, CurrMach)
+      ' Imposto utensile lama corrente
+      If Not String.IsNullOrWhiteSpace(Machining) AndAlso EgtMdbSetCurrMachining(Machining) Then
+         Dim UserNotes As String = String.Empty
+         ' salvo nel db corrente della lavorazione questa info → devo gestire l'inserimento: sovrascrivo NON ESEGUE un APPEND delle info
+         EgtMdbSetCurrMachiningParam(MCH_MP.USERNOTES, AssembUserNote(sKeyUserNote, sValUserNote, Machining))
+         EgtMdbSaveCurrMachining()
+         EgtMdbSave()
+         ' reimposto lavorazione corrente
+         EgtMdbSetCurrMachining(CurrMach)
+      End If
+   End Sub
+
+   ' imposta il nuovo valore in UserNote dell'UTENSILE Tool
+   Friend Sub TdbSetCurrToolUserNote(sKeyUserNote As String, sValUserNote As String, Tool As String)
+      ' lavorazione corrente
+      Dim CurrTool As String = String.Empty
+      EgtTdbGetCurrToolParam(MCH_TP.NAME, CurrTool)
+      ' Imposto utensile lama corrente
+      If Not String.IsNullOrWhiteSpace(Tool) AndAlso EgtTdbSetCurrTool(Tool) Then
+         Dim UserNotes As String = String.Empty
+         ' salvo nel db corrente della lavorazione questa info → devo gestire l'inserimento: sovrascrivo NON ESEGUE un APPEND delle info
+         EgtTdbSetCurrToolParam(MCH_TP.USERNOTES, AssembUserNote(sKeyUserNote, sValUserNote, Tool))
+         EgtTdbSaveCurrTool()
+         EgtTdbSave()
+         ' reimposto lavorazione corrente
+         EgtTdbSetCurrTool(Tool)
+      End If
+   End Sub
+
+   ' separa la le note UserNote della LAVORAZIONE
+   Private Function SplitUserNoteMachinig(Machining As String) As String()
+      Dim sUserNotes As String = MdbGetCurrMachiningUserNote(Machining)
+      If String.IsNullOrEmpty(sUserNotes) Then Return Nothing
+      Dim sItems As String() = sUserNotes.Split(";"c)
+      Return sItems
+   End Function
+
+   ' separa la le note UserNote della LAVORAZIONE
+   Private Function SplitUserNoteTool(Tool As String) As String()
+      Dim sUserNotes As String = TdbGetCurrToolUserNote(Tool)
+      If String.IsNullOrEmpty(sUserNotes) Then Return Nothing
+      Dim sItems As String() = sUserNotes.Split(";"c)
+      Return sItems
+   End Function
+
+   ' recupera il valore della associato alla chiave per la lavorazione oppure utensile (bIsToolNote)
+   Friend Function GetUserNote(sKeyUserNote As String, ByRef sValUserNote As String, sName As String, Optional bIsToolNote As Boolean = True) As Boolean
+      Dim sUserNotesList As String() = Nothing
+      If bIsToolNote Then
+         sUserNotesList = SplitUserNoteTool(sName)
+      Else
+         sUserNotesList = SplitUserNoteMachinig(sName)
+      End If
+      If IsNothing(sUserNotesList) Then Return False
+      For Index As Integer = 0 To sUserNotesList.Count - 1
+         Dim sNote As String() = sUserNotesList(Index).Split("="c)
+         If sNote.Count = 2 AndAlso sNote(0).Trim = sKeyUserNote Then
+            sValUserNote = sNote(1).Trim
+         End If
+      Next
+      Return True
+   End Function
+
+   ' ricostruisce la stringa UserNote da salvare
+   Friend Function AssembUserNote(sKeyUserNote As String, sValUserNote As String, sName As String, Optional bIsToolNote As Boolean = True) As String
+      Dim sUserNotes As String = String.Empty
+      Dim sUserNotesList As String() = Nothing
+      If bIsToolNote Then
+         sUserNotesList = SplitUserNoteTool(sName)
+      Else
+         sUserNotesList = SplitUserNoteMachinig(sName)
+      End If
+      Dim bExists As Boolean = False
+      If Not IsNothing(sUserNotesList) Then
+         For Index As Integer = 0 To sUserNotesList.Count - 1
+            Dim sNote As String() = sUserNotesList(Index).Split("="c)
+            If sNote.Count = 2 AndAlso sNote(0).Trim = sKeyUserNote Then
+               sUserNotesList(Index) = sKeyUserNote & "=" & sValUserNote
+               bExists = True
+               Exit For
+            End If
+         Next
+         ' riassemblo la stringa
+         For Each Item As String In sUserNotesList
+            If Not String.IsNullOrWhiteSpace(Item) Then
+               sUserNotes &= Item & ";"
+            End If
+         Next
+      End If
+      If Not bExists Then
+         sUserNotes &= sKeyUserNote & "=" & sValUserNote & ";"
+      End If
+      Return sUserNotes
+   End Function
+
+#End Region    ' USERNOTE
+
    Friend Function IsVacuumMovePossible() As Boolean
       ' Recupero diametro lama corrente
       EgtTdbSetCurrTool(sCurrSaw)
@@ -1254,7 +1662,9 @@ Public Class CurrentMachine
       Dim dToolDiam As Double = 0
       EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam)
       ' Confronto con massimo ammesso
-      Return (dToolDiam <= dMaxSawDiamForProbe)
+      Dim bOk As Boolean = dToolDiam <= dMaxSawDiamForProbe
+      If Not bOk Then EgtOutLog("WARNING: Saw diameter to big for probing")
+      Return bOk
    End Function
 
    Friend Function GetPrivateProfileMaterial(
@@ -1333,6 +1743,7 @@ Friend Class Material
 
    Private m_nId As Integer
    Private m_sName As String
+   Private m_SubId As Integer = 0
 
    Public ReadOnly Property nId As Integer
       Get
@@ -1349,6 +1760,15 @@ Friend Class Material
       End Set
    End Property
 
+   Public Property SubId As Integer
+      Get
+         Return m_SubId
+      End Get
+      Set(value As Integer)
+         m_SubId = value
+      End Set
+   End Property
+
    Sub New(sName As String, MaterialList As ObservableCollection(Of Material))
       Dim nMaxId As Integer = 0
       For Each Material As Material In MaterialList
@@ -1365,4 +1785,11 @@ Friend Class Material
       m_sName = sName
    End Sub
 
+   Sub New(nId As Integer, sName As String, nSubId As Integer)
+      m_nId = nId
+      m_sName = sName
+      m_SubId = nSubId
+   End Sub
+
 End Class
+

Machine/ImportExportMachiningWindowWD.xaml

@@ -0,0 +1,139 @@
+<Window  x:Class="ImportExportMachiningWindowWD"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   FontFamily="{DynamicResource OmagCut_Font}"
+   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+   Title="SaveNameWD" Height="350" Width="426.5" ShowInTaskbar="False">
+    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
+    <Border Style="{DynamicResource OmagCut_Border}">
+
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="7*"/>
+                <RowDefinition Height="2*"/>
+            </Grid.RowDefinitions>
+            
+            <ScrollViewer Grid.Row="0"  Margin="20">
+                <TreeView ItemsSource="{Binding FamilyList}" Background="{DynamicResource OmagCut_TreeViewBackGroundColor}">
+                    <TreeView.Resources>
+                        <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:ImpExpMachiningFamily}" ItemsSource="{Binding MachiningList}">
+            
+                            <Grid Height="20">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="1*"/>
+                                </Grid.ColumnDefinitions>
+            
+                                <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
+                                <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+            
+                            </Grid>
+            
+                            <!-- multibinding quando sono attivi.-->
+                            <HierarchicalDataTemplate.ItemContainerStyle>
+                                <Style TargetType="{x:Type TreeViewItem}" >
+                                    <Setter Property="Foreground" Value="{DynamicResource OmagCut_TreeViewTextColor}" />
+                                    <Setter Property="IsSelected" Value="{Binding IsSelected}" />
+                                    <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                                                <Grid>
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition MinWidth="19" Width="Auto"/>
+                                                        <ColumnDefinition Width="Auto"/>
+                                                        <ColumnDefinition Width="*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <Grid.RowDefinitions>
+                                                        <RowDefinition Height="Auto"/>
+                                                        <RowDefinition/>
+                                                    </Grid.RowDefinitions>
+                                                    <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
+                                                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                                                        <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                                    </Border>
+                                                    <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
+                                                    <Rectangle Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Top" Fill="{DynamicResource OmagCut_TreeViewDelimiterColor}" Height="1" />
+                                                </Grid>
+                                                <ControlTemplate.Triggers>
+                                                    <Trigger Property="IsExpanded" Value="false">
+                                                        <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                                                    </Trigger>
+                                                    <Trigger Property="HasItems" Value="false">
+                                                        <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                                                    </Trigger>
+                                                    <Trigger Property="IsSelected" Value="true">
+                                                        <Setter Property="Background" TargetName="Bd" Value="{DynamicResource OmagCut_TreeViewSelectedItemBackground}" />
+                                                        <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource OmagCut_TreeViewSelectedItemBorder}"/>
+                                                        <Setter Property="BorderThickness" TargetName="Bd" Value="1"/>
+                                                        <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
+                                                    </Trigger>
+                                                    <!--<MultiTrigger>
+                                           <MultiTrigger.Conditions>
+                                              <Condition Property="IsSelected" Value="true"/>
+                                              <Condition Property="IsSelectionActive" Value="false"/>
+                                           </MultiTrigger.Conditions>
+                                           <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                                           <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+                                        </MultiTrigger>-->
+                                                    <Trigger Property="IsEnabled" Value="false">
+                                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                                                    </Trigger>
+                                                </ControlTemplate.Triggers>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </HierarchicalDataTemplate.ItemContainerStyle>
+                        </HierarchicalDataTemplate>
+            
+                        <DataTemplate DataType="{x:Type EgtWPFLib5:ImpExpMachiningItem}">
+                            <Grid Height="20">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="1*"/>
+                                </Grid.ColumnDefinitions>
+            
+                                <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                                <CheckBox Name="ActiveTxBx" Grid.Column="0" Height="15" Width="15" 
+                                          Margin="-15,0,5,0" VerticalContentAlignment="Center"
+                                          IsChecked="{Binding Active}"
+                                          Visibility="{Binding Path=DataContext.Active_Visibility,
+                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                                <TextBlock Grid.Column="1" Text="{Binding Name}" 
+                                           Style="{StaticResource OmagCut_ListBoxTextBlock}"   />
+            
+                            </Grid>
+                        </DataTemplate>
+            
+                    </TreeView.Resources>
+                </TreeView>
+            </ScrollViewer>
+            
+            <Grid Grid.Column="1" Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+            
+                <Button Name="OkBtn" Grid.Row="0"  Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" 
+                            Margin="5,-10,5,15"
+                            Command="{Binding OkCommand}">
+                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <Button Name="ExitBtn" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" 
+                            Margin="5,-10,5,15"
+                            IsCancel="True">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+            </Grid>
+    </Grid>
+
+    </Border>
+
+</Window>

Machine/ImportExportMachiningWindowWD.xaml.vb

@@ -0,0 +1,33 @@
+Imports EgtWPFLib5
+Public Class ImportExportMachiningWindowWD
+
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   Private WithEvents m_ImportExportMachiningWindowVM As ImportExportMachiningWindowVM
+
+   Private m_OkResult As Boolean = False
+   Public ReadOnly Property OkResult As Boolean
+      Get
+         Return m_OkResult
+      End Get
+   End Property
+
+   Sub New(Owner As Window, ImportExportToolWindowVM As ImportExportMachiningWindowVM)
+      Me.Owner = Owner
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = ImportExportToolWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_ImportExportMachiningWindowVM = ImportExportToolWindowVM
+   End Sub
+   Private Sub OkCloseDialogWD() Handles OkBtn.Click
+      m_OkResult = True
+      Me.Close()
+   End Sub
+
+   Private Sub CancelCloseDialogWD() Handles ExitBtn.Click
+      m_OkResult = False
+      Me.Close()
+   End Sub
+
+End Class

Machine/ImportExportToolWD.xaml.vb

@@ -5,6 +5,13 @@ Public Class ImportExportToolWD
 
    Private WithEvents m_ImportExportToolWindowVM As ImportExportToolWindowVM
 
+   Private m_OkResult As Boolean = False
+   Public ReadOnly Property OkResult As Boolean
+      Get
+         Return m_OkResult
+      End Get
+   End Property
+
    Sub New(Owner As Window, ImportExportToolWindowVM As ImportExportToolWindowVM)
       Me.Owner = Owner
       ' This call is required by the designer.
@@ -17,4 +24,15 @@ Public Class ImportExportToolWD
    'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ImportExportToolWindowVM.m_CloseWindow
    '   Me.DialogResult = bDialogResult
    'End Sub
+
+   Private Sub OkCloseDialogWD() Handles OkBtn.Click
+      m_OkResult = True
+      Me.Close()
+   End Sub
+
+   Private Sub CancelCloseDialogWD() Handles ExitBtn.Click
+      m_OkResult = False
+      Me.Close()
+   End Sub
+
 End Class

Machine/MachineCNPageUC.xaml

@@ -7,105 +7,123 @@
    mc:Ignorable="d" 
    d:DesignHeight="768" d:DesignWidth="1280">
 
-   <!-- Definizione della ImportPage -->
-   <Border Background="{DynamicResource OmagCut_Gray}" >
+    <!-- Definizione della ImportPage -->
+    <Border Background="{DynamicResource OmagCut_Gray}" >
 
-      <Grid Name="ImportPageGrid">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="7.5*"/>
-            <ColumnDefinition Width="1.5*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="5*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="4.5*"/>
-         </Grid.RowDefinitions>
+        <Grid Name="ImportPageGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="7.5*"/>
+                <ColumnDefinition Width="1.5*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="4.5*"/>
+            </Grid.RowDefinitions>
 
-         <GroupBox Name="CNModeGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.ColumnSpan="2" Margin="0,0,4,0">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="1.5*"/>
-                  <ColumnDefinition Width="1.5*"/>
-               </Grid.ColumnDefinitions>
+            <GroupBox Name="CNModeGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.ColumnSpan="2" Margin="0,0,4,0">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                    </Grid.ColumnDefinitions>
 
-               <Button Name="AutoBtn" Grid.Column="0"
-                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="ManualBtn" Grid.Column="1"
-                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="MDIBtn" Grid.Column="2"
-                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="SingleBtn" Grid.Column="3"
-                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="HomeBtn" Grid.Column="4"
-                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+                    <ToggleButton Name="AutoBtn" Grid.Column="0"
+                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                  Foreground="White"/>
+                    <ToggleButton Name="ManualBtn" Grid.Column="1"
+                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                  Foreground="White"/>
+                    <ToggleButton Name="MDIBtn" Grid.Column="2"
+                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                  Foreground="White"/>
+                    <ToggleButton Name="SingleBtn" Grid.Column="3"
+                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                  Foreground="White"/>
+                    <ToggleButton Name="HomeBtn" Grid.Column="4"
+                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                  Foreground="White"/>
 
-            </Grid>
+                </Grid>
 
-         </GroupBox>
+            </GroupBox>
 
-         <GroupBox Name="CommandsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.ColumnSpan="2">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-               </Grid.ColumnDefinitions>
+            <GroupBox Name="CommandsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.ColumnSpan="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
                     <Button Name="StartBtn" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="StopBtn" Grid.Column="1"
+                    <Button Name="StopBtn" Grid.Column="1"
                   Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="ResetBtn" Grid.Column="2"
+                    <Button Name="ResetBtn" Grid.Column="2"
                   Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
 
-            </Grid>
+                </Grid>
 
-         </GroupBox>
+            </GroupBox>
 
             <GroupBox Name="MDICommandGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="1">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="6*"/>
-                  <ColumnDefinition Width="1.5*"/>
-               </Grid.ColumnDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="6*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                    </Grid.ColumnDefinitions>
 
                     <EgtWPFLib:EgtTextBox Name="MDITxBx" Margin="10,0,10,0" Style="{DynamicResource OmagCut_MDIKeyboardTextBox}"/>
-               <Button Name="MDIConfirmBtn" Grid.Column="1" 
+                    <Button Name="MDIConfirmBtn" Grid.Column="1" 
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
 
-            </Grid>
+                </Grid>
 
-         </GroupBox>
+            </GroupBox>
 
-         <GroupBox Name="PartProgTransferGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
+            <GroupBox Name="CameraHQ" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                    <ToggleButton Name="CameraHQBtn" Grid.Column="2"
+                                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                                  Foreground="White"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Name="PartProgTransferGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
             Grid.ColumnSpan="3">
-            <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-            </Grid.ColumnDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-               <Button Name="DownloadBtn" Grid.Column="0"
+                    <Button Name="DownloadBtn" Grid.Column="0"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="UploadBtn" Grid.Column="1"
+                    <Button Name="UploadBtn" Grid.Column="1"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="ActivateBtn" Grid.Column="2"
+                    <Button Name="ActivateBtn" Grid.Column="2"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="DeleteBtn" Grid.Column="3"
+                    <Button Name="DeleteBtn" Grid.Column="3"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <EgtWPFLib:EgtTextBox Name="DULoadTxBx" Grid.Column="4" Width="100" Text="900.0"
+                    <EgtWPFLib:EgtTextBox Name="DULoadTxBx" Grid.Column="4" Width="100" Text="900.0"
                   Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
-            </Grid>
-         </GroupBox>
+                </Grid>
+            </GroupBox>
 
             <GroupBox Name="PowerGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
             Grid.Column="3" Grid.ColumnSpan="3" Margin="5,0,0,0">
@@ -126,18 +144,18 @@
             </GroupBox>
 
             <GroupBox Name="ErrorLstGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="3" Grid.ColumnSpan="4">
-            <ListBox Name="ErrorLstBx">
-               <ListBox.ItemTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                  </DataTemplate>
-               </ListBox.ItemTemplate>
-            </ListBox>
+                <ListBox Name="ErrorLstBx">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
 
-         </GroupBox>
+            </GroupBox>
 
-      </Grid>
+        </Grid>
 
-   </Border>
+    </Border>
 
 </UserControl>

Machine/MachineCNPageUC.xaml.vb

@@ -8,6 +8,8 @@ Public Class MachineCNPageUC
    Private m_bFirst As Boolean = True
    Private m_ButtonPower As New List(Of MachineButton)
 
+   Private m_nCurrMode As Integer = 0
+
    Private Sub TestingPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       StartBtn.Content = EgtMsg(MSG_MACHINECNPAGEUC + 1)
       StopBtn.Content = EgtMsg(MSG_MACHINECNPAGEUC + 2)
@@ -27,6 +29,7 @@ Public Class MachineCNPageUC
       MDICommandGpBx.Header = EgtMsg(MSG_MACHINECNPAGEUC + 16)
       PartProgTransferGpBx.Header = EgtMsg(MSG_MACHINECNPAGEUC + 17)
       ErrorLstGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 12)
+
       ' Attivo gruppo PartProgTransferGpBx leggendo la variabile nel file ini
       If GetPrivateProfileInt(S_GENERAL, K_TESTINGPAGE, 0, m_MainWindow.GetIniFile()) = 1 Then
          PartProgTransferGpBx.Visibility = Windows.Visibility.Visible
@@ -42,6 +45,28 @@ Public Class MachineCNPageUC
       Else
          PowerGpBx.Visibility = Visibility.Collapsed
       End If
+
+      ' verifico che sia attiva la modalità per l'uso di due fotocamere
+      If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ENABLE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
+         CameraHQ.Visibility = Visibility.Visible
+         CameraHQ.Header = "Photo on table"
+         CameraHQBtn.Content = "HQ"
+         ' verifico quale camera è impostata
+         If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
+            CameraHQBtn.IsChecked = True
+            If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+               m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1HQ.png", UriKind.Relative))
+            End If
+         Else
+            CameraHQBtn.IsChecked = False
+            If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+               m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1.png", UriKind.Relative))
+            End If
+         End If
+      Else
+         CameraHQ.Visibility = Visibility.Collapsed
+      End If
+
    End Sub
 
    Private Sub TestingPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -51,6 +76,9 @@ Public Class MachineCNPageUC
          PartProgTransferGpBx.Visibility = Windows.Visibility.Hidden
       End If
 
+      ' gestione visuliazzazione ToggleButton Auto/Sinlge/Mdi/Manula/Home
+      SetCncMode()
+
       '------ NUOVI BOTTONI ----------
       ' Lettura configurazione bottoni (per impostare l'uso del Joystick) da Ini di macchina
       m_ButtonPower.Clear()
@@ -98,6 +126,53 @@ Public Class MachineCNPageUC
 
    End Sub
 
+   Private Sub SetCncMode()
+      Dim Mode As Integer = m_nCurrMode
+      Select Case Mode
+         Case 0
+            ' Auoto
+            MDIConfirmBtn.IsEnabled = False
+            AutoBtn.IsChecked = True
+            SingleBtn.IsChecked = False
+            MDIBtn.IsChecked = False
+            ManualBtn.IsChecked = False
+            HomeBtn.IsChecked = False
+         Case 1
+            ' Single
+            MDIConfirmBtn.IsEnabled = False
+            AutoBtn.IsChecked = False
+            SingleBtn.IsChecked = True
+            MDIBtn.IsChecked = False
+            ManualBtn.IsChecked = False
+            HomeBtn.IsChecked = False
+         Case 2
+            ' Mdi
+            MDIConfirmBtn.IsEnabled = True
+            AutoBtn.IsChecked = False
+            SingleBtn.IsChecked = False
+            MDIBtn.IsChecked = True
+            ManualBtn.IsChecked = False
+            HomeBtn.IsChecked = False
+         Case 7
+            ' Manual
+            MDIConfirmBtn.IsEnabled = False
+            AutoBtn.IsChecked = False
+            SingleBtn.IsChecked = False
+            MDIBtn.IsChecked = False
+            ManualBtn.IsChecked = True
+            HomeBtn.IsChecked = False
+         Case 8
+            ' Home
+            MDIConfirmBtn.IsEnabled = False
+            AutoBtn.IsChecked = False
+            SingleBtn.IsChecked = False
+            MDIBtn.IsChecked = False
+            ManualBtn.IsChecked = False
+            HomeBtn.IsChecked = True
+      End Select
+
+   End Sub
+
    Private Sub StartBtn_Click(sender As Object, e As RoutedEventArgs) Handles StartBtn.Click
       If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
          Dim sDBVarPath As String = ""
@@ -151,6 +226,20 @@ Public Class MachineCNPageUC
       m_CN.DGeneralFunctions_WriteCncMode(8)
    End Sub
 
+   Private Sub CameraHQBtn_Click(sender As Object, e As RoutedEventArgs) Handles CameraHQBtn.Click
+      Dim sEnableHQ As String = If(CameraHQBtn.IsChecked, "1", "0")
+      WritePrivateProfileString(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, sEnableHQ, m_MainWindow.GetMachIniFile())
+      If CameraHQBtn.IsChecked Then
+         If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+            m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1HQ.png", UriKind.Relative))
+         End If
+      Else
+         If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+            m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1.png", UriKind.Relative))
+         End If
+      End If
+   End Sub
+
    Private Sub MDITxBx_KeyDown(sender As Object, e As KeyEventArgs) Handles MDITxBx.KeyDown
       If e.Key = Key.Return Then
          ' leggo se stato reset
@@ -278,4 +367,9 @@ Public Class MachineCNPageUC
       End If
    End Sub
 
+   Friend Sub CncModeChange(nMode As Integer)
+      m_nCurrMode = nMode
+      SetCncMode()
+   End Sub
+
 End Class

Machine/MachinePageUC.xaml

@@ -24,9 +24,10 @@
                <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
                 <ToggleButton Name="AlarmsBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
@@ -41,10 +42,13 @@
                 <ToggleButton Name="PolishingsBtn" Grid.Column="3" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
                     <!--<Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
                 </ToggleButton>
-                <ToggleButton Name="TestingPageBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                <ToggleButton Name="WaterJetBtn" Grid.Column="4" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
+                    <!--<Image Source="{DynamicResource WaterJetImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
+                </ToggleButton>
+                <ToggleButton Name="TestingPageBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
                     <Image Source="{DynamicResource MacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                 </ToggleButton>
-                <ToggleButton Name="StatisticsBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}">
+                <ToggleButton Name="StatisticsBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowToggleButton}">
                     
                 </ToggleButton>
 

Machine/MachinePageUC.xaml.vb

@@ -10,6 +10,7 @@ Public Class MachinePageUC
    Friend m_ToolsDbPageUC As ToolsDbPageUC
    Friend m_MachiningDbPageUC As MachiningDbPageUC
    Friend m_PolishingsPageUC As PolishingsPageUC
+   Friend m_WaterJetPageUC As WaterJetPageUC
    Friend m_MachineCNPageUC As MachineCNPageUC
    Friend m_StatisticsPageUC As StatisticsPageUC
 
@@ -21,6 +22,7 @@ Public Class MachinePageUC
       ToolsDb
       MachiningDb
       Polishings
+      WaterJet
       MachineCN
       Statistics
    End Enum
@@ -32,6 +34,7 @@ Public Class MachinePageUC
       m_ToolsDbPageUC = New ToolsDbPageUC
       m_MachiningDbPageUC = New MachiningDbPageUC
       m_PolishingsPageUC = New PolishingsPageUC
+      m_WaterJetPageUC = New WaterJetPageUC
       m_MachineCNPageUC = New MachineCNPageUC
       m_StatisticsPageUC = New StatisticsPageUC
 
@@ -40,6 +43,7 @@ Public Class MachinePageUC
       m_ToolsDbPageUC.SetValue(Grid.RowProperty, 1)
       m_MachiningDbPageUC.SetValue(Grid.RowProperty, 1)
       m_PolishingsPageUC.SetValue(Grid.RowProperty, 1)
+      m_WaterJetPageUC.SetValue(Grid.RowProperty, 1)
       m_MachineCNPageUC.SetValue(Grid.RowProperty, 1)
       m_StatisticsPageUC.SetValue(Grid.RowProperty, 1)
 
@@ -47,6 +51,7 @@ Public Class MachinePageUC
       ToolsDBBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 6)
       MachiningDBBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 7)
       PolishingsBtn.Content = EgtMsg(91090)
+      WaterJetBtn.Content = EgtMsg(91128)
       TestingPageBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 8)
       StatisticsBtn.Content = EgtMsg(90709)
 
@@ -55,10 +60,14 @@ Public Class MachinePageUC
       m_ActiveMachinePage = MachinePages.Alarms
 
       ' Se lucidature non abilitate, disattivo la pagina DB lucidature
-      If Not m_MainWindow.m_CurrentMachine.bPolishing  Then
+      If Not m_MainWindow.m_CurrentMachine.bPolishing Then
          PolishingsBtn.IsEnabled = False
       End If
 
+      If Not m_MainWindow.m_CurrentMachine.bWaterJet Or Not m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
+         WaterJetBtn.IsEnabled = False
+      End If
+
       ' Se controllo numerico 0, disattivo la pagina macchina
       If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
          TestingPageBtn.IsEnabled = False
@@ -134,6 +143,22 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_AlarmsPageUC)
             m_ActiveMachinePage = MachinePages.Alarms
+         Case MachinePages.WaterJet
+            ' Verifica ed eventuale salvataggio Db Waterjet
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
+               AlarmsBtn.IsChecked = False
+               WaterJetBtn.IsChecked = True
+               Return
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
+            ' passo alla pagina Dati Macchina
+            AlarmsBtn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_AlarmsPageUC)
+            m_ActiveMachinePage = MachinePages.Alarms
          Case MachinePages.MachineCN
             AlarmsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -188,6 +213,22 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_ToolsDbPageUC)
             m_ActiveMachinePage = MachinePages.ToolsDb
+         Case MachinePages.WaterJet
+            'Verifica ed eventuale salvataggio Db Waterjet
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
+               ToolsDBBtn.IsChecked = False
+               WaterJetBtn.IsChecked = True
+               Return
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
+            ' passo alla pagina Dati Macchina
+            ToolsDBBtn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_ToolsDbPageUC)
+            m_ActiveMachinePage = MachinePages.ToolsDb
          Case MachinePages.MachineCN
             ToolsDBBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -242,6 +283,22 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_MachiningDbPageUC)
             m_ActiveMachinePage = MachinePages.MachiningDb
+         Case MachinePages.WaterJet
+            ' Verifica ed eventuale salvataggio Db Waterjet
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
+               MachiningDBBtn.IsChecked = False
+               WaterJetBtn.IsChecked = True
+               Return
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
+            ' passo alla pagina Dati Macchina
+            MachiningDBBtn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_MachiningDbPageUC)
+            m_ActiveMachinePage = MachinePages.MachiningDb
          Case MachinePages.MachineCN
             MachiningDBBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -299,6 +356,22 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.Polishings
          Case MachinePages.Polishings
             PolishingsBtn.IsChecked = True
+         Case MachinePages.WaterJet
+            ' Verifica ed eventuale salvataggio Db Waterjet
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
+               PolishingsBtn.IsChecked = False
+               WaterJetBtn.IsChecked = True
+               Return
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
+            ' passo alla pagina Dati Macchina
+            PolishingsBtn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_PolishingsPageUC)
+            m_ActiveMachinePage = MachinePages.Polishings
          Case MachinePages.MachineCN
             PolishingsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -314,6 +387,77 @@ Public Class MachinePageUC
       End Select
    End Sub
 
+   Private Sub WaterJetBtn_Click(sender As Object, e As RoutedEventArgs) Handles WaterJetBtn.Click
+      Select Case m_ActiveMachinePage
+         Case MachinePages.Alarms
+            AlarmsBtn.IsChecked = False
+            WaterJetBtn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_AlarmsPageUC)
+            MachinePageGrid.Children.Add(m_WaterJetPageUC)
+            m_ActiveMachinePage = MachinePages.WaterJet
+            'DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM).RefreshDImensionPage()
+         Case MachinePages.ToolsDb
+            ' Verifica ed eventuale salvataggio utensile corrente
+            If Not m_ToolsDbPageUC.SaveCurrTool() Then
+               PolishingsBtn.IsChecked = False
+               ToolsDBBtn.IsChecked = True
+               Return
+            End If
+            ' salvo il DB utensili
+            EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+            EgtTdbSave()
+            ' passo alla pagina WaterJet
+            WaterJetBtn.IsChecked = True
+            ToolsDBBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_ToolsDbPageUC)
+            MachinePageGrid.Children.Add(m_WaterJetPageUC)
+            m_ActiveMachinePage = MachinePages.WaterJet
+         Case MachinePages.MachiningDb
+            ' Verifica ed eventuale salvataggio lavorazione corrente
+            If Not m_MachiningDbPageUC.SaveCurrMachining() Then
+               WaterJetBtn.IsChecked = False
+               MachiningDBBtn.IsChecked = True
+               Return
+            End If
+            ' salvo il DB lavorazioni
+            EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+            EgtMdbSave()
+            ' passo alla pagina WaterJet
+            WaterJetBtn.IsChecked = True
+            MachiningDBBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
+            MachinePageGrid.Children.Add(m_WaterJetPageUC)
+            m_ActiveMachinePage = MachinePages.WaterJet
+         Case MachinePages.Polishings
+            ' Verifica ed eventuale salvataggio Lucidatura corrente
+            If Not m_PolishingsPageUC.SaveKit() Then
+               WaterJetBtn.IsChecked = False
+               PolishingsBtn.IsChecked = True
+               Return
+            End If
+            ' passo alla pagina WaterJet
+            WaterJetBtn.IsChecked = True
+            PolishingsBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_PolishingsPageUC)
+            MachinePageGrid.Children.Add(m_WaterJetPageUC)
+            m_ActiveMachinePage = MachinePages.WaterJet
+         Case MachinePages.WaterJet
+            WaterJetBtn.IsChecked = True
+         Case MachinePages.MachineCN
+            WaterJetBtn.IsChecked = True
+            TestingPageBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_MachineCNPageUC)
+            MachinePageGrid.Children.Add(m_WaterJetPageUC)
+            m_ActiveMachinePage = MachinePages.WaterJet
+         Case MachinePages.Statistics
+            WaterJetBtn.IsChecked = True
+            StatisticsBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_StatisticsPageUC)
+            MachinePageGrid.Children.Add(m_WaterJetPageUC)
+            m_ActiveMachinePage = MachinePages.WaterJet
+      End Select
+   End Sub
+
    Private Sub TestingPageBtn_Checked(sender As Object, e As RoutedEventArgs) Handles TestingPageBtn.Checked
       Select Case m_ActiveMachinePage
          Case MachinePages.Alarms
@@ -367,6 +511,22 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_MachineCNPageUC)
             m_ActiveMachinePage = MachinePages.MachineCN
+         Case MachinePages.WaterJet
+            ' Verifica ed eventuale salvataggio Db Waterjet
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
+               TestingPageBtn.IsChecked = False
+               WaterJetBtn.IsChecked = True
+               Return
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
+            ' passo alla pagina Dati Macchina
+            TestingPageBtn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_MachineCNPageUC)
+            m_ActiveMachinePage = MachinePages.MachineCN
          Case MachinePages.MachineCN
             TestingPageBtn.IsChecked = True
          Case MachinePages.Statistics
@@ -431,6 +591,22 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_StatisticsPageUC)
             m_ActiveMachinePage = MachinePages.Statistics
+         Case MachinePages.WaterJet
+            ' Verifica ed eventuale salvataggio Db Waterjet
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
+               StatisticsBtn.IsChecked = False
+               WaterJetBtn.IsChecked = True
+               Return
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
+            ' passo alla pagina Dati Macchina
+            TestingPageBtn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_StatisticsPageUC)
+            m_ActiveMachinePage = MachinePages.Statistics
          Case MachinePages.MachineCN
             StatisticsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -467,6 +643,19 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_AlarmsPageUC)
             m_ActiveMachinePage = MachinePages.Alarms
+         Case MachinePages.WaterJet
+            ' Verifica ed eventuale salvataggio Lucidatura corrente
+            'If Not m_PolishingsPageUC.SaveKit() Then
+            '   AlarmsBtn.IsChecked = False
+            '   PolishingsBtn.IsChecked = True
+            '   Return
+            'End If
+            ' passo alla pagina Dati Macchina
+            AlarmsBtn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_AlarmsPageUC)
+            m_ActiveMachinePage = MachinePages.Alarms
          Case MachinePages.MachineCN
             AlarmsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False

Machine/MachineStatusUC.xaml.vb

@@ -248,16 +248,16 @@ Public Class MachineStatusUC
          dL3 = ptTip.z
       End If
       ' Visualizzazione
-      Axis1TxBx.Text = LenToString(dL1, -3)
-      Axis2TxBx.Text = LenToString(dL2, -3)
-      Axis3TxBx.Text = LenToString(dL3, -3)
+      Axis1TxBx.Text = LenToString(dL1, -3, True)
+      Axis2TxBx.Text = LenToString(dL2, -3, True)
+      Axis3TxBx.Text = LenToString(dL3, -3, True)
       Axis4TxBx.Text = DoubleToString(dR1, -3)
       Axis5TxBx.Text = DoubleToString(dR2, -3)
       If m_AxesNumber >= 6 Then Axis6TxBx.Text = DoubleToString(dA6, -3)
-      If m_AxesNumber >= 7 Then Axis7TxBx.Text = LenToString(dA7, -3)
-      If m_AxesNumber >= 8 Then Axis8TxBx.Text = LenToString(dA8, -3)
-      If m_AxesNumber >= 9 Then Axis9TxBx.Text = LenToString(dA9, -3)
-      If m_AxesNumber >= 10 Then Axis10TxBx.Text = LenToString(dA10, -3)
+      If m_AxesNumber >= 7 Then Axis7TxBx.Text = LenToString(dA7, -3, True)
+      If m_AxesNumber >= 8 Then Axis8TxBx.Text = LenToString(dA8, -3, True)
+      If m_AxesNumber >= 9 Then Axis9TxBx.Text = LenToString(dA9, -3, True)
+      If m_AxesNumber >= 10 Then Axis10TxBx.Text = LenToString(dA10, -3, True)
    End Sub
 
    Sub DisplayPositionDelta()
@@ -265,22 +265,28 @@ Public Class MachineStatusUC
       Dim dL1, dL2, dL3, dR1, dR2, dA6, dA7, dA8, dA9, dA10 As Double
       m_MainWindow.m_CNCommunication.GetAxesDeltas(dL1, dL2, dL3, dR1, dR2, dA6, dA7, dA8, dA9, dA10)
       ' Visualizzazione
-      DeltaAxis1TxBx.Text = LenToString(dL1, -3)
-      DeltaAxis2TxBx.Text = LenToString(dL2, -3)
-      DeltaAxis3TxBx.Text = LenToString(dL3, -3)
+      DeltaAxis1TxBx.Text = LenToString(dL1, -3, True)
+      DeltaAxis2TxBx.Text = LenToString(dL2, -3, True)
+      DeltaAxis3TxBx.Text = LenToString(dL3, -3, True)
       DeltaAxis4TxBx.Text = DoubleToString(dR1, -3)
       DeltaAxis5TxBx.Text = DoubleToString(dR2, -3)
       If m_AxesNumber >= 6 Then DeltaAxis6TxBx.Text = DoubleToString(dA6, -3)
-      If m_AxesNumber >= 7 Then DeltaAxis7TxBx.Text = LenToString(dA7, -3)
-      If m_AxesNumber >= 8 Then DeltaAxis8TxBx.Text = LenToString(dA8, -3)
-      If m_AxesNumber >= 9 Then DeltaAxis9TxBx.Text = LenToString(dA9, -3)
-      If m_AxesNumber >= 10 Then DeltaAxis10TxBx.Text = LenToString(dA10, -3)
+      If m_AxesNumber >= 7 Then DeltaAxis7TxBx.Text = LenToString(dA7, -3, True)
+      If m_AxesNumber >= 8 Then DeltaAxis8TxBx.Text = LenToString(dA8, -3, True)
+      If m_AxesNumber >= 9 Then DeltaAxis9TxBx.Text = LenToString(dA9, -3, True)
+      If m_AxesNumber >= 10 Then DeltaAxis10TxBx.Text = LenToString(dA10, -3, True)
    End Sub
 
    Sub DisplayFeed()
       Dim dRealFeed As Double = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
+      ' modifica richiesta 26/05/2023 da Rosario per cliente Lanzetta
+      If m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         dRealFeed = m_CN.d_DInterpo_Prog_Feed
+      Else
+         dRealFeed = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
+      End If
       'Feed = DoubleToString(dRealFeed, 0)
-      FeedTxBx.Text = LenToString(dRealFeed, 0)
+      FeedTxBx.Text = LenToString(dRealFeed, 0, True)
       'FeedOverride = DoubleToString(m_CN.d_DInterpo_Feed_override, 0) & "%"
       Dim dFeedOverride As Double = m_CN.d_DInterpo_Feed_override
       FeedOverrideTxBx.Text = DoubleToString(dFeedOverride, 0) & "%"
@@ -302,8 +308,18 @@ Public Class MachineStatusUC
       Dim dSpindleOvr As Double
       ' se attivi nuovi comandi MDI su siemens
       If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
-         dSpindlePower = m_CN.d_data(0)
-         dSpindleOvr = m_CN.d_data(1)
+
+         If m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
+            dSpindlePower = m_CN.d_spindle_power
+            'dSpindleOvr = If(m_CN.bPowerOvr > 0, m_CN.d_spindle_power / m_CN.bPowerOvr * 100, 0)
+            dSpindleOvr = m_CN.bPowerOvr
+         Else
+            ' questo sistema è deprecabile dalla versione 2.6d2 (nuova gestione dei vettori)
+            dSpindlePower = m_CN.d_data(0)
+            dSpindleOvr = m_CN.d_data(1)
+         End If
+      ElseIf m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         dSpindlePower = m_CN.d_spindle_power / 1000
       Else
          dSpindlePower = m_CN.d_spindle_power
          dSpindleOvr = If(m_CN.bPowerOvr > 0, m_CN.d_spindle_power / m_CN.bPowerOvr * 100, 0)

Machine/MachiningDbPageUC.xaml

@@ -246,7 +246,7 @@
 
             <TextBlock Name="SideAngleTxBl" Grid.Column="2" Grid.Row="3" Grid.RowSpan="3"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="3" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,15,0"
+            <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="3" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,15,0" IsLength="False"
                Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
             <TextBlock Name="StepTypeTxBl" Grid.Column="0" Grid.Row="6" Grid.RowSpan="3"
@@ -576,7 +576,7 @@
 
                 <TextBlock Name="ForwardAngleTxBl" Grid.Column="0" Grid.Row="6" Grid.RowSpan="3"
                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="ForwardAngleTxBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3"
+                <EgtWPFLib:EgtTextBox Name="ForwardAngleTxBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3" IsLength="False"
                      Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
                 <Border Name="LiHoleBrd" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="6"
@@ -605,12 +605,12 @@
 
                         <TextBlock Name="LpTurnsTxBl" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" 
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="LpTurnsTxBx" Grid.Column="1" Grid.Row="1"
+                        <EgtWPFLib:EgtTextBox Name="LpTurnsTxBx" Grid.Column="1" Grid.Row="1" IsLength="False"
                              Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
                         <TextBlock Name="HpTurnsTxBl" Grid.Column="2" Grid.Row="1"
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="HpTurnsTxBx" Grid.Column="3" Grid.Row="1"
+                        <EgtWPFLib:EgtTextBox Name="HpTurnsTxBx" Grid.Column="3" Grid.Row="1" IsLength="False"
                              Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
                     </Grid>
@@ -725,7 +725,7 @@
 
                <TextBlock Name="SpeedTxBl" Grid.Column="0"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1"
+               <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" IsLength="False"
                   Style="{DynamicResource OmagCut_MachToolCalculatorTextBox}" />
 
             </Grid>
@@ -931,14 +931,16 @@
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="11*"/>
+               <ColumnDefinition Width="10*"/>
+               <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
                 <Button Name="NewBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
                 <Button Name="SaveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
                 <Button Name="RemoveBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
-
+                <Button Name="ExportBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
+                <Button Name="ImportBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
             </Grid>
 
       </Grid>

Machine/MachiningDbPageUC.xaml.vb

@@ -3,6 +3,7 @@ Imports System.ComponentModel
 Imports OmagCUT.TreeViewItem
 Imports EgtUILib
 Imports EgtWPFLib
+Imports EgtWPFLib5
 
 Public Class MachiningDbPageUC
 
@@ -60,7 +61,7 @@ Public Class MachiningDbPageUC
       StepType = {EgtMsg(MSG_COMBOBOXPARAM + 38), EgtMsg(MSG_COMBOBOXPARAM + 39), EgtMsg(MSG_COMBOBOXPARAM + 40)}
       RouFinStepType = {EgtMsg(MSG_COMBOBOXPARAM + 38), EgtMsg(MSG_COMBOBOXPARAM + 39)}
       ExtCornType = {EgtMsg(MSG_COMBOBOXPARAM + 43), EgtMsg(MSG_COMBOBOXPARAM + 44), EgtMsg(MSG_COMBOBOXPARAM + 45)}
-      IntCornType = {EgtMsg(MSG_COMBOBOXPARAM + 43), EgtMsg(MSG_COMBOBOXPARAM + 44)}
+      IntCornType = {EgtMsg(MSG_COMBOBOXPARAM + 43), EgtMsg(MSG_COMBOBOXPARAM + 44), EgtMsg(90852)}
 
       ' Assegno array a combobox
       WorkSideCmBx.ItemsSource = WorkSide
@@ -78,6 +79,8 @@ Public Class MachiningDbPageUC
       NewBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 16)
       SaveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 17)
       RemoveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 18)
+      ExportBtn.Content = "Export"
+      ImportBtn.Content = "Import"
 
       NameTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 1)
       DepthTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 2)
@@ -205,7 +208,7 @@ Public Class MachiningDbPageUC
       MillTool.Clear()
       bFound = EgtTdbGetFirstTool(MCH_TF.MILL, sToolName, nType)
       While bFound
-         If nType = MCH_TY.MILL_STD Then MillTool.Add( sToolName)
+         If nType = MCH_TY.MILL_STD And sToolName.Trim.ToLower <> "probe" Then MillTool.Add(sToolName)
          bFound = EgtTdbGetNextTool(MCH_TF.MILL, sToolName, nType)
       End While
       PocketTool.Clear()
@@ -321,6 +324,193 @@ Public Class MachiningDbPageUC
       End If
    End Sub
 
+   Private Sub ExportBtn_Click(Sender As Object, e As RoutedEventArgs) Handles ExportBtn.Click
+      ' contesto corrente
+      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+
+      ' creo lista lavorazioni per esportazione
+      Dim MachiningToExportList As New ObservableCollection(Of ImpExpMachiningFamily)
+      Dim Family As CathegoryItem
+      Dim Machining As CustomItem
+      For Each Family In MachiningsList
+         Dim ImpExpMachiningFamily As New ImpExpMachiningFamily(Family.Name, Family.nTType)
+         For Each Machining In Family.Items
+            ImpExpMachiningFamily.MachiningList.Add(New ImpExpMachiningItem(Machining.Name, False))
+         Next
+         MachiningToExportList.Add(ImpExpMachiningFamily)
+      Next
+      Dim ExportWndVM As New ImportExportMachiningWindowVM(MachiningToExportList, true)
+      Dim ExportWnd As New ImportExportMachiningWindowWD(Application.Current.MainWindow, ExportWndVM)
+
+      ExportWnd.ShowDialog()
+   End Sub
+
+   Private Sub ImoportBtn_Click() Handles ImportBtn.Click
+      ' contesto corrente
+      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+      ' apro dialogo di scelta file
+      Dim ImportFileDlg As New Microsoft.Win32.OpenFileDialog() With {
+         .Title = EgtMsg(31161) & " " & EgtMsg(31163),
+         .DefaultExt = ".data",
+         .Filter = "Machinings (.data)|*.data",
+         .CheckFileExists = True,
+         .ValidateNames = True
+      }
+      If ImportFileDlg.ShowDialog() <> True Then Return
+      Dim ImportFilePath As String = ImportFileDlg.FileName
+      ' recupero liste utensili da importare
+      Dim ImportFileMachiningNameList As String() = Nothing
+      Dim ImportFileMachiningFamilyList As Integer() = Nothing
+      If Not EgtMdbToBeImported(ImportFilePath, ImportFileMachiningNameList, ImportFileMachiningFamilyList) Then Return
+      ' li inserisco in lista per finestra di scelta
+      Dim MachinigToImportList As New ObservableCollection(Of ImpExpMachiningFamily)
+      ' creo famiglie di utensili in base a quelle trovate in lista importata
+      For MachiningIndex As Integer = 0 To ImportFileMachiningNameList.Count - 1
+         Dim MachiningName As String = ImportFileMachiningNameList(MachiningIndex)
+         Dim MachiningFamily As Integer = ImportFileMachiningFamilyList(MachiningIndex)
+         MachiningFamily = MachiningFamily And
+            (MCH_MY.DRILLING Or
+            MCH_MY.SAWING Or
+            MCH_MY.MILLING Or
+            MCH_MY.POCKETING Or
+            MCH_MY.MORTISING Or
+            MCH_MY.SAWROUGHING Or
+            MCH_MY.SAWFINISHING Or
+            MCH_MY.GENMACHINING Or
+            MCH_MY.CHISELING Or
+            MCH_MY.SURFROUGHING Or
+            MCH_MY.SURFFINISHING Or
+            MCH_MY.WATERJETTING)
+         Dim bFounded As Boolean = False
+         Dim MachinigToImportFamily As ImpExpMachiningFamily
+         For Each MachinigToImportFamily In MachinigToImportList
+            If (MachiningFamily = MachinigToImportFamily.FamilyType) Then
+               MachinigToImportFamily.MachiningList.Add(New ImpExpMachiningItem(MachiningName, AlreadyExist(MachiningName)))
+               bFounded = True
+               Exit For
+            End If
+         Next
+         If Not bFounded Then
+            Dim NewFamily As New ImpExpMachiningFamily(GetMachiningFamilyName(MachiningFamily), MachiningFamily)
+            NewFamily.MachiningList.Add(New ImpExpMachiningItem(MachiningName, AlreadyExist(MachiningName)))
+            MachinigToImportList.Add(NewFamily)
+         End If
+      Next
+      Dim ImportWndVM As New ImportExportMachiningWindowVM(MachinigToImportList, False, ImportFilePath, ImportFileMachiningNameList)
+      Dim ImportWnd As New ImportExportMachiningWindowWD(Application.Current.MainWindow, ImportWndVM)
+
+      ImportWnd.ShowDialog()
+      ' Aggiungo all'albero visualizzato gli utensili appena importati
+      If ImportWnd.OkResult Then
+         LoadImportedMachineMachinings(ImportWndVM.vsImported)
+      End If
+   End Sub
+
+   Private Function AlreadyExist(MachiningName As String) As Boolean
+      Dim MachiningFamily As CathegoryItem
+      For Each MachiningFamily In MachiningsList
+         Dim MachiningItem As CustomItem
+         For Each MachiningItem In MachiningFamily.Items
+            If MachiningName = MachiningItem.Name Then
+               Return True
+            End If
+         Next
+      Next
+      Return False
+   End Function
+
+   Private Function GetMachiningFamilyName(NewMachinigFamily As Integer) As String
+      Dim MachiningFamily As CathegoryItem
+      For Each MachiningFamily In MachiningsList
+         If NewMachinigFamily = MachiningFamily.nTType Then
+            Return MachiningFamily.Name
+         End If
+      Next
+      Return ""
+   End Function
+
+   Private Sub LoadImportedMachineMachinings(vsImportedMachinings As String())
+      ' Leggo tutte le lavorazioni presenti nella Macchina (quindi anche quelli appena importati). 
+      Dim ActiveMachiningsFamilies() As MachiningsType = MyReadMachiningFamilies(m_MainWindow.m_CurrentMachine.sMachIniFile)
+      Dim MachiningsFamilyIndex As Integer = 0
+      Dim MachiningsFamilyItem As MachiningsType
+      For Each MachiningsFamilyItem In ActiveMachiningsFamilies
+         Dim FamilyTreeView As New CathegoryItem(MachiningsFamilyItem.Name, MachiningsFamilyItem.Id)
+         Dim MachiningFamilyItem = MachiningsList.FirstOrDefault(Function(MachiningFamily) MachiningsFamilyItem.Id = MachiningFamily.nTType)
+         If IsNothing(MachiningFamilyItem) Then
+            MachiningsList.Insert(MachiningsFamilyIndex, FamilyTreeView)
+         End If
+         Dim nType As Integer = 0
+         Dim MachiningName As String = String.Empty
+         Dim MachiningIndex As Integer = 0
+         EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+         Dim bFound As Boolean = EgtMdbGetFirstMachining(MachiningsFamilyItem.Id, MachiningName)
+         While bFound
+            Dim MachiningItem = MachiningsList(MachiningsFamilyIndex).Items.FirstOrDefault(Function(Machining) Machining.Name = MachiningName)
+            Dim bInList As Boolean = vsImportedMachinings.Contains(MachiningName)
+            If bInList Then
+               ' Se una lavorazione è presente nella MachiningsList visualizzata ma nel contempo è nell'array vsImported 
+               ' vuol dire che è stata sovrascritta perciò la rimuovo
+               MachiningsList(MachiningsFamilyIndex).Items.Remove(MachiningsList(MachiningsFamilyIndex).Items.FirstOrDefault(Function(Machining) Machining.Name = MachiningName))
+            End If
+            If bInList OrElse IsNothing(MachiningItem) Then
+               ' recupero tuuid
+               EgtMdbSetCurrMachining(MachiningName)
+               Dim sCurrMachTUUID As String = String.Empty
+               EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sCurrMachTUUID)
+               ' aggiungo la lavorazione importata
+               MachiningsList(MachiningsFamilyIndex).Items.Insert(MachiningIndex, New CustomItem(MachiningName, MachiningsFamilyItem.Id, ToolDbUtility.IsToolInDb(sCurrMachTUUID)))
+               ' eventualmente evidezio l'ultimo elemento inserito (ERRORE: non espando l'albero)
+               'MachiningsList(MachiningsFamilyIndex).Items(MachiningIndex).IsSelected = True
+            End If
+            MachiningIndex += 1
+            bFound = EgtMdbGetNextMachining(MachiningsFamilyItem.Id, MachiningName)
+         End While
+         MachiningsFamilyIndex += 1
+      Next
+   End Sub
+
+   Public Function MyReadMachiningFamilies(sMachineIniPath As String) As MachiningsType()
+      Dim ActiveMachiningsFamiliesList As New List(Of MachiningsType)
+      ' Se il materiale lavorato è Marmo l'ordine di lettura e inserimento di Foratura e Taglio di lama nelle famiglie di lavorazioni attive è invertito 
+
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWING, .Name = EgtMsg(31200 + 2)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.DRILLING, .Name = EgtMsg(31200 + 1)})
+      End If
+
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MILLING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MILLING, .Name = EgtMsg(31200 + 3)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_POCKETING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.POCKETING, .Name = EgtMsg(31200 + 4)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MORTISING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MORTISING, .Name = EgtMsg(31200 + 5)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWROUGHING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWROUGHING, .Name = EgtMsg(31200 + 6)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWFINISHING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWFINISHING, .Name = EgtMsg(31200 + 7)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_GENMACHINING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.GENMACHINING, .Name = EgtMsg(31200 + 8)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_CHISELING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.CHISELING, .Name = EgtMsg(31200 + 9)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFFINISHING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SURFFINISHING, .Name = EgtMsg(31211)})
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_WATERJETTING, 0, sMachineIniPath) <> 0 Then
+         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.WATERJETTING, .Name = EgtMsg(31210)})
+      End If
+      Return ActiveMachiningsFamiliesList.ToArray
+   End Function
+
    Private Sub InitializeMachiningFamily(bEnabled As Boolean, nFType As Integer, sFName As String)
       If Not bEnabled Then Return
       ' Inserisco categoria ed eventuali elementi
@@ -362,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
@@ -515,7 +708,11 @@ Public Class MachiningDbPageUC
       ' Lista materiali
       m_MaterialsList.Clear()
       For Each Material As Material In m_MainWindow.m_CurrentMachine.Materials
-         m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName))
+         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))
+         End If
       Next
       EgtMdbGetCurrMachiningParam(MCH_MP.SYSNOTES, ToolString)
       If ToolString <> String.Empty Then
@@ -523,14 +720,30 @@ Public Class MachiningDbPageUC
          Dim Index As Integer = 0
          For Each Material As MachiningMaterial In m_MaterialsList
             Dim Param() As String = sItems(Index).Split(",".ToCharArray)
+            Dim SubParam() As String = Param(0).Split(".".ToCharArray)
             Dim nParId As Integer = 0
-            If StringToInt(Param(0), nParId) AndAlso nParId = Material.nId Then
-               StringToDouble(Param(1), Material.dMinThickness)
-               StringToDouble(Param(2), Material.dMaxThickness)
-               Material.VerifyIfActive()
-               Index += 1
+            Dim nSubParId As Integer = 0
+            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
+
+                  StringToDouble(Param(1), Material.dMinThickness)
+                  StringToDouble(Param(2), Material.dMaxThickness)
+                  Material.VerifyIfActive()
+                  Index += 1
+               Else
+                  Material.VerifyIfActive()
+               End If
             Else
-               Material.VerifyIfActive()
+               If StringToInt(Param(0), nParId) AndAlso nParId = Material.nId Then
+
+                  StringToDouble(Param(1), Material.dMinThickness)
+                  StringToDouble(Param(2), Material.dMaxThickness)
+                  Material.VerifyIfActive()
+                  Index += 1
+               Else
+                  Material.VerifyIfActive()
+               End If
             End If
          Next
       End If
@@ -609,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
@@ -684,8 +897,14 @@ Public Class MachiningDbPageUC
       ' Scrivo stringa materiali da lista
       Dim sMaterialString As String = String.Empty
       For Each Material As MachiningMaterial In m_MaterialsList
-         If Material.bIsActive Then
-            sMaterialString += Material.nId.ToString & "," & DoubleToString(Material.dMinThickness, 0) & "," & DoubleToString(Material.dMaxThickness, 0) & ";"
+         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, 3) & "," & DoubleToString(Material.dMaxThickness, 3) & ";"
+            End If
+         Else
+            If Material.bIsActive Then
+               sMaterialString += Material.nId.ToString & "," & DoubleToString(Material.dMinThickness, 3) & "," & DoubleToString(Material.dMaxThickness, 3) & ";"
+            End If
          End If
       Next
       EgtMdbSetCurrMachiningParam(MCH_MP.SYSNOTES, sMaterialString)
@@ -922,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
@@ -1563,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
@@ -1575,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
@@ -2068,6 +2290,16 @@ 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 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
+         StringToLen(MaxThicknessTxBx.Text, dVal)
+         If dVal > dMaxThick Then
+            MaxThicknessTxBx.Text = LenToString(dMaxThick, 3)
+         End If
+      End If
       StringToLen(MaxThicknessTxBx.Text, SelectedMaterial.dMaxThickness)
       SelectedMaterial.VerifyIfActive()
    End Sub
@@ -2143,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)(
@@ -2215,6 +2446,7 @@ Class MachiningMaterial
    Implements INotifyPropertyChanged
 
    Private m_nId As Integer
+   Private m_nSubId As Integer
    Private m_sName As String
    Private m_dMinThickness As Double
    Private m_dMaxThickness As Double
@@ -2226,6 +2458,12 @@ Class MachiningMaterial
       End Get
    End Property
 
+   Public ReadOnly Property nSubId As Integer
+      Get
+         Return m_nSubId
+      End Get
+   End Property
+
    Public ReadOnly Property Name As String
       Get
          Return m_sName
@@ -2264,6 +2502,15 @@ Class MachiningMaterial
       m_bIsActive = False
    End Sub
 
+   Sub New(nId As Integer, sName As String, nSubId As Integer)
+      m_nId = nId
+      m_nSubId = nSubId
+      m_sName = sName
+      m_dMinThickness = 0
+      m_dMaxThickness = 0
+      m_bIsActive = False
+   End Sub
+
    Public Sub VerifyIfActive()
       Dim bIsActive As Boolean = ( m_dMaxThickness > m_dMinThickness + EPS_SMALL)
       If bIsActive <> m_bIsActive Then

Machine/PolishingsPageUC.xaml

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

Machine/PolishingsPageUC.xaml.vb

@@ -61,6 +61,8 @@ Public Class PolishingsPageUC
       RepeatTxBl.Text = EgtMsg(91093)             ' Ripetizioni
       StepTxBl.Text = EgtMsg(90787)               ' Passo
       OffSetTxBl.Text = EgtMsg(91089)             ' Offset
+      RadiusTxBl.Text = EgtMsg(91139)             ' Raggio
+      DistanceTxBl.Text = EgtMsg(91140)           ' 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

Machine/StatisticsPageUC.xaml.vb

@@ -36,7 +36,7 @@ Public Class StatisticsPageUC
       DayTxBl.Text = sDay
       ' Leggo il numero della settimana
       Dim nWeek As Integer = GetPrivateProfileInt(S_STATDATA, K_SD_WEEK, -1, m_MainWindow.GetIniFile())
-      WeekTxBl.Text = ( nWeek + 1).ToString()
+      WeekTxBl.Text = (nWeek).ToString()
 
       ' Leggo area pezzi del giorno
       Dim dDayParts As Double = GetPrivateProfileDouble(S_STATDATA, K_SD_DAYPARTS, 0, m_MainWindow.GetIniFile())

Machine/ToolChangerPosUC.xaml

@@ -9,7 +9,7 @@
    <!-- Definizione del ToolHolderUc -->
    <Grid>
       <Image Source="/Resources/ToolChangerPos.png"/>
-      <ToggleButton Name="Tool" Width="50" Height="50" Margin="22,40,26,8" Background="#7FB4B4B4">
+      <ToggleButton Name="Tool" Width="50" Height="50" Margin="62,10,16,10" Background="#7FB4B4B4">
          <ToggleButton.Template>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
                <Grid>
@@ -25,7 +25,7 @@
 
          </ToggleButton.Template>
       </ToggleButton>
-      <TextBlock Name="PositionNameTxBl" Height="22" Width="68" FontSize="16" Margin="12,16,41,61"/>
+      <TextBlock Name="PositionNameTxBl" Height="22" Width="50" FontSize="16" Margin="20,40,70,53"/>
 
    </Grid>
 </UserControl>

Machine/ToolsDbPageUC.xaml

@@ -281,12 +281,12 @@
                   </Grid.ColumnDefinitions>
 
                   <TextBlock Name="SpeedTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1"
+                  <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" IsLength="False"
                      Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
 
                   <TextBlock Name="MaxSpeedTxBl" Grid.Column="2"
                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="3"
+                  <EgtWPFLib:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="3" IsLength="False"
                      Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
 
                </Grid>
@@ -384,7 +384,7 @@
 
                   <TextBlock Name="MaxAbsorptionTxBl" Grid.Column="0"
                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="1" ScrollViewer.VerticalScrollBarVisibility="Disabled" TextWrapping="Wrap"/>
-                  <EgtWPFLib:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1" 
+                  <EgtWPFLib:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1" IsLength="False"
                      Style="{DynamicResource OmagCut_LeftCalculatorTextBoxInBorder}" />
 
                   <TextBlock Name="MinFeedTxBl" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
@@ -434,17 +434,16 @@
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="10*"/>
                <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="9*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
             <Button Name="NewBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
             <Button Name="SaveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
             <Button Name="RemoveBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
-            <Button Name="ExportBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
-            <Button Name="ImportBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
+            <Button Name="ExportBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
+            <Button Name="ImportBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
 
             </Grid>
 

Machine/ToolsDbPageUC.xaml.vb

@@ -56,8 +56,8 @@ Public Class ToolsDbPageUC
       NewBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 15)
       SaveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 17)
       RemoveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 18)
-      ExportBtn.Content = "Export"
-      ImportBtn.Content = "Import"
+      ExportBtn.Content = EgtMsg(91126)
+      ImportBtn.Content = EgtMsg(91127)
 
       NameTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 1)
       TCPosTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 2)
@@ -177,8 +177,8 @@ Public Class ToolsDbPageUC
          End If
          ' Verifico se macchina con nuovo SawbladeMaker
          Dim sSawBladeMaker As String = ""
-         GetPrivateProfileString( S_TOOLS, K_SAWBLADEMAKER, "", sSawBladeMaker, m_MainWindow.GetIniFile())
-         m_bNewSawbladeMaker = String.Compare( sSawBladeMaker, "MakeStoneSawBlade.lua", True)
+         GetPrivateProfileString(S_TOOLS, K_SAWBLADEMAKER, "", sSawBladeMaker, m_MainWindow.GetIniFile())
+         m_bNewSawbladeMaker = String.Compare(sSawBladeMaker, "MakeStoneSawBlade.lua", True)
          m_bFirst = False
       Else
          EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
@@ -506,7 +506,7 @@ Public Class ToolsDbPageUC
          ToolToExportList.Add(ImpExpToolFamily)
       Next
 
-      Dim ExportWndVM As New ImportExportToolWindowVM(ToolToExportList)
+      Dim ExportWndVM As New ImportExportToolWindowVM(ToolToExportList, True)
       Dim ExportWnd As New ImportExportToolWD(Application.Current.MainWindow, ExportWndVM)
 
       ExportWnd.ShowDialog()
@@ -528,7 +528,7 @@ Public Class ToolsDbPageUC
       ' recupero liste utensili da importare
       Dim ImportFileToolNameList As String() = Nothing
       Dim ImportFileToolFamilyList As Integer() = Nothing
-      EgtTdbToBeImported(ImportFilePath, ImportFileToolNameList, ImportFileToolFamilyList)
+      If Not EgtTdbToBeImported(ImportFilePath, ImportFileToolNameList, ImportFileToolFamilyList) Then Return
       ' li inserisco in lista per finestra di scelta
       Dim ToolToImportList As New ObservableCollection(Of ImpExpToolFamily)
       ' creo famiglie di utensili in base a quelle trovate in lista importata
@@ -558,11 +558,12 @@ Public Class ToolsDbPageUC
             ToolToImportList.Add(NewFamily)
          End If
       Next
-      Dim ImportWndVM As New ImportExportToolWindowVM(ToolToImportList, ImportFilePath, ImportFileToolNameList)
+      Dim ImportWndVM As New ImportExportToolWindowVM(ToolToImportList, False, ImportFilePath, ImportFileToolNameList)
       Dim ImportWnd As New ImportExportToolWD(Application.Current.MainWindow, ImportWndVM)
 
-      If ImportWnd.ShowDialog() Then
-         ' Aggiungo all'albero visualizzato gli utensili appena importati
+      ImportWnd.ShowDialog()
+      ' Aggiungo all'albero visualizzato gli utensili appena importati
+      If ImportWnd.OkResult Then
          LoadImportedMachineTools(ImportWndVM.vsImported)
       End If
    End Sub
@@ -592,31 +593,38 @@ Public Class ToolsDbPageUC
 
    Private Sub LoadImportedMachineTools(vsImportedTools As String())
       ' Leggo tutti gli utensili presenti nella Macchina (quindi anche quelli appena importati). 
-      Dim ActiveToolsFamilies() As ToolsFamily = MachineUtility.ReadToolFamilies(m_CurrMachine.sMachIniFile)
+      Dim ActiveToolsFamilies() As ToolsFamily = MyReadToolFamilies(m_CurrMachine.sMachIniFile)
       Dim ToolsFamilyIndex As Integer = 0
       Dim ToolsFamilyItem As ToolsFamily
       For Each ToolsFamilyItem In ActiveToolsFamilies
+         ' dalla lista che ho ricavato dalla libreria recupero gli utensili associati
          Dim FamilyTreeView As New CathegoryItem(ToolsFamilyItem.Name, ToolsFamilyItem.Id)
-         Dim ToolFamilyItem = ToolsList.FirstOrDefault(Function(ToolFamily) ToolsFamilyItem.Id = FamilyTreeView.nTType)
+         Dim ToolFamilyItem = ToolsList.FirstOrDefault(Function(ToolFamily) ToolFamily.nTType = ToolsFamilyItem.Id)
          If IsNothing(ToolFamilyItem) Then
             ToolsList.Insert(ToolsFamilyIndex, FamilyTreeView)
+         Else
+            ' ricerco l'indice nella lista Tools
+
          End If
          Dim nType As Integer = 0
          Dim ToolName As String = String.Empty
          Dim ToolIndex As Integer = 0
-         EgtSetCurrentContext(ToolScene.GetCtx())
+         'EgtSetCurrentContext(ToolScene.GetCtx())
+         EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
          If EgtTdbGetFirstTool(ToolsFamilyItem.Id, ToolName, nType) Then
             Dim ToolItem = ToolsList(ToolsFamilyIndex).Items.FirstOrDefault(Function(Tool) Tool.Name = ToolName)
             If IsNothing(ToolItem) Then
                ' Se leggo un utensile non presente nella ToolsList visualizzata lo aggiungo ad essa. 
                Dim NewToolName As New CustomItem(ToolName, nType)
                ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
+               'NewToolName.IsSelected = True
             ElseIf vsImportedTools.Contains(ToolName) Then
                ' Se un utensile è presente nella ToolsList visualizzata ma nel contempo è nell'array vsImported 
                ' vuol dire che è stato sovrascritto perciò lo rimuovo e lo riaggiungo alla ToolsList.
                ToolsList(ToolsFamilyIndex).Items.Remove(ToolsList(ToolsFamilyIndex).Items.FirstOrDefault(Function(Tool) Tool.Name = ToolName))
                Dim NewToolName As New CustomItem(ToolName, nType)
                ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
+               'NewToolName.IsSelected = True
             End If
             ToolIndex += 1
             While EgtTdbGetNextTool(ToolsFamilyItem.Id, ToolName, nType)
@@ -625,20 +633,60 @@ Public Class ToolsDbPageUC
                   ' Se leggo un utensile non presente nella ToolsList visualizzata lo aggiungo ad essa. 
                   Dim NewToolName As New CustomItem(ToolName, nType)
                   ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
+                  'NewToolName.IsSelected = True
                ElseIf vsImportedTools.Contains(ToolName) Then
                   ' Se un utensile è presente nella ToolsList visualizzata ma nel contempo è nell'array vsImported 
                   ' vuol dire che è stato sovrascritto perciò lo rimuovo e lo riaggiungo alla ToolsList.
                   ToolsList(ToolsFamilyIndex).Items.Remove(ToolsList(ToolsFamilyIndex).Items.FirstOrDefault(Function(Tool) Tool.Name = ToolName))
                   Dim NewToolName As New CustomItem(ToolName, nType)
                   ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
+                  'NewToolName.IsSelected = True
                End If
                ToolIndex += 1
             End While
          End If
          ToolsFamilyIndex += 1
       Next
+
    End Sub
 
+   Public Function MyReadToolFamilies(sMachineIniPath As String) As ToolsFamily()
+      Dim ActiveToolsFamiliesList As New List(Of ToolsFamily)
+
+      ' Se il materiale lavorato è Marmo l'ordine di lettura e inserimento di Punta e Lama nelle famiglie di utensili attivi è invertito 
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_SAWBLADE, 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(31000 + 2)))
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_DRILLBIT, 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(31000 + 1)))
+      End If
+
+
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MILL, 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(31000 + 3)))
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, "CupWheel", 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90754)))
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, "PolishingWheel", 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90756)))
+      End If
+
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MORTISE, 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MORTISE, EgtMsg(31000 + 4)))
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_CHISEL, 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.CHISEL, EgtMsg(31000 + 9)))
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_COMPO, 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.COMPO, EgtMsg(31000 + 5)))
+      End If
+      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_WATERJET, 0, sMachineIniPath) <> 0 Then
+         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.WATERJET, EgtMsg(31010)))
+      End If
+      Return ActiveToolsFamiliesList.ToArray
+   End Function
+
    Friend Sub InitializeToolGroup(bEnabled As Boolean, nTType As Integer, sFName As String)
       If Not bEnabled Then Return
       ' Inserisco categoria ed eventuali elementi
@@ -647,7 +695,16 @@ Public Class ToolsDbPageUC
       Dim ToolName As String = String.Empty
       Dim bFound As Boolean = EgtTdbGetFirstTool(nTType, ToolName, nType)
       While bFound
-         If nType = nTType Then ToolCathegory.Items.Add(New CustomItem(ToolName, nType))
+         Dim nDebug As Integer = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0, m_sIniFile)
+         If nType = nTType Then
+            If nTType <> MCH_TY.MILL_STD Then
+               ' se utensile diverso da MILL
+               ToolCathegory.Items.Add(New CustomItem(ToolName, nType))
+            ElseIf nTType = MCH_TY.MILL_STD And (ToolName.Trim.ToLower <> "probe" Or nDebug > 4) Then
+               ' Se utensile MILL con nome "probe" aggiungo solo se livello debug maggiore di 4
+               ToolCathegory.Items.Add(New CustomItem(ToolName, nType))
+            End If
+         End If
          bFound = EgtTdbGetNextTool(nTType, ToolName, nType)
       End While
       ToolsList.Add(ToolCathegory)
@@ -1035,7 +1092,7 @@ Public Class ToolsDbPageUC
          Dim dCore, dTh As Double
          If EgtTdbGetCurrToolParam(MCH_TP.CORE, dCore) AndAlso
             EgtTdbGetCurrToolParam(MCH_TP.THICK, dTh) Then
-            Dim dL As Double = Math.Max( dVal, 0.0) + ((dCore + dTh) / 2)
+            Dim dL As Double = Math.Max(dVal, 0.0) + ((dCore + dTh) / 2)
             EgtTdbSetCurrToolParam(MCH_TP.TOTLEN, dL + 1)
             Return EgtTdbSetCurrToolParam(MCH_TP.LEN, dL)
          Else
@@ -1122,7 +1179,7 @@ Public Class ToolsDbPageUC
             Dim dToolCore As Double
             EgtTdbGetCurrToolParam(MCH_TP.CORE, dToolCore)
             If dToolCore < EPS_SMALL Then
-               dToolCore = If( dToolLen >= dToolThick, dToolThick - 1, 2 * dToolLen - dToolThick)
+               dToolCore = If(dToolLen >= dToolThick, dToolThick - 1, 2 * dToolLen - dToolThick)
                EgtTdbSetCurrToolParam(MCH_TP.CORE, dToolCore)
                EgtOutLog("ToolCore too small ->" & DoubleToString(dToolCore, 1))
             End If

Machine/WaterJetPageUC.xaml

@@ -0,0 +1,273 @@
+<UserControl x:Class="WaterJetPageUC"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+   xmlns:self="clr-namespace:OmagCUT.TreeViewItem"
+   mc:Ignorable="d" 
+   d:DesignHeight="768" d:DesignWidth="1280" Initialized="WaterJetPage_Initialized">
+
+   <!-- Definizione della PolishingsPage -->
+   <Border Style="{DynamicResource OmagCut_PageBorder}">
+
+      <Grid Name="WaterJetPageGrid" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="8*"/>
+            <ColumnDefinition Width="4*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <!--Lista dei materiali-->
+         <GroupBox Name="MaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
+                      Header="{Binding Material_Msg}"
+                      Grid.Row="0" BorderThickness="0">
+
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="7*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+
+               <!--Lista dei materiali-->
+               <ListBox Name="MaterialsLstBx" 
+                             ItemsSource="{Binding MaterialList}" SelectedItem="{Binding SelMaterial}"
+                             Grid.RowSpan="2">
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+               </ListBox>
+               <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
+               <EgtWPFLib:EgtTextBox Name="NewMaterialNameTxBx" Grid.Row="1" 
+                                          Width="220"
+                                          Text="{Binding sNewMaterial}"
+                                          Visibility="{Binding NewMaterial_Visibility}"
+                                          Style="{DynamicResource OmagCut_KeyboardTextBox}" 
+                                          KeyboardPosition="Top"/>
+               <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
+               <UniformGrid Grid.Row="2" Columns="3">
+                  <Button Name="NewMaterialBtn" Grid.Column="0"
+                                Content="{Binding New_Msg}"
+                                Command="{Binding NewMaterialCommand}"
+                                Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+                  <Button Name="DeleteMaterialBtn" Grid.Column="1"
+                                Content="{Binding Delete_Msg}"
+                                Command="{Binding DeleteMaterialCommand}"
+                                Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+                  <Button Name="ModifyMaterialBtn" Grid.Column="1"
+                                Content="{Binding Modify_Msg}"
+                                Command="{Binding ModifyMaterialCommand}"
+                                Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+               </UniformGrid>
+
+            </Grid>
+
+         </GroupBox>
+
+         <!--Raggruppo all'interno della stessa cornice le sottocatogorie e i parametri-->
+         <Border Style="{DynamicResource OmagCut_Border}" 
+                    Grid.Column="1" Grid.Row="0" 
+                    Grid.ColumnSpan="2" Grid.RowSpan="1">
+
+            <Grid Name="SubMaterialGrd" Grid.Column="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+
+               <!--Sottocategoria dei materiali associata alla lista precedente-->
+               <GroupBox Name="SubMaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" 
+                              Header="{Binding SubMaterial_Msg}"
+                              Grid.Column="0" Grid.Row="0" 
+                              Grid.ColumnSpan="1" Grid.RowSpan="8" BorderThickness="0">
+
+                  <Grid Grid.Column="1">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="7*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+
+                     <!--Lista dei materiali-->
+                     <ListBox Name="SubMaterialsLstBx" ItemsSource="{Binding Path=SelectedItem.SubMaterialList, ElementName=MaterialsLstBx}"
+                                     SelectedItem="{Binding Path=SelectedItem.SelSubMaterial, ElementName=MaterialsLstBx}"
+                                     Grid.RowSpan="2">
+                        <ListBox.ItemTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                           </DataTemplate>
+                        </ListBox.ItemTemplate>
+                     </ListBox>
+
+                     <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
+                     <EgtWPFLib:EgtTextBox Name="NewSubMaterialNameTxBx" Grid.Row="1" 
+                                                  Width="220"
+                                                  Text="{Binding sNewSubMaterial}"
+                                                  Visibility="{Binding NewSubMaterial_Visibility}"
+                                                  Style="{DynamicResource OmagCut_KeyboardTextBox}" 
+                                                  KeyboardPosition="Top"/>
+
+                     <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
+                     <UniformGrid Grid.Row="2" Columns="3">
+                        <Button Name="NewSubMaterialBtn" Grid.Column="0"
+                                        Content="{Binding New_Msg}"
+                                        Command="{Binding NewSubMaterialCommand}"
+                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+                        <Button Name="RemoveSubMaterialBtn" Grid.Column="1"
+                                        Content="{Binding Delete_Msg}"
+                                        Command="{Binding DeleteSubMaterialCommand}"
+                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+                        <Button Name="ModifySubMaterialBtn" Grid.Column="1"
+                                        Content="{Binding Modify_Msg}"
+                                        Command="{Binding ModifySubMaterialCommand}"
+                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+                     </UniformGrid>
+
+                  </Grid>
+
+               </GroupBox>
+
+               <!--Lista dei parametri associata alla sottovcategoria dei materiali-->
+               <GroupBox Name="ParamsGpBx" 
+                              Grid.Column="1" Grid.Row="0" Margin="0,0,0,3"
+                              Grid.ColumnSpan="3" Grid.RowSpan="8" BorderThickness="0">
+
+                  <!--Titolazione delle colonne della tabella-->
+                  <GroupBox.Header >
+                     <Grid Width="700">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="{Binding Thickness_Msg}" Grid.Column="0" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                        <TextBlock Text="{Binding Q1_Msg}" Grid.Column="1" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                        <TextBlock Text="{Binding Q2_Msg}" Grid.Column="2" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                        <TextBlock Text="{Binding Q3_Msg}" Grid.Column="3" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                        <TextBlock Text="{Binding Q4_Msg}" Grid.Column="4" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                        <TextBlock Text="{Binding Q5_Msg}" Grid.Column="5" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                        <TextBlock Text="{Binding QExtra_Msg}" Grid.Column="6" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                        <TextBlock Text="{Binding AngComp_Msg}" Grid.Column="7" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
+                     </Grid>
+
+                  </GroupBox.Header>
+
+                  <!--Definizione della Grid dei parametri delle lavorazioni-->
+                  <Grid Grid.Column="2">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="308*"/>
+                        <ColumnDefinition Width="73*"/>
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="7*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+
+                     <ListBox Name="ParamLstBx"
+                                     ItemsSource="{Binding Path=SelectedItem.ParamList , ElementName=SubMaterialsLstBx}"
+                                     SelectedItem="{Binding Path=SelectedItem.SelWjParam , ElementName=SubMaterialsLstBx}"
+                                     Margin="0,0,0,0"
+                                     Grid.RowSpan="2" Grid.ColumnSpan="2">
+                        <ListBox.ItemTemplate>
+                           <DataTemplate>
+                              <Grid Width="700">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                 </Grid.ColumnDefinitions>
+
+                                 <EgtWPFLib:EgtTextBox Text="{Binding Thickness}" Grid.Column="0"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                 <EgtWPFLib:EgtTextBox Text="{Binding Q1}" Grid.Column="1"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                 <EgtWPFLib:EgtTextBox Text="{Binding Q2}" Grid.Column="2"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                 <EgtWPFLib:EgtTextBox Text="{Binding Q3}" Grid.Column="3"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                 <EgtWPFLib:EgtTextBox Text="{Binding Q4}" Grid.Column="4"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                 <EgtWPFLib:EgtTextBox Text="{Binding Q5}" Grid.Column="5"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                 <EgtWPFLib:EgtTextBox Text="{Binding QExtra}" Grid.Column="6"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                 <EgtWPFLib:EgtTextBox Text="{Binding dAngComp}" Grid.Column="7" IsLength="False"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                              </Grid>
+                           </DataTemplate>
+                        </ListBox.ItemTemplate>
+                     </ListBox>
+
+                     <UniformGrid Grid.Row="2" Columns="9" Grid.ColumnSpan="2">
+                        <Button Name="NewParamBtn" Grid.Column="0"
+                                        Command="{Binding NewWjParamCommand}"
+                                        Content="{Binding New_Msg}"
+                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+                        <Button Name="RemoveParamBtn" Grid.Column="1"
+                                        Command="{Binding DeleteWjParamCommand}"
+                                        Content="{Binding Delete_Msg}"
+                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
+                     </UniformGrid>
+
+                  </Grid>
+
+               </GroupBox>
+
+            </Grid>
+         </Border>
+         <Button Name="SaveKitBtn" Grid.Row="2" Grid.Column="2"
+                    Command="{Binding SaveCommand}"
+                    Content="{Binding Save_Msg}"
+                    Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+      </Grid>
+
+   </Border>
+
+</UserControl>

Machine/WaterJetPageUC.xaml.vb

@@ -0,0 +1,106 @@
+Imports System.Collections.ObjectModel
+Imports System.ComponentModel
+Imports EgtUILib
+Imports EgtWPFLib
+Imports EgtWPFLib5
+
+Public Class WaterJetPageUC
+
+   ' Riferimento alla MainWindow
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Private m_refWaterjetDbWindowVM As WaterjetDbWindowVM_OmagCUT
+   Private m_sOrigNewMaterial As String = String.Empty
+   Private m_sOrigNewSubMaterial As String = String.Empty
+
+   Private Sub WaterJetPage_Initialized(sender As Object, e As EventArgs)
+      m_refWaterjetDbWindowVM = New WaterjetDbWindowVM_OmagCUT(m_MainWindow.m_CurrentMachine.sMachDir)
+      '----------------------------------------------------------------------------------------
+      ' TEMPORANEO - se dati in INCH e richiesta di frazioni eseguo la conversione in frazione!
+      ConvertParamListValueToFracrion()
+      '----------------------------------------------------------------------------------------
+      Me.DataContext = m_refWaterjetDbWindowVM
+      EgtWPFLib.Utility.MainWindow = m_MainWindow
+   End Sub
+
+   Public Sub WaterJetPage_Reinitialize()
+      m_refWaterjetDbWindowVM = New WaterjetDbWindowVM_OmagCUT(m_MainWindow.m_CurrentMachine.sMachDir)
+      '----------------------------------------------------------------------------------------
+      ' TEMPORANEO - se dati in INCH e richiesta di frazioni eseguo la conversione in frazione!
+      ConvertParamListValueToFracrion()
+      '----------------------------------------------------------------------------------------
+      Me.DataContext = m_refWaterjetDbWindowVM
+   End Sub
+
+   Private Sub NewMaterial_EgtOpening(sender As Object, e As EventArgs) Handles NewMaterialNameTxBx.EgtOpening
+      m_sOrigNewMaterial = NewMaterialNameTxBx.Text
+   End Sub
+
+   Private Sub NewSubMaterial_EgtOpening(sender As Object, e As EventArgs) Handles NewSubMaterialNameTxBx.EgtOpening
+      m_sOrigNewSubMaterial = NewSubMaterialNameTxBx.Text
+   End Sub
+
+   Private Sub NewMaterial_EgtClosed(sender As Object, e As EventArgs) Handles NewMaterialNameTxBx.EgtClosed
+      m_refWaterjetDbWindowVM.sNewMaterial = NewMaterialNameTxBx.Text
+      If String.IsNullOrEmpty(m_refWaterjetDbWindowVM.sNewMaterial) OrElse m_refWaterjetDbWindowVM.sNewMaterial = m_sOrigNewMaterial Then
+         m_refWaterjetDbWindowVM.NewMaterial_Visibility = Visibility.Collapsed
+      Else
+         m_refWaterjetDbWindowVM.Done("")
+         NewMaterialNameTxBx.Clear()
+      End If
+   End Sub
+
+   Private Sub NewSubMaterial_EgtClosed(sender As Object, e As EventArgs) Handles NewSubMaterialNameTxBx.EgtClosed
+      m_refWaterjetDbWindowVM.sNewSubMaterial = NewSubMaterialNameTxBx.Text
+      If String.IsNullOrEmpty(m_refWaterjetDbWindowVM.sNewSubMaterial) OrElse m_refWaterjetDbWindowVM.sNewSubMaterial = m_sOrigNewSubMaterial Then
+         m_refWaterjetDbWindowVM.NewSubMaterial_Visibility = Visibility.Collapsed
+      Else
+         m_refWaterjetDbWindowVM.Done("")
+         NewSubMaterialNameTxBx.Clear()
+      End If
+   End Sub
+
+   Private Sub ConvertParamListValueToFracrion()
+      ' TEMPORANEO - se dati in INCH e richiesta di frazioni eseguo la conversione in frazione!
+      Dim Index1 As Integer = 0
+      For Index1 = 0 To m_refWaterjetDbWindowVM.MaterialList.Count - 1
+         Dim Index2 As Integer = 0
+         For Index2 = 0 To m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList.Count - 1
+            Dim Index3 As Integer = 0
+            For Index3 = 0 To m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList.Count - 1
+               Dim dThickness As Double
+               Dim dQ1 As Double
+               Dim dQ2 As Double
+               Dim dQ3 As Double
+               Dim dQ4 As Double
+               Dim dQ5 As Double
+               Dim dQExtra As Double
+               Dim dAngComp As Double
+               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Thickness, dThickness)
+               Dim sVal As String = LenToString(dThickness, 3)
+               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetThickness(sVal)
+               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q1, dQ1)
+               sVal = LenToString(dQ1, 3)
+               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ1(sVal)
+               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q2, dQ2)
+               sVal = LenToString(dQ2, 3)
+               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ2(sVal)
+               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q3, dQ3)
+               sVal = LenToString(dQ3, 3)
+               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ3(sVal)
+               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q4, dQ4)
+               sVal = LenToString(dQ4, 3)
+               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ4(sVal)
+               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q5, dQ5)
+               sVal = LenToString(dQ5, 3)
+               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ5(sVal)
+               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).QExtra, dQExtra)
+               sVal = LenToString(dQExtra, 3)
+               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQExtra(sVal)
+               StringToDouble(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).dAngComp, dAngComp)
+            Next
+         Next
+      Next
+   End Sub
+
+End Class
+

Machine/WaterJetPageVM.vb

@@ -0,0 +1,915 @@
+'Imports System.Collections.ObjectModel
+'Imports System.ComponentModel
+'Imports EgtUILib
+'Imports EgtWPFLib
+
+'Public Class WaterJetPageVM
+'   Private m_refWaterPageV As WaterJetPageUC
+
+'   ' lista dei materiali
+'   Private m_ListMaterial As New ObservableCollection(Of MaterialWJ)
+'   Public ReadOnly Property ListMaterial As ObservableCollection(Of MaterialWJ)
+'      Get
+'         Return m_ListMaterial
+'      End Get
+'   End Property
+'   ' materiale selezionato
+'   Private m_SelectedMaterial As MaterialWJ
+'   Public Property SelectedMaterial As MaterialWJ
+'      Get
+'         Return m_SelectedMaterial
+'      End Get
+'      Set(value As MaterialWJ)
+'         m_SelectedMaterial = value
+'      End Set
+'   End Property
+'   ' submateriale selezionato
+'   Private m_SelectedSubMaterial As SubMaterialWJ
+'   Public Property SelectedSubMaterial As SubMaterialWJ
+'      Get
+'         Return m_SelectedSubMaterial
+'      End Get
+'      Set(value As SubMaterialWJ)
+'         m_SelectedSubMaterial = value
+'      End Set
+'   End Property
+'   ' lista parametri selezionata
+'   Private m_SelectedParam As ParamWJ
+'   Public Property SelectedParam As ParamWJ
+'      Get
+'         Return m_SelectedParam
+'      End Get
+'      Set(value As ParamWJ)
+'         m_SelectedParam = value
+'      End Set
+'   End Property
+
+'   Private m_sNewMaterial As MaterialWJ
+'   Public Property sNewMaterial As String
+'      Get
+'         Return m_sNewMaterial.sMaterial
+'      End Get
+'      Set(value As String)
+'         m_sNewMaterial = New MaterialWJ(value)
+'      End Set
+'   End Property
+
+'   Private m_NewMaterialVisibility As Visibility = Visibility.Hidden
+'   Public Property NewMaterialVisibility As Visibility
+'      Get
+'         Return m_NewMaterialVisibility
+'      End Get
+'      Set(value As Visibility)
+'         m_NewMaterialVisibility = value
+'      End Set
+'   End Property
+
+'   Sub New(WaterJetPageV As WaterJetPageUC)
+'      m_refWaterPageV = WaterJetPageV
+'      ' Creo una lista di materiali come esempio
+'      ListMaterial.Add(New MaterialWJ("Marmo"))
+'      ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("Binaco"))
+'      ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("10", "Bq1", "Bq2", "Bq3", "Bq4", "Bq5"))
+'      ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("Nero"))
+'      ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("20", "Nq1", "Nq2", "Nq3", "Nq4", "Nq5"))
+'      ListMaterial.Add(New MaterialWJ("Granito"))
+'      ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("GR_Binaco"))
+'      ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("15", "gBq1", "gBq2", "Bq3", "gBq4", "gBq5"))
+'      ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("15.5", "g_Bq1", "g_Bq2", "g_Bq3", "g_Bq4", "g_Bq5"))
+'      ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("15.8", "G_Bq1", "G_Bq2", "G_Bq3", "G_Bq4", "G_Bq5"))
+'      ListMaterial.Last.ListOfSubMaterial.Add(New SubMaterialWJ("GR_Nero"))
+'      ListMaterial.Last.ListOfSubMaterial.Last.ListOfParam.Add(New ParamWJ("18", "gNq1", "gNq2", "gNq3", "gNq4", "gNq5"))
+
+'      SelectedMaterial = m_ListMaterial(0)
+'      SelectedSubMaterial = m_SelectedMaterial.ListOfSubMaterial(0)
+'      SelectedParam = SelectedSubMaterial.ListOfParam(0)
+'   End Sub
+
+'   Private m_cmdOk As ICommand
+'   Public ReadOnly Property OkCommand() As ICommand
+'      Get
+'         If m_cmdOk Is Nothing Then
+'            m_cmdOk = New Command(AddressOf Ok)
+'         End If
+'         Return m_cmdOk
+'      End Get
+'   End Property
+
+'   Private Sub Ok()
+'      ' Mostro textbox per il nome
+'      m_refWaterPageV.KitNameTxBx.Text = String.Empty
+'      m_refWaterPageV.KitNameTxBx.Visibility = Windows.Visibility.Visible
+'      m_refWaterPageV.KitsLstBx.SetValue(Grid.RowSpanProperty, 1)
+'      MessageBox.Show("Prova di Binding", "Prova di Binding", MessageBoxButton.OK, MessageBoxImage.Asterisk, MessageBoxResult.OK)
+'      m_refWaterPageV.KitNameTxBx.Visibility = Windows.Visibility.Hidden
+'      m_refWaterPageV.KitsLstBx.SetValue(Grid.RowSpanProperty, 2)
+'   End Sub
+
+'End Class
+
+
+'Public Class MaterialWJ
+
+'   Private m_sMaterial As String = String.Empty
+'   Public ReadOnly Property sMaterial As String
+'      Get
+'         Return m_sMaterial
+'      End Get
+'   End Property
+
+'   Private m_ListOfSubMaterial As New ObservableCollection(Of SubMaterialWJ)
+'   Public Property ListOfSubMaterial As ObservableCollection(Of SubMaterialWJ)
+'      Get
+'         Return m_ListOfSubMaterial
+'      End Get
+'      Set(value As ObservableCollection(Of SubMaterialWJ))
+'         m_ListOfSubMaterial = value
+'      End Set
+'   End Property
+
+'   Sub New(sMat As String)
+'      m_sMaterial = sMat
+'   End Sub
+
+'End Class
+
+'Public Class SubMaterialWJ
+
+'   Dim m_sSubMaterial As String
+'   Public Property sSubMaterial As String
+'      Get
+'         Return m_sSubMaterial
+'      End Get
+'      Set(value As String)
+'         m_sSubMaterial = value
+'      End Set
+'   End Property
+
+'   Private m_ListOfParam As New ObservableCollection(Of ParamWJ)
+'   Public Property ListOfParam As ObservableCollection(Of ParamWJ)
+'      Get
+'         Return m_ListOfParam
+'      End Get
+'      Set(value As ObservableCollection(Of ParamWJ))
+'         m_ListOfParam = value
+'      End Set
+'   End Property
+
+'   Sub New(sName As String)
+'      m_sSubMaterial = sName
+'   End Sub
+'End Class
+
+'Public Class ParamWJ
+
+'   Private m_Thickness As String
+'   Private m_Q1 As String
+'   Private m_Q2 As String
+'   Private m_Q3 As String
+'   Private m_Q4 As String
+'   Private m_Q5 As String
+
+'   Public Property Q1 As String
+'      Get
+'         Return m_Q1
+'      End Get
+'      Set(value As String)
+'         m_Q1 = value
+'      End Set
+'   End Property
+
+'   Public Property Thickness As String
+'      Get
+'         Return m_Thickness
+'      End Get
+'      Set(value As String)
+'         m_Thickness = value
+'      End Set
+'   End Property
+
+'   Public Property Q2 As String
+'      Get
+'         Return m_Q2
+'      End Get
+'      Set(value As String)
+'         m_Q2 = value
+'      End Set
+'   End Property
+
+'   Public Property Q3 As String
+'      Get
+'         Return m_Q3
+'      End Get
+'      Set(value As String)
+'         m_Q3 = value
+'      End Set
+'   End Property
+
+'   Public Property Q4 As String
+'      Get
+'         Return m_Q4
+'      End Get
+'      Set(value As String)
+'         m_Q4 = value
+'      End Set
+'   End Property
+
+'   Public Property Q5 As String
+'      Get
+'         Return m_Q5
+'      End Get
+'      Set(value As String)
+'         m_Q5 = value
+'      End Set
+'   End Property
+
+'   Sub New(sT As String, sQ1 As String, sQ2 As String, sQ3 As String, sQ4 As String, sQ5 As String)
+'      m_Thickness = sT
+'      m_Q1 = sQ1
+'      m_Q2 = sQ2
+'      m_Q3 = sQ3
+'      m_Q4 = sQ4
+'      m_Q5 = sQ5
+'   End Sub
+
+'End Class
+
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class WaterjetDbWindowVM
+   Inherits VMBase
+   ' Riferimento alla MainWindow
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Private m_refWaterPageV As WaterJetPageUC
+
+#Region "FIELDS & PROPERTIES"
+
+
+#Region "Materiali"
+   Private Property m_MaterialList As ObservableCollection(Of WjMaterial)
+   Public Property MaterialList As ObservableCollection(Of WjMaterial)
+      Get
+         Return m_MaterialList
+      End Get
+      Set(value As ObservableCollection(Of WjMaterial))
+         m_MaterialList = value
+      End Set
+   End Property
+
+   Private Property m_SelMaterial As WjMaterial
+   Public Property SelMaterial As WjMaterial
+      Get
+         Return m_SelMaterial
+      End Get
+      Set(value As WjMaterial)
+         m_SelMaterial = value
+      End Set
+   End Property
+
+   Private Property m_sNewMaterial As String
+   Public Property sNewMaterial As String
+      Get
+         Return m_sNewMaterial
+      End Get
+      Set(value As String)
+         m_sNewMaterial = value
+      End Set
+   End Property
+
+   Private Property m_NewMaterial_Visibility As Visibility = Visibility.Collapsed
+   Public Property NewMaterial_Visibility As Visibility
+      Get
+         Return m_NewMaterial_Visibility
+      End Get
+      Set(value As Visibility)
+         m_NewMaterial_Visibility = value
+         NotifyPropertyChanged(NameOf(NewMaterial_Visibility))
+      End Set
+   End Property
+
+#End Region
+
+#Region "SubMateriali"
+   Private Property m_SubMaterialList As New ObservableCollection(Of WjSubMaterial)
+   Public Property SubMaterialList As ObservableCollection(Of WjSubMaterial)
+      Get
+         Return m_SubMaterialList
+      End Get
+      Set(value As ObservableCollection(Of WjSubMaterial))
+         m_SubMaterialList = value
+      End Set
+   End Property
+
+   'Private Property m_SelSubMaterial As WjSubMaterial
+   'Public Property SelSubMaterial As WjSubMaterial
+   '   Get
+   '      Return m_SelSubMaterial
+   '   End Get
+   '   Set(value As WjSubMaterial)
+   '      m_SelSubMaterial = value
+   '   End Set
+   'End Property
+
+   Private Property m_sNewSubMaterial As String
+   Public Property sNewSubMaterial As String
+      Get
+         Return m_sNewSubMaterial
+      End Get
+      Set(value As String)
+         m_sNewSubMaterial = value
+      End Set
+   End Property
+
+   Private Property m_NewSubMaterial_Visibility As Visibility = Visibility.Collapsed
+   Public Property NewSubMaterial_Visibility As Visibility
+      Get
+         Return m_NewSubMaterial_Visibility
+      End Get
+      Set(value As Visibility)
+         m_NewSubMaterial_Visibility = value
+         NotifyPropertyChanged(NameOf(NewSubMaterial_Visibility))
+      End Set
+   End Property
+
+#End Region
+
+#Region "Parametri"
+   Private Property m_ParamList As ObservableCollection(Of WjParam)
+   Public Property ParamList As ObservableCollection(Of WjParam)
+      Get
+         Return m_ParamList
+      End Get
+      Set(value As ObservableCollection(Of WjParam))
+         m_ParamList = value
+      End Set
+   End Property
+
+   'Private Property m_SelParam As WjParam
+   'Public Property SelParam As WjParam
+   '   Get
+   '      Return m_SelParam
+   '   End Get
+   '   Set(value As WjParam)
+   '      m_SelParam = value
+   '   End Set
+   'End Property
+
+   Private m_HeadParamLstBx_Width As Double
+   Public ReadOnly Property HeadParamLstBx_Width As Double
+      Get
+         If m_HeadParamLstBx_Width < 10 Then
+            Return 700
+         End If
+         Return m_HeadParamLstBx_Width
+      End Get
+   End Property
+
+#End Region
+
+   Const S_MATERIALS As String = "Materials"
+
+   ' Definizione comandi
+   Private m_cmdNewMaterial As ICommand
+   Private m_cmdDeleteMaterial As ICommand
+   Private m_cmdNewSubMaterial As ICommand
+   Private m_cmdDeleteSubMaterial As ICommand
+   Private m_cmdNewWjParam As ICommand
+   Private m_cmdDeleteWjParam As ICommand
+   Private m_cmdSave As ICommand
+   Private m_cmdDone As ICommand
+
+#End Region
+
+#Region "MESSAGES"
+
+   Public ReadOnly Property Material_Msg As String
+      Get
+         Return "Materiale"
+      End Get
+   End Property
+
+   Public ReadOnly Property SubMaterial_Msg As String
+      Get
+         Return "SubMateriale"
+      End Get
+   End Property
+
+   Public ReadOnly Property Id_Msg As String
+      Get
+         Return "Id"
+      End Get
+   End Property
+
+   Public ReadOnly Property Thickness_Msg As String
+      Get
+         Return "Spessore"
+      End Get
+   End Property
+
+   Public ReadOnly Property Q1_Msg As String
+      Get
+         Return "Q1"
+      End Get
+   End Property
+
+   Public ReadOnly Property Q2_Msg As String
+      Get
+         Return "Q2"
+      End Get
+   End Property
+
+   Public ReadOnly Property Q3_Msg As String
+      Get
+         Return "Q3"
+      End Get
+   End Property
+
+   Public ReadOnly Property Q4_Msg As String
+      Get
+         Return "Q4"
+      End Get
+   End Property
+
+   Public ReadOnly Property Q5_Msg As String
+      Get
+         Return "Q5"
+      End Get
+   End Property
+
+   Public ReadOnly Property QExtra_Msg As String
+      Get
+         Return "QExtra"
+      End Get
+   End Property
+
+   Public ReadOnly Property AngComp_Msg As String
+      Get
+         Return "Ang"
+      End Get
+   End Property
+
+   Public ReadOnly Property New_Msg As String
+      Get
+         Return "Nuovo"
+      End Get
+   End Property
+
+   Public ReadOnly Property Delete_Msg As String
+      Get
+         Return "Elimina"
+      End Get
+   End Property
+
+   Public ReadOnly Property Save_Msg As String
+      Get
+         Return "Salva"
+      End Get
+   End Property
+
+   Public ReadOnly Property Modify_Msg As String
+      Get
+         Return "Modifica"
+      End Get
+   End Property
+
+#End Region
+
+#Region "CONSTRUCTOR"
+
+   Sub New(refContext As WaterJetPageUC)
+      ' definisco il riferiento con la pagina xaml
+      m_refWaterPageV = refContext
+      ' Leggo valori da file Data e li carico nelle proprietà
+      Dim sFilePath As String = m_MainWindow.m_CurrentMachine.sMachDir & "\" &  MACHININGS_DIR & "\" & WATERJETDB_FILE
+      MaterialList = New ObservableCollection(Of WjMaterial)
+
+      If File.Exists(sFilePath) Then
+         Dim sMaterial As String = String.Empty
+
+         If EgtUILib.GetPrivateProfileString(S_MATERIALS, "1", "", sMaterial, sFilePath) > 0 Then
+            Dim sMaterials() As String = sMaterial.Split(","c)
+            Dim ind As Integer = 0
+            For ind = 0 To sMaterials.Length() - 1
+
+               'recupero i sottomateriali
+               Dim Index As Integer = 1
+               Dim sSubMat As String = String.Empty
+               Dim SubMatList As New ObservableCollection(Of WjSubMaterial)
+               While EgtUILib.GetPrivateProfileString(sMaterials(ind), Index.ToString(), "", sSubMat, sFilePath) > 0
+
+
+                  ' recupero la lista dei Q
+                  Dim QInd As Integer = 1
+                  Dim sParam As String = String.Empty
+                  Dim QParamList As New ObservableCollection(Of WjParam)
+                  While EgtUILib.GetPrivateProfileString(sMaterials(ind) & "." & sSubMat, QInd.ToString(), "", sParam, sFilePath) > 0
+                     Dim sParams() As String = sParam.Split(","c)
+                     If sParams.Length() >= 7 Then
+                        Dim dThickness As Double
+                        Dim dQ1 As Double
+                        Dim dQ2 As Double
+                        Dim dQ3 As Double
+                        Dim dQ4 As Double
+                        Dim dQ5 As Double
+                        Dim dQExtra As Double
+                        StringToDouble(sParams(0), dThickness)
+                        StringToDouble(sParams(1), dQ1)
+                        StringToDouble(sParams(2), dQ2)
+                        StringToDouble(sParams(3), dQ3)
+                        StringToDouble(sParams(4), dQ4)
+                        StringToDouble(sParams(5), dQ5)
+                        StringToDouble(sParams(6), dQExtra)
+                        Dim LocalWjParam As New WjParam(QInd, dThickness, dQ1, dQ2, dQ3, dQ4, dQ5, dQExtra, m_refWaterPageV)
+                        QParamList.Add(LocalWjParam)
+                        ' leggo il nuovo parametro di correzione conicità (di default il parametro è 0)
+                        If sParams.Length() >= 8 Then
+                           Dim dAngCompo As Double
+                           StringToDouble(sParams(7), dAngCompo)
+                           LocalWjParam.dAngComp = dAngCompo
+                        End If
+                     End If
+                     QInd += 1
+                  End While
+
+                  SubMatList.Add(New WjSubMaterial(sSubMat, QParamList))
+                  Index += 1
+               End While
+
+               MaterialList.Add(New WjMaterial(sMaterials(ind), SubMatList))
+            Next
+
+         End If
+
+      End If
+
+   End Sub
+
+   Public Sub RefreshDImensionPage()
+      m_HeadParamLstBx_Width = m_refWaterPageV.ParamsGpBx.ActualWidth - 20
+      NotifyPropertyChanged(NameOf(HeadParamLstBx_Width))
+   End Sub
+
+#End Region    ' Constructor
+
+#Region "COMMANDS"
+
+#Region "NewMaterialCommand"
+
+   Public ReadOnly Property NewMaterialCommand As ICommand
+      Get
+         If m_cmdNewMaterial Is Nothing Then
+            m_cmdNewMaterial = New Command(AddressOf NewMaterial)
+         End If
+         Return m_cmdNewMaterial
+      End Get
+   End Property
+
+   Public Sub NewMaterial(ByVal param As Object)
+      NewSubMaterial_Visibility = Visibility.Collapsed
+      NewMaterial_Visibility = Visibility.Visible
+   End Sub
+
+#End Region ' NewMaterial
+
+#Region "DeleteMaterialCommand"
+
+   Public ReadOnly Property DeleteMaterialCommand As ICommand
+      Get
+         If m_cmdDeleteMaterial Is Nothing Then
+            m_cmdDeleteMaterial = New Command(AddressOf DeleteMaterial)
+         End If
+         Return m_cmdDeleteMaterial
+      End Get
+   End Property
+
+   Public Sub DeleteMaterial(ByVal param As Object)
+      If Not IsNothing(SelMaterial) Then
+         MaterialList.Remove(SelMaterial)
+         'SelMaterial.NotifyPropertyChanged(NameOf(MaterialList))
+      End If
+   End Sub
+
+#End Region ' DeleteMaterial
+
+#Region "NewSubMaterialCommand"
+
+   Public ReadOnly Property NewSubMaterialCommand As ICommand
+      Get
+         If m_cmdNewSubMaterial Is Nothing Then
+            m_cmdNewSubMaterial = New Command(AddressOf NewSubMaterial)
+         End If
+         Return m_cmdNewSubMaterial
+      End Get
+   End Property
+
+   Public Sub NewSubMaterial(ByVal param As Object)
+      If Not IsNothing(SelMaterial) Then
+         NewMaterial_Visibility = Visibility.Collapsed
+         NewSubMaterial_Visibility = Visibility.Visible
+
+      End If
+   End Sub
+
+#End Region ' NewSubMaterial
+
+#Region "DeleteSubMaterialCommand"
+
+   Public ReadOnly Property DeleteSubMaterialCommand As ICommand
+      Get
+         If m_cmdDeleteSubMaterial Is Nothing Then
+            m_cmdDeleteSubMaterial = New Command(AddressOf DeleteSubMaterial)
+         End If
+         Return m_cmdDeleteSubMaterial
+      End Get
+   End Property
+
+   Public Sub DeleteSubMaterial(ByVal param As Object)
+      If Not IsNothing(SelMaterial.SelSubMaterial) Then
+         SelMaterial.SubMaterialList.Remove(SelMaterial.SelSubMaterial)
+         SelMaterial.NotifyPropertyChanged(NameOf(SubMaterialList))
+      End If
+   End Sub
+
+#End Region ' DeleteSubMaterial
+
+#Region "NewWjParamCommand"
+
+   Public ReadOnly Property NewWjParamCommand As ICommand
+      Get
+         If m_cmdNewWjParam Is Nothing Then
+            m_cmdNewWjParam = New Command(AddressOf NewWjParam)
+         End If
+         Return m_cmdNewWjParam
+      End Get
+   End Property
+
+   Public Sub NewWjParam(ByVal param As Object)
+      If Not IsNothing(SelMaterial.SelSubMaterial) Then
+         Dim nId As Integer = 0
+         If IsNothing(SelMaterial.SelSubMaterial.ParamList) Then
+            nId = 1
+            SelMaterial.SelSubMaterial.ParamList = New ObservableCollection(Of WjParam)
+         Else
+            nId = SelMaterial.SelSubMaterial.ParamList.Count + 1
+         End If
+         SelMaterial.SelSubMaterial.ParamList.Add(New WjParam(nId, 0, 0, 0, 0, 0, 0, 0, m_refWaterPageV))
+         SelMaterial.SelSubMaterial.NotifyPropertyChanged(NameOf(ParamList))
+      End If
+   End Sub
+
+#End Region ' NewWjParam
+
+#Region "DeleteWjParamCommand"
+
+   Public ReadOnly Property DeleteWjParamCommand As ICommand
+      Get
+         If m_cmdDeleteWjParam Is Nothing Then
+            m_cmdDeleteWjParam = New Command(AddressOf DeleteWjParam)
+         End If
+         Return m_cmdDeleteWjParam
+      End Get
+   End Property
+
+   Public Sub DeleteWjParam(ByVal param As Object)
+      If Not IsNothing(SelMaterial.SelSubMaterial.SelWjParam) Then
+         SelMaterial.SelSubMaterial.ParamList.Remove(SelMaterial.SelSubMaterial.SelWjParam)
+         SelMaterial.SelSubMaterial.NotifyPropertyChanged(NameOf(ParamList))
+      End If
+   End Sub
+
+#End Region ' DeleteWjParam
+
+#Region "DoneCommand"
+
+   Public ReadOnly Property DoneCommand As ICommand
+      Get
+         If m_cmdDone Is Nothing Then
+            m_cmdDone = New Command(AddressOf Done)
+         End If
+         Return m_cmdDone
+      End Get
+   End Property
+
+   Public Sub Done(ByVal param As Object)
+      If NewMaterial_Visibility = Visibility.Visible Then
+         MaterialList.Add(New WjMaterial(sNewMaterial))
+         NotifyPropertyChanged(NameOf(MaterialList))
+         NewMaterial_Visibility = Visibility.Collapsed
+      ElseIf NewSubMaterial_Visibility = Visibility.Visible Then
+         SelMaterial.SubMaterialList.Add(New WjSubMaterial(sNewSubMaterial))
+         NotifyPropertyChanged(NameOf(SubMaterialList))
+         NewSubMaterial_Visibility = Visibility.Collapsed
+      End If
+   End Sub
+
+#End Region ' Done
+
+#End Region    ' Commands
+
+End Class
+
+Public Class WjMaterial
+   Inherits VMBase
+
+   Private m_Name As String
+   Public Property Name As String
+      Get
+         Return m_Name
+      End Get
+      Set(value As String)
+         m_Name = value
+      End Set
+   End Property
+
+   Private m_SubMaterialList As ObservableCollection(Of WjSubMaterial)
+   Public Property SubMaterialList As ObservableCollection(Of WjSubMaterial)
+      Get
+         Return m_SubMaterialList
+      End Get
+      Set(value As ObservableCollection(Of WjSubMaterial))
+         m_SubMaterialList = value
+      End Set
+   End Property
+
+   Private Property m_SelSubMaterial As WjSubMaterial
+   Public Property SelSubMaterial As WjSubMaterial
+      Get
+         Return m_SelSubMaterial
+      End Get
+      Set(value As WjSubMaterial)
+         m_SelSubMaterial = value
+      End Set
+   End Property
+
+   Sub New(sName As String, SubMatList As ObservableCollection(Of WjSubMaterial))
+      m_Name = sName
+      m_SubMaterialList = SubMatList
+   End Sub
+
+   Sub New(sName As String)
+      m_Name = sName
+   End Sub
+
+End Class
+
+Public Class WjSubMaterial
+   Inherits VMBase
+
+   Private m_Name As String
+   Public Property Name As String
+      Get
+         Return m_Name
+      End Get
+      Set(value As String)
+         m_Name = value
+      End Set
+   End Property
+
+   Private m_ParamList As ObservableCollection(Of WjParam)
+   Public Property ParamList As ObservableCollection(Of WjParam)
+      Get
+         Return m_ParamList
+      End Get
+      Set(value As ObservableCollection(Of WjParam))
+         m_ParamList = value
+      End Set
+   End Property
+
+   Private Property m_SelWjParam As WjParam
+   Public Property SelWjParam As WjParam
+      Get
+         Return m_SelWjParam
+      End Get
+      Set(value As WjParam)
+         m_SelWjParam = value
+      End Set
+   End Property
+
+   Sub New(sName As String, ParamList As ObservableCollection(Of WjParam))
+      m_Name = sName
+      m_ParamList = ParamList
+   End Sub
+
+   Sub New(sName As String)
+      m_Name = sName
+   End Sub
+
+End Class
+
+Public Class WjParam
+
+   Private m_Id As Integer
+   Public Property Id As Integer
+      Get
+         Return m_Id
+      End Get
+      Set(value As Integer)
+         m_Id = value
+      End Set
+   End Property
+
+   Private m_Thickness As Double
+   Public Property Thickness As Double
+      Get
+         Return m_Thickness
+      End Get
+      Set(value As Double)
+         m_Thickness = value
+      End Set
+   End Property
+
+   Private m_Q1 As Double
+   Public Property Q1 As Double
+      Get
+         Return m_Q1
+      End Get
+      Set(value As Double)
+         m_Q1 = value
+      End Set
+   End Property
+
+   Private m_Q2 As Double
+   Public Property Q2 As Double
+      Get
+         Return m_Q2
+      End Get
+      Set(value As Double)
+         m_Q2 = value
+      End Set
+   End Property
+
+   Private m_Q3 As Double
+   Public Property Q3 As Double
+      Get
+         Return m_Q3
+      End Get
+      Set(value As Double)
+         m_Q3 = value
+      End Set
+   End Property
+
+   Private m_Q4 As Double
+   Public Property Q4 As Double
+      Get
+         Return m_Q4
+      End Get
+      Set(value As Double)
+         m_Q4 = value
+      End Set
+   End Property
+
+   Private m_Q5 As Double
+   Public Property Q5 As Double
+      Get
+         Return m_Q5
+      End Get
+      Set(value As Double)
+         m_Q5 = value
+      End Set
+   End Property
+
+   Private m_QExtra As Double
+   Public Property QExtra As Double
+      Get
+         Return m_QExtra
+      End Get
+      Set(value As Double)
+         m_QExtra = value
+      End Set
+   End Property
+
+   ' angolo di compensazione conicità getto: 01/02/2023 ver 2.5b1
+   Private m_dAngComp As Double = 0
+   Public Property dAngComp As Double
+      Get
+         Return m_dAngComp
+      End Get
+      Set(value As Double)
+         m_dAngComp = value
+      End Set
+   End Property
+
+   Public ReadOnly Property ParamLstBx_Width As Double
+      Get
+         Return m_refWaterPageV.ParamsGpBx.ActualWidth - 20
+      End Get
+   End Property
+
+   Private m_refWaterPageV As WaterJetPageUC
+
+   Sub New(nId As Integer, dThickness As Double, dQ1 As Double, dQ2 As Double, dQ3 As Double, dQ4 As Double, dQ5 As Double, dQExtra As Double, ByRef refWJPage As WaterJetPageUC)
+      m_Id = nId
+      m_Thickness = dThickness
+      m_Q1 = dQ1
+      m_Q2 = dQ2
+      m_Q3 = dQ3
+      m_Q4 = dQ4
+      m_Q5 = dQ5
+      m_QExtra = dQExtra
+      m_refWaterPageV = refWJPage
+   End Sub
+
+End Class

Machine/WaterjetDbWindowVM.vb

@@ -0,0 +1,61 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtWPFLib
+
+' nuova libreria EgtWPFLib5 ver 2.4g1
+Public Class WaterjetDbWindowVM_OmagCUT
+   Inherits EgtWPFLib5.WaterjetDbWindowVM
+
+   Public Function CloseWaterjetDb_OmagCut(MainWindow As Window) As SaveWndBtnEnum
+      If bIsModified Then
+         Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
+         Select Case SaveWjDbWnd.m_nPressedBtn
+            Case 1   ' Yes
+               WriteWaterjetDb()
+               bIsModified = False
+               Return SaveWndBtnEnum.YES
+            Case 2   ' No
+               Return SaveWndBtnEnum.NO
+            Case Else   ' Cancel
+               Return SaveWndBtnEnum.CANCEL
+         End Select
+      Else
+         Dim bExitFor As Boolean = False
+         For Each Material As EgtWPFLib5.WjMaterial In MaterialList
+            If Not IsNothing(Material.SubMaterialList) Then
+               For Each SubMaterial As EgtWPFLib5.WjSubMaterial In Material.SubMaterialList
+                  If Not IsNothing(SubMaterial.ParamList) Then
+                     For Each QParam As EgtWPFLib5.WjParam In SubMaterial.ParamList
+                        bExitFor = QParam.IsModified()
+                        If bExitFor Then Exit For
+                     Next
+                  End If
+                  If bExitFor Then Exit For
+               Next
+            End If
+            If bExitFor Then Exit For
+         Next
+         If bExitFor Then
+            Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
+            Select Case SaveWjDbWnd.m_nPressedBtn
+               Case 1   ' Yes
+                  WriteWaterjetDb()
+                  bIsModified = False
+                  Return SaveWndBtnEnum.YES
+               Case 2   ' No
+                  Return SaveWndBtnEnum.NO
+               Case Else   ' Cancel
+                  Return SaveWndBtnEnum.CANCEL
+            End Select
+         End If
+      End If
+      Return SaveWndBtnEnum.YES
+   End Function
+
+   Sub New(sMachDir As String)
+      MyBase.New(sMachDir)
+   End Sub
+
+End Class

MainWindow.xaml

@@ -27,7 +27,7 @@
          </Grid.ColumnDefinitions>
 
          <Border Name="LogoBrd" Background="Transparent">
-                <Image Source="{DynamicResource LogoOmagImg}" Stretch="Uniform" Margin="1"/>
+                <Image Source="../Resources/NewIcons/Logo-Egalware (2).png" Stretch="Uniform" Margin="1"/>
          </Border>
 
          <!-- ** Definizione della Grid delle tab ** -->
@@ -53,7 +53,7 @@
             </ToggleButton>
          </Grid>
 
-         <Button Grid.Column="2" Style="{DynamicResource OmagCut_BlueIconButton}" Click="ExitBtn_Click">
+         <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_BlueIconButton}" Click="ExitBtn_Click">
             <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
    

MainWindow.xaml.vb

@@ -2,6 +2,7 @@
 Imports System.Collections.ObjectModel
 Imports EgtUILib
 Imports EgtWPFLib
+Imports EgtPHOTOLib
 Imports System.ComponentModel
 Imports System.Threading
 Imports System.Windows.Threading
@@ -22,6 +23,9 @@ Class MainWindow
    ' Coefficiente di scalatura della finestra rispetto a standard
    Friend m_dMWinScale As Double = 1
 
+   ' Variabile che definisce l'avvio forzato in modalità FRAME
+   Friend m_OnlyFrame As Boolean = False
+
    ' Dichiarazione delle Page UserControl
    Friend m_WorkInProgressPageUC As WorkInProgressPageUC
    Friend m_CurrentProjectPageUC As CurrentProjectPageUC
@@ -37,6 +41,8 @@ Class MainWindow
    Friend m_MachinePageUC As MachinePageUC
    Friend m_OptionsPageUC As OptionsPageUC
 
+   Friend m_IsClosingApplication As Integer = 0
+
    ' Dichiarazione variabili direttori
    Private m_sExeRoot As String = String.Empty
    Private m_sDataRoot As String = String.Empty
@@ -97,6 +103,8 @@ Class MainWindow
       OFFICE_TYPE = 2 ^ 19                '  524288
       REGISTRATION = 2 ^ 20               ' 1048576
       SIMPLESTATISTICS = 2 ^ 21           ' 2097152
+      COMPOFRAME = 2 ^ 22                 ' 4194304
+      CUT_LIGHT = 2 ^ 23                  ' 8388608
    End Enum
    ' Opzione nesting automatico
    Private m_bAutoNest As Boolean = False
@@ -302,7 +310,7 @@ Class MainWindow
       GetPrivateProfileString(S_MACH, K_CURRMACH, "", m_sCurrMachine, m_sIniFile)
       ' Impostazione path MachIni file
       m_sMachIniFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & m_sCurrMachine & ".ini"
-      ' Impostazione path KitIni file
+      ' Impostazione path Kit file
       m_sKitsFile = m_sMachinesRoot & "\" & m_sCurrMachine & "\" & MACHININGS_DIR & "\" & KITS_FILE
       ' Imposto tipo di chiave
 #If TRIAL Then
@@ -320,13 +328,30 @@ Class MainWindow
       Dim sNestKey As String = ""
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey(sNestKey)
+      Dim bNetHwKey As Boolean = (GetPrivateProfileInt(S_GENERAL, K_NETKEY, 0, m_sIniFile) = 1)
+      EgtSetNetHwKey(bNetHwKey)
+
+      ' Impostazioni per chiave di rete
+      Dim bNetKey As Boolean = (GetPrivateProfileInt(S_GENERAL, K_NETKEY, 0, m_sIniFile) = 1)
+      EgtSetNetHwKey(bNetKey)
+      Dim sLockId As String = ""
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_LOCKID, "", sLockId, sLicFile)
+      If Not String.IsNullOrEmpty(sLockId) Then
+         EgtSetLockId(sLockId)
+      End If
+
       ' 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, 2610, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2610, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
+      ' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo
+      If Not bProd Then
+         m_OnlyFrame = GetKeyOption(KEY_OPT.CUT_LIGHT)
+      End If
+
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0, m_sIniFile)
       m_sVersion = My.Application.Info.Version.Major.ToString() & "." &
@@ -434,8 +459,9 @@ Class MainWindow
 
       ' abilito il bottone per la gestione del comando di Check-Up-Start (posziona lama prelavorazione)
       If GetPrivateProfileInt(S_GENERAL, "Test", "0", m_sIniFile) = 0 OrElse
-         Not File.Exists( m_CurrentMachine.sMachDir() & "\DirectCmd\TestWork.lua") Then
+         Not File.Exists(m_CurrentMachine.sMachDir() & "\DirectCmd\TestWork.lua") Then
          m_CadCutPageUC.m_ProjectMgr.TestBtn.Visibility = Visibility.Collapsed
+         EgtOutLog("Warning: Missing file 'TestWork.lua' in folder 'DirectCmd', buttun 'TEST' collapsed!")
       Else
          m_CadCutPageUC.m_ProjectMgr.TestBtn.Visibility = Visibility.Visible
       End If
@@ -498,6 +524,64 @@ Class MainWindow
       AddHandler m_ProdLineTimer.Tick, AddressOf OnProdLine
       ' Imposto riferimento a funzione delle textbox che disattiva scene in libreria
       EgtWPFLib.EgtTextBox.m_refScenesIsEnabled = AddressOf IsEnabledScenes
+
+      ' --------------------------------- SLAB DB -------------------------------------------------------
+      If GetPrivateProfileInt(S_SCRAPS, K_ENABLESCRAPS, 0, GetIniFile()) <> 0 Then
+         ' leggo il direttorio in cui cercare il database delle lastre
+         Dim PhotDir As String = String.Empty
+         GetPrivateProfileString(S_SCRAPS, K_PHOTODIR, "", PhotDir, GetIniFile())
+         ' verifico che esista il file "OmagPHOTOVb.sqlite" nel direttorio inidicato
+         If System.IO.File.Exists(PhotDir.Trim & "\" & DB_FILENAME) Then
+
+            If Not ManageDb.ConnectToDb(PhotDir.Trim & "\" & DB_FILENAME) Then
+               EgtOutLog("Error connecting to DB: " & PhotDir.Trim & "\" & DB_FILENAME)
+               ' coumico che il grezzo contiene un pezzo e quindi non può essere definito come grezzo
+               m_CurrentProjectPageUC.ClearMessage()
+               m_CurrentProjectPageUC.SetErrorMessage("Denied connection SlabDB")
+            Else
+               ' Impostazione direttorio per backup
+               Dim BackUpDir As String = m_sDataRoot & "\BackUp"
+               Directory.CreateDirectory(BackUpDir)
+               EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
+               EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
+               EgtPHOTOLib.MainData.SetKeyOptions(CInt(m_nKeyOptions))
+               EgtPHOTOLib.MainData.SetPhotoDir(PhotDir)
+               EgtPHOTOLib.MainData.SetBackUpDir(BackUpDir)
+               EgtPHOTOLib.MainData.SetIsOMagCUT(True)
+               Dim sLastBlock As String = String.Empty
+               GetPrivateProfileString(S_SCRAPS, K_LASTBLOCK, "", sLastBlock, GetIniFile())
+               If Not String.IsNullOrEmpty(sLastBlock) Then
+                  EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
+               End If
+
+               If GetPrivateProfileInt(S_SCRAPS, K_ENABLE_PRINTER, 0, GetIniFile()) = 1 Then
+                  ' leggo nome file prn (per stampante zebra)
+                  Dim m_TemplateFilePrinter As String = String.Empty
+                  GetPrivateProfileString(S_SCRAPS, K_TEMPLATE, m_sDataRoot & "\Label\Default.prn", m_TemplateFilePrinter, GetIniFile())
+                  ' leggo nome del direttorio in cui scrivere il file ini (per stampante zebra) -- solo se si desidera scrivere il file in un direttorio diverso
+                  Dim m_DatFilePrinter As String = String.Empty
+                  GetPrivateProfileString(S_SCRAPS, K_DAT, m_sDataRoot & "\Temp", m_DatFilePrinter, GetIniFile())
+                  ' leggo nome file exe (per stampante zebra)
+                  Dim m_ZebraUtilitiesExe As String = String.Empty
+                  GetPrivateProfileString(S_SCRAPS, K_ZEBRAUTILITIES, System.AppDomain.CurrentDomain.BaseDirectory & "ZebraPrinterUtilitiesR32.exe", m_ZebraUtilitiesExe, GetIniFile())
+                  EgtPHOTOLib.MainData.SetTemplateFilePrinter(m_TemplateFilePrinter)
+                  EgtPHOTOLib.MainData.SetDataFilePrinter(m_DatFilePrinter)
+                  EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
+                  EgtPHOTOLib.MainData.SetPrinterVisibility(True)
+               Else
+                  EgtPHOTOLib.MainData.SetPrinterVisibility(False)
+               End If
+
+               ' è permessa una sola istanza alla volta del programma OmagCUT -> "(1)" : "(" & nIstance.ToString & ")"
+               EgtPHOTOLib.MainData.SetUser(Environment.MachineName & "\" & Environment.UserName & " (1)")
+               Dim sIdKey As String = String.Empty
+               EgtGetKeyInfo(sIdKey)
+               EgtPHOTOLib.MainData.SetKey(sIdKey)
+            End If
+         End If
+      End If
+      ' --------------------------------- SLAB DB -------------------------------------------------------
+      ExitBtn.ToolTip = "Exit" & vbCrLf & "Minimize (Shift)"
    End Sub
 
    Private Sub ManageSingleIstance()
@@ -546,6 +630,16 @@ Class MainWindow
       m_WorkInProgressPageUC.Prepare()
       m_WorkInProgressPageUC.UpdateTools()
 
+      Dim sVal As String = String.Empty
+      If m_CurrentMachine.GetUserNote("FsevLength", sVal, m_CurrentMachine.sCurrSaw) Then
+         StringToDouble(sVal, m_CurrentMachine.dFsevLength)
+         m_CurrentMachine.SetFsevLength(m_CurrentMachine.dFsevLength)
+      End If
+      If m_CurrentMachine.GetUserNote("FsevPerc", sVal, m_CurrentMachine.sCurrSaw) Then
+         StringToDouble(sVal, m_CurrentMachine.dFsevPerc)
+         m_CurrentMachine.SetFsevPerc(m_CurrentMachine.dFsevPerc)
+      End If
+
       ' Se macchina fotografica abilitata, ne inizializzo il gestore
 #If Not TRIAL Then
       If GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO) Then
@@ -560,6 +654,31 @@ Class MainWindow
       m_IdleTimer.Interval = TimeSpan.FromMilliseconds(100)
       m_IdleTimer.Start()
 
+      Dim sAssStatus As String = " discontinued"
+      Dim nAssLeftDays As Integer
+      If EgtGetKeyAssLeftDays(nAssLeftDays) And nAssLeftDays >= 0 Then
+         If nAssLeftDays > 30 Then
+            sAssStatus = "expires within " & nAssLeftDays.ToString() & " days"
+         ElseIf nAssLeftDays > 0 Then
+            sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days"
+         Else
+            sAssStatus = "to be renewed by today"
+         End If
+      End If
+
+      ' Or nAssLeftDays = 358
+      If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Then
+         Dim sMsg As String = EgtMsg(91141)   ' Assistenza in scadenza /nContattare assistenza:/n
+         Dim sAssistance As String = String.Empty
+         GetPrivateProfileString(S_GENERAL, "Assistances", "", sAssistance, GetIniFile)
+         Dim sItems As String() = sAssistance.Split(","c)
+         For Each Item As String In sItems
+            sMsg &= " → " & Item.Trim & " /n"
+         Next
+         Dim MyLicWn As New LicenseWindow(Me, sMsg, "Assistance " & sAssStatus)
+         MyLicWn.Show()
+      End If
+
       ' inizilizzo
    End Sub
 
@@ -569,6 +688,12 @@ Class MainWindow
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       ' disbilito Test
       TestOff()
+      ' disabilito DragRettangle
+      DragRettangleOff()
+      ' disabilito SplitCurv
+      SplitCurvWJOff()
+      ' disattivo StartCurv
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = True
@@ -617,6 +742,8 @@ Class MainWindow
             MainWindowGrid.Children.Remove(m_OptionsPageUC)
             MainWindowGrid.Children.Add(m_WorkInProgressPageUC)
             m_ActivePage = Pages.WorkInProgress
+         Case Else
+            WorkInProgressBtn.IsChecked = False
       End Select
    End Sub
 
@@ -625,6 +752,9 @@ Class MainWindow
       EgtMdbGetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -672,12 +802,17 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_CurrentProjectPageUC)
             m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_DirectCutPageUC)
             m_ActivePage = Pages.DirectCut
+         Case Else
+            WorkInProgressBtn.IsChecked = False
       End Select
    End Sub
 
    Private Sub CadCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles CadCutBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -724,12 +859,17 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_CurrentProjectPageUC)
             m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_CadCutPageUC)
             m_ActivePage = Pages.CadCut
+         Case Else
+            CadCutBtn.IsChecked = False
       End Select
    End Sub
 
    Private Sub FrameCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FrameCutBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -753,8 +893,8 @@ Class MainWindow
             m_ActivePage = Pages.FrameCut
          Case Pages.Photo, Pages.RawPart, Pages.Draw, Pages.Import, Pages.CSV
             ' Pages.Simulation: quando sono nella simulazione devo uscire dalla pagina
-            CadCutBtn.IsChecked = True
-            FrameCutBtn.IsChecked = False
+            CadCutBtn.IsChecked = False
+            FrameCutBtn.IsChecked = True
          Case Pages.FrameCut
             FrameCutBtn.IsChecked = True
          Case Pages.Machine
@@ -777,12 +917,17 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_CurrentProjectPageUC)
             m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_FrameCutPageUC)
             m_ActivePage = Pages.FrameCut
+         Case Else
+            If FrameCutBtn.IsEnabled Then FrameCutBtn.IsChecked = False
       End Select
    End Sub
 
    Private Sub MachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachineBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -825,12 +970,17 @@ Class MainWindow
             MainWindowGrid.Children.Remove(m_OptionsPageUC)
             MainWindowGrid.Children.Add(m_MachinePageUC)
             m_ActivePage = Pages.Machine
+         Case Else
+            MachineBtn.IsChecked = False
       End Select
    End Sub
 
    Private Sub OptionsBtn_Click(sender As Object, e As RoutedEventArgs) Handles OptionsBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -878,7 +1028,7 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_OptionsPageUC)
             m_ActivePage = Pages.Options
          Case Pages.Options
-            OptionsBtn.IsChecked = True
+            OptionsBtn.IsChecked = False
       End Select
    End Sub
 
@@ -893,6 +1043,16 @@ Class MainWindow
       ' Se già visualizzato errore, lo nascondo
       If m_CurrentProjectPageUC.OutMessageBrd.IsMouseOver Then
          m_CurrentProjectPageUC.ClearMessage()
+         ' se è premuto il pulsante Shift allora provvedo ad aprire il file di Log
+         If Keyboard.Modifiers And ModifierKeys.Shift Then
+            ' Genero file CNC (lancio anche se errore in precedenza)
+            Dim sTemoDirect As String = GetTempDir() & "\OmagCUTLog.txt"
+            Try
+               Process.Start("Notepad.exe", sTemoDirect)
+            Catch ex As Exception
+               EgtOutLog(ex.ToString)
+            End Try
+         End If
       End If
       ' Condizioni che impediscono di clickare fuori dalla calcolatrice o tastiera quando una di queste è aperta
       If EgtWPFLib.EgtCalculator.GetbIsActive Then
@@ -983,6 +1143,19 @@ Class MainWindow
          m_CurrentProjectPageUC.SaveNamedProject()
          m_CurrentProjectPageUC.SaveProject()
       End If
+      ' Inizio la chiusura del programma (se NUM_OLD verifico di aver terminato il processo DripFeed)
+      EgtOutLog("Iniziato processo di chiusura programma")
+      m_IsClosingApplication = If(m_CNCommunication.m_nNCType = 1, 1, 2)
+      Dim nCount As Integer = 0
+      While m_IsClosingApplication <> 2
+         If nCount > 5 Then
+            Exit While
+         End If
+         ' verifico che il processo DripFeed sia terminato
+         EgtOutLog("Stato chiusura programma: " & m_IsClosingApplication.ToString)
+         Thread.Sleep(100)
+         nCount += 1
+      End While
       ' Uscita
       MainWindowExit()
    End Sub
@@ -1024,19 +1197,21 @@ Class MainWindow
       ' Se non sono in tagli diretti tutto ok
       If m_ActivePage <> Pages.DirectCut Then Return True
       ' Concludo le attività in corso
-      Select Case m_DirectCutPageUC.m_ActiveDirectCutPage
-         Case DirectCutPageUC.DirectCutPages.SingleCut
-            m_DirectCutPageUC.m_SingleCut.SingleCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.MultipleCut
-            m_DirectCutPageUC.m_MultipleCut.MultipleCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.GridCut
-            m_DirectCutPageUC.m_GridCut.GridCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.CopyTemplate
-            m_DirectCutPageUC.m_CopyTemplate.CopyTemplate_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.FlatteningCut
-            m_DirectCutPageUC.m_FlatteningCut.FlatteningCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.SawTest
-            m_DirectCutPageUC.m_SawTest.SawTest_Unloaded(sender, e)
+      Select Case m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage
+         Case ControlsDirectCutUC.DirectCutPages.SingleCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_SingleCut.SingleCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.MultipleCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_MultipleCut.MultipleCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.GridCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_GridCut.GridCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.FlatteningCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_FlatteningCut.FlatteningCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.CopyTemplate
+            m_DirectCutPageUC.m_ControlsDirectCutUC1.m_CopyTemplate.CopyTemplate_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.Polishing
+            m_DirectCutPageUC.m_ControlsDirectCutUC1.m_Polishing.Polishing_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.SawTest
+            m_DirectCutPageUC.m_ControlsDirectCutUC1.m_SawTest.SawTest_Unloaded(sender, e)
       End Select
       Return True
    End Function
@@ -1068,6 +1243,15 @@ Class MainWindow
             If Not m_MachinePageUC.m_PolishingsPageUC.SaveKit() Then
                Return False
             End If
+         Case MachinePageUC.MachinePages.WaterJet
+            ' Verifica ed eventuale salvataggio Db Waterjet
+            Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+            Dim nPressedBtn As Integer = DirectCast(m_MachinePageUC.m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
+               Return False
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_MachinePageUC.m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
       End Select
       Return True
    End Function
@@ -1088,7 +1272,7 @@ Class MainWindow
    Private Sub MainWindow_ContentRendered(sender As Object, e As EventArgs) Handles Me.ContentRendered
       ' Verifico presenza del collegamento al CN
       m_bNCLink = (GetPrivateProfileInt(S_GENERAL, K_CNLINK, 0, m_sIniFile) <> 0) And
-                  Not GetKeyOption( KEY_OPT.OFFICE_TYPE)
+                  Not GetKeyOption(KEY_OPT.OFFICE_TYPE)
       m_CNCommunication.CNCommunication_Initialization()
       ' Se linea di produzione abilitata e collegata, lancio relativo timer
       If m_bNCLink And m_CurrentMachine.bProdLine Then
@@ -1098,11 +1282,17 @@ Class MainWindow
          m_ProdLineTimer.Interval = TimeSpan.FromMilliseconds(2000)
          m_ProdLineTimer.Start()
       End If
-
+      ' di default attivo la pagina CadCut
+      If m_OnlyFrame Then
+         m_ActivePage = MainWindow.Pages.FrameCut
+      Else
+         m_ActivePage = MainWindow.Pages.CadCut
+      End If
       ' seleziono il tipo di avvio
       m_CurrentProjectPageUC.StartProgram()
       ' aggiorno la grafica
       EgtZoom(ZM.ALL, True)
+
    End Sub
 
    Friend Sub EgtWPFInit()
@@ -1128,9 +1318,41 @@ Class MainWindow
    Private Sub OnIdle()
       ' Recupero il tipo di progetto
       Dim nPrjType As Integer = m_CurrentProjectPageUC.GetCurrentProjectType()
+      ' Verifico presenza testa H1 per lama/fresa (nel contesto principale)
+      Dim nCurrCtx As Integer = EgtGetCurrentContext()
+      EgtSetCurrentContext(m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+      Dim bHeadH1 As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      EgtSetCurrentContext(nCurrCtx)
       ' Aggiorno interfaccia
-      CadCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FRAMES)
-      FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS)
+      If m_OnlyFrame Then
+         If nPrjType = CurrentProjectPageUC.PRJ_TYPE.FLATS And
+            m_ActivePage <> Pages.RawPart And m_ActivePage <> Pages.DirectCut And m_ActivePage <> Pages.Simulation Then
+            Dim FrameWnd As New EgtMsgBox(Me, EgtMsg(91142), EgtMsg(91143), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+            '' Gestione stato FastGrid
+            'm_CadCutPageUC.m_FastGridSlabManager.OnPreNewProject()
+            ' Cancello progetto salvato con nome da file ini
+            WritePrivateProfileString(S_GENERAL, K_LASTNAMEPROJ, "", GetIniFile())
+            ' Scelta tavola della macchina
+            Dim nTabInd As Integer = m_CadCutPageUC.m_ProjectMgr.ChooseTable()
+            ' Creo nuovo progetto
+            m_CurrentProjectPageUC.NewProject(nTabInd, False)
+            '' Gestione stato FastGrid
+            'm_CadCutPageUC.m_FastGridSlabManager.OnPostNewProject()
+            FrameCutBtn_Click(Nothing, Nothing)
+            CadCutBtn.IsEnabled = False
+         Else
+            FrameCutBtn.IsEnabled = True
+            CadCutBtn.IsEnabled = False
+            ' Attivo il pulsante FRAME
+            'FrameCutBtn.IsChecked = True
+            'CadCutBtn.IsChecked = False
+         End If
+      Else
+         CadCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FRAMES)
+         FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS) AndAlso bHeadH1
+      End If
+
+      ' DirectCutBtn.IsEnabled = bHeadH1
    End Sub
 
    ' Nomi dei file per OmagVIEW
@@ -1158,7 +1380,9 @@ Class MainWindow
          m_CNCommunication.m_CN.ReadEls_Add_Parameter(m_CurrentMachine.sVarProjFinished, 1)
          Dim nVarFin As Integer = 0
          For I As Integer = 1 To 4
-            System.Threading.Thread.Sleep(50)
+            If Not m_CurrentMachine.bDemo Then
+               System.Threading.Thread.Sleep(50)
+            End If
             If m_CNCommunication.m_CN.n_DReadELS_handle = 1 Then
                nVarFin = CInt(m_CNCommunication.m_CN.d_DReadELS_value)
                Exit For
@@ -1171,11 +1395,11 @@ Class MainWindow
             ' Salvo in INI indice del progetto terminato
             WritePrivateProfileString(S_GENERAL, K_LASTPROJFINISHED, nVarFin.ToString("D4"), GetIniFile())
             ' Salvo in INI data e ora attuali di termine lavorazione del progetto (solo gli ultimi 10 tramite modulo)
-            Dim sKey As String = K_DATETIMEFINISHED & "." & ( nVarFin Mod 10).ToString() 
+            Dim sKey As String = K_DATETIMEFINISHED & "." & (nVarFin Mod 10).ToString()
             Dim sDateTime As String = My.Computer.Clock.LocalTime.ToString("dd.MM.yyyy HH\:mm\:ss")
             WritePrivateProfileString(S_GENERAL, sKey, sDateTime, GetIniFile())
             ' Eseguo script
-            ExecFinishedProgScript( nVarFin, sDateTime)
+            ExecFinishedProgScript(nVarFin, sDateTime)
          End If
       End If
       ' Se OmagVIEW blocca, esco (riproverò al prossimo giro)
@@ -1211,16 +1435,18 @@ Class MainWindow
       ' Se richieste modalità standard o speciali
       If m_CurrentMachine.nSaveProduced <> 3 Then
          StandardAndSpecialViewFileManagement()
-      ' altrimenti modalità custom
+         ' altrimenti modalità custom
       Else
-         CustomViewFileManagement( nProjInd)
+         CustomViewFileManagement(nProjInd)
       End If
       ' Leggo variabile con indice progetto da copiare per OmagVIEW (standard E80025)
       m_CNCommunication.m_CN.n_DReadELS_handle = 0
       m_CNCommunication.m_CN.ReadEls_Add_Parameter(m_CurrentMachine.sVarProjCopy, 1)
       Dim nVarCopy As Integer = 0
       For I As Integer = 1 To 10
-         System.Threading.Thread.Sleep(50)
+         If Not m_CurrentMachine.bDemo Then
+            System.Threading.Thread.Sleep(50)
+         End If
          If m_CNCommunication.m_CN.n_DReadELS_handle = 1 Then
             nVarCopy = CInt(m_CNCommunication.m_CN.d_DReadELS_value)
             Exit For
@@ -1421,7 +1647,7 @@ Class MainWindow
                nNewProjInd -= 1
             End While
          End If
-      ' se altrimenti richiesto progetto successivo
+         ' se altrimenti richiesto progetto successivo
       ElseIf nMove > 0 Then
          nNewProjInd = nProjInd + 1
          If nProjInd > nLastProj Then
@@ -1522,7 +1748,7 @@ Class MainWindow
             Catch ex As Exception
                EgtOutLog("Error erasing " & sDestEplFile)
             End Try
-         ' altrimenti, ogni commessa ha il suo file dei pezzi rovinati
+            ' altrimenti, ogni commessa ha il suo file dei pezzi rovinati
          Else
             ' Sposto nel direttorio temporaneo
             Dim sDestEplFile = m_sTempDir & "\" & CURR_PROJ_EPL
@@ -1632,7 +1858,7 @@ Class MainWindow
       Return True
    End Function
 
-   Private Function CustomViewFileManagement( nProjInd As Integer) As Boolean
+   Private Function CustomViewFileManagement(nProjInd As Integer) As Boolean
       ' Se non esiste file EPL, esco
       Dim sSouEplFile As String = m_CurrentMachine.sLineDataDir & "\" & CURR_PROJ_EPL
       If Not My.Computer.FileSystem.FileExists(sSouEplFile) Then Return True
@@ -1671,7 +1897,7 @@ Class MainWindow
       ' Verifico progetto restituito da View
       If nProjInd = 0 Then nProjInd = nLastCopy
       ' Leggo variabile con data termine lavorazione
-      Dim sKey As String = K_DATETIMEFINISHED & "." & ( nProjInd Mod 10).ToString() 
+      Dim sKey As String = K_DATETIMEFINISHED & "." & (nProjInd Mod 10).ToString()
       GetPrivateProfileString(S_GENERAL, sKey, sDateTime, sDateTime, GetIniFile())
       ' Recupero direttorio per pezzi rovinati
       Dim sRuPartsDir As String = GetRuinedPartsDir()
@@ -1698,7 +1924,7 @@ Class MainWindow
       Return True
    End Function
 
-   Friend Function ExecSentProgScript( bDirectCut As Boolean, Optional bAlreadySent As Boolean = False) As Boolean
+   Friend Function ExecSentProgScript(bDirectCut As Boolean, Optional bAlreadySent As Boolean = False) As Boolean
       ' Verifico esistenza script
       Dim sLuaPath As String = m_CurrentMachine.sMachDir() & "\Scripts\SentProg.lua"
       If Not My.Computer.FileSystem.FileExists(sLuaPath) Then Return True
@@ -1717,8 +1943,8 @@ Class MainWindow
       End If
       EgtLuaResetGlobVar("SPS")
       If nErr <> 0 Then
-          EgtOutLog("Error in SentProg : " & nErr.ToString())
-          m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(90325))       'Errore nel salvataggio delle statistiche
+         EgtOutLog("Error in SentProg : " & nErr.ToString())
+         m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(90325))       'Errore nel salvataggio delle statistiche
       End If
       Return (nErr = 0)
    End Function
@@ -1789,7 +2015,9 @@ Class MainWindow
          m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90327))        'Inseriti Nuovi Pezzi Rovinati
          Dim nPartId As Integer = EgtGetLastPart()
          For nI As Integer = 1 To nRuPartsCnt
-            EgtRemoveInfo( nPartId, INFO_PARTOK)
+            EgtRemoveInfo(nPartId, INFO_PARTOK)
+            ' ricreo la lista delle famiglie di pezzi presenti in parcheggio
+            m_CadCutPageUC.m_NestPage.GetFamilyGroupInPark()
             m_CadCutPageUC.m_NestPage.StoreOnePart(nPartId, True)
             nPartId = EgtGetPrevPart(nPartId)
          Next
@@ -1798,15 +2026,15 @@ Class MainWindow
       End If
       ' Dichiaro progetto passato da View
       If nProjInd = m_CurrentProjectPageUC.GetCurrentProject() Then
-         EgtSetInfo( EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
+         EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
       Else
          Dim nTmpCtx As Integer = EgtInitContext()
          If nTmpCtx <> 0 Then
             Dim sNgeFile As String = GetSaveDir() & "\" & nProjInd.ToString("D4") & ".nge"
-            EgtOpenFile( sNgeFile)
-            EgtSetInfo( EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
-            EgtSaveFile( sNgeFile, NGE.CMPTEXT)
-            EgtDeleteContext( nTmpCtx)
+            EgtOpenFile(sNgeFile)
+            EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
+            EgtSaveFile(sNgeFile, NGE.CMPTEXT)
+            EgtDeleteContext(nTmpCtx)
             EgtSetCurrentContext(m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
          End If
       End If
@@ -1840,21 +2068,21 @@ Class MainWindow
    ' Evento che apre AboutBox quando viene clickato il logo
    Private Sub LogoBrd_MouseDown(sender As Object, e As MouseButtonEventArgs) Handles LogoBrd.MouseDown
       ' Se non premuto Shift -> AboutBox
-      If ( Keyboard.Modifiers And ModifierKeys.Shift) = 0 Then  
-         Dim AboutBox As New AboutBoxWD( Me)
-      ' Altrimenti lancio cambio macchina (solo uso interno)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = 0 Then
+         Dim AboutBox As New AboutBoxWD(Me)
+         ' Altrimenti lancio cambio macchina (solo uso interno)
       Else
          If m_ActivePage = Pages.CadCut Or m_ActivePage = Pages.FrameCut Then
             ' Cambio macchina
-            EgtLuaCreateGlobTable( "CHM")
-            EgtLuaExecFile( GetConfigDir() & "\ChangeMachine.lua")
+            EgtLuaCreateGlobTable("CHM")
+            EgtLuaExecFile(GetConfigDir() & "\ChangeMachine.lua")
             Dim nRestart As Integer = 0
-            EgtLuaGetGlobIntVar( "CHM.RESTART", nRestart)
-            EgtLuaResetGlobVar( "CHM")
+            EgtLuaGetGlobIntVar("CHM.RESTART", nRestart)
+            EgtLuaResetGlobVar("CHM")
             ' Riavvio
             If nRestart = 1 Then
                Close()
-               Process.Start( Application.ResourceAssembly.Location)
+               Process.Start(Application.ResourceAssembly.Location)
             End If
          End If
       End If
@@ -1875,8 +2103,31 @@ 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_NestPage.m_CurrToolFromSelectedSawCurv = String.Empty
       m_CadCutPageUC.m_ProjectMgr.TestBtn.IsChecked = False
-      m_CurrentProjectPageUC.m_bSelectCurv = False
+      Me.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
+   End Sub
+
+   ' spegne il comando per la mofica dei rettangoli
+   Public Sub DragRettangleOff()
+      m_CadCutPageUC.m_NestPage.DragRettanleBtn.IsChecked = False
+      Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedDragRettangle = False
+      ShowParkedParts()
+
+   End Sub
+
+   Public Sub SplitCurvWJOff()
+      m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.IsChecked = False
+      Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedSplitCurveWJ = False
+      m_CadCutPageUC.m_NestPage.ResetSplitCurvWJParam()
+
+   End Sub
+
+   Public Sub StartCurvWJOff()
+      m_CadCutPageUC.m_NestPage.StartCurveWJBtn.IsChecked = False
+      Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedStartCurveWJ = False
+      m_CadCutPageUC.m_NestPage.ResetStartCurvWJParam()
    End Sub
 
 End Class

My Project/AssemblyInfo.vb

@@ -20,9 +20,9 @@ Imports System.Windows
 <Assembly: AssemblyTitle("OmagCUTR32.exe")>
 <Assembly: AssemblyDescription("OmagCUT 32 bit")>
 #End If
-<Assembly: AssemblyCompany("EgalTech s.r.l.")>
+<Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("OmagCUT")>
-<Assembly: AssemblyCopyright("Copyright ©  2015-2021 by EgalTech s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2015-2024 by Egalware 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.6.10.1")>
+<Assembly: AssemblyFileVersion("2.6.10.1")>