-aggiunto nuovo tab final cut in machining

CAM/CamAuto.vb

@@ -199,22 +199,22 @@ Friend Module CamAuto
    ' ripristina la lavorazone indicata di default per i tagli inclinati
    Private Sub SetResetDef_Machining(nEntId As Integer, sSawingTilted As String, bApplySawingTilted As Boolean, bOnlySideAng As Boolean)
       While nEntId <> GDB_ID.NULL
-         Dim sInfoSIdeAng As String = String.Empty
-         EgtGetInfo(nEntId, INFO_SIDE_ANGLE, sInfoSIdeAng)
+         Dim sInfoOrigSideAng As String = String.Empty
+         EgtGetInfo(nEntId, INFO_ORIG_SIDE_ANGLE, sInfoOrigSideAng)
          ' Se è un'entità associata ad una lavorazione inclinata
-         If Not String.IsNullOrEmpty(sInfoSIdeAng) Then
+         If Not String.IsNullOrEmpty(sInfoOrigSideAng) AndAlso sInfoOrigSideAng <> "0" Then
             If bApplySawingTilted Then
                ' forzo la lavorazione inclinata
                If String.IsNullOrEmpty(sSawingTilted) Then
                   ' ma se non esiste nessuna lavorezione specifica applico qualla standard
-                  EgtRemoveInfo(nEntId, DEF_MACHINING)
+                  EgtRemoveInfo(nEntId, DEF_MACHINING_TILTED)
                Else
                   ' Applico quella specificata
-                  EgtSetInfo(nEntId, DEF_MACHINING, sSawingTilted)
+                  EgtSetInfo(nEntId, DEF_MACHINING_TILTED, sSawingTilted)
                End If
             Else
                ' Rimuovo la lavorazione e applico quella standard
-               EgtRemoveInfo(nEntId, DEF_MACHINING)
+               EgtRemoveInfo(nEntId, DEF_MACHINING_TILTED)
             End If
 
          ElseIf Not bOnlySideAng Then

CadCuts/ChangeToolWD.xaml.vb

@@ -54,6 +54,11 @@ Public Class ChangeToolWD
 
    Private Sub GetDiamAndThickDefaultSaw()
       m_DefaultSaw_Name = m_MainWindow.m_CurrentMachine.sCurrSaw
+      ' Dalla lavorazione corrente recupero il nome della lama
+      If EgtMdbSetCurrMachining(m_CurrSawing) Then
+         Dim sNameTool As String = String.Empty
+         If EgtMdbGetCurrMachiningParam(MCH_MP.TOOL, sNameTool) Then m_DefaultSaw_Name = sNameTool
+      End If
       If EgtTdbSetCurrTool(m_DefaultSaw_Name) Then
          ' Diametro lama lavorazione
          EgtTdbGetCurrToolParam(MCH_TP.DIAM, m_DefaultSaw_Diam)

CadCuts/SplitAuto.vb

@@ -38,6 +38,8 @@ Public Module SplitAuto
       Public m_vtDir As Vector3d
       ' ver 2.6f4: tagli corti gestiti con LeadIn.OUT/LeadOut.OUT
       Public m_bMngLeadInOnIntCorner As Boolean
+      ' ver 2.7e1: tagli finali 
+      Public m_bFinalCut As Boolean
    End Class
 
    '-----------------------------------------------------------------------------------------------
@@ -51,146 +53,6 @@ Public Module SplitAuto
          If IsValidMachining(nOperId) And EgtGetOperationPhase(nOperId) = nCurrPhase Then
             Dim Mach As New SplitMach
             If CreateMach(Mach, nOperId) Then MachSplitList.Add(Mach)
-            '' se appartiene ad un grezzo attivo la inserisco in lista
-            'If IsMachiningInActiveRaw(nOperId) Then
-            '   Dim Mach As New SplitMach
-            '   Mach.m_nEntId = GDB_ID.NULL
-            '   ' identificativo
-            '   Mach.m_nId = nOperId
-            '   ' eventuali lavorazioni inglobate
-            '   Dim sInfo As String = String.Empty
-            '   If EgtGetInfo(nOperId, INFO_MCH_OTHMID, sInfo) Then
-            '      Dim sItems() As String = sInfo.Split(",".ToCharArray)
-            '      For Each sId As String In sItems
-            '         Dim nId As Integer = 0
-            '         StringToInt(sId, nId)
-            '         If nId > 0 Then Mach.m_vOthId.Add(nId)
-            '      Next
-            '   End If
-            '   ' tipo
-            '   Mach.m_nType = EgtGetOperationType(nOperId)
-            '   ' layer di origine
-            '   EgtGetInfo(nOperId, INFO_MCH_LAYER, Mach.m_sLay)
-            '   ' se taglio con lama
-            '   If Mach.m_nType = MCH_OY.SAWING Then
-            '      ' verifica interferenza
-            '      If Mach.m_sLay = NAME_OUTLOOP Then
-            '         EgtVerifyMachining(nOperId, Mach.m_nInterf)
-            '         For Each nId As Integer In Mach.m_vOthId
-            '            Dim nRes As Integer = FMI_TYPE.LI Or FMI_TYPE.RM Or FMI_TYPE.LO
-            '            EgtVerifyMachining(nId, nRes)
-            '            Mach.m_nInterf = Mach.m_nInterf Or nRes
-            '         Next
-            '      Else
-            '         Mach.m_nInterf = FMI_TYPE.NONE
-            '      End If
-            '      ' la imposto come lavorazione corrente
-            '      EgtSetCurrMachining(nOperId)
-            '      ' inversione
-            '      EgtGetMachiningParam(MCH_MP.INVERT, Mach.m_bInvert)
-            '      ' recupero l'angolo di fianco
-            '      EgtGetMachiningParam(MCH_MP.SIDEANGLE, Mach.m_dSideAng)
-            '      ' recupero allungamento iniziale e finale (negativi vicino ad angoli interni)
-            '      Dim dStartAddLen As Double = -10
-            '      EgtGetMachiningParam(MCH_MP.STARTADDLEN, dStartAddLen)
-            '      Dim dEndAddLen As Double = -10
-            '      EgtGetMachiningParam(MCH_MP.ENDADDLEN, dEndAddLen)
-            '      ' recupero tipo entità, angolo con entità precedente e successiva, lunghezze libere iniziale e finale
-            '      Mach.m_bIsLine = True
-            '      Mach.m_dPrevAng = 0
-            '      Mach.m_dNextAng = 0
-            '      Mach.m_dStartFreeLen = FREELEN_INF + 1
-            '      Mach.m_dEndFreeLen = FREELEN_INF + 1
-            '      Dim nEntId, nSub As Integer
-            '      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 Or Mach.m_bMngLeadInOnIntCorner) And
-            '         Mach.m_sLay = NAME_OUTLOOP And ( Mach.m_nInterf And FMI_TYPE.RM) = 0 Then
-            '         Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
-            '         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
-
-            '      ElseIf (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-            '         Mach.m_sLay = NAME_OUTLOOP And
-            '         (Mach.m_nInterf = FMI_TYPE.LI Or Mach.m_nInterf = FMI_TYPE.LO Or Mach.m_nInterf = FMI_TYPE.RM) Then
-            '         Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
-            '         Dim bIn As Boolean = False
-            '         Dim bOut As Boolean = False
-            '         CanExtendSides(Mach, bIn, bOut)
-            '         ' And (nRes And CAR_RES.LI_OK) <> 0 : da aggiungere
-            '         Mach.m_bCanStartAll = (dStartAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-            '                               Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine And bIn And
-            '                               Mach.m_nInterf <> FMI_TYPE.LI
-            '         ' And (nRes And CAR_RES.LO_OK) <> 0 : da aggiungere come sopra
-            '         Mach.m_bCanEndAll = (dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-            '                             Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine And bOut And
-            '                             Mach.m_nInterf <> FMI_TYPE.LO
-            '         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
-            '         EgtSetCurrMachining(nOperId)
-            '         Dim nLiType As Integer
-            '         EgtGetMachiningParam(MCH_MP.LEADINTYPE, nLiType)
-            '         Dim nLoType As Integer
-            '         EgtGetMachiningParam(MCH_MP.LEADOUTTYPE, nLoType)
-            '         Mach.m_bStartAll = (nLiType = MCH_SAW_LI.EXT_CENT Or nLiType = MCH_SAW_LI.EXT_OUT)
-            '         Mach.m_bEndAll = (nLoType = MCH_SAW_LO.EXT_CENT Or nLoType = MCH_SAW_LO.EXT_OUT)
-            '      Else
-            '         Mach.m_bStartAll = False
-            '         Mach.m_bEndAll = False
-            '      End If
-            '      ' Waterjet
-            '   ElseIf Mach.m_nType = MCH_OY.WATERJETTING Then
-            '      Mach.m_nInterf = FMI_TYPE.NONE
-            '      ' recupero l'angolo di fianco
-            '      EgtGetMachiningParam(MCH_MP.SIDEANGLE, Mach.m_dSideAng)
-            '      Mach.m_bCanStartAll = False
-            '      Mach.m_bCanEndAll = False
-            '      Mach.m_bStartAll = False
-            '      Mach.m_bEndAll = False
-            '      ' Forature e fresature
-            '   Else
-            '      Mach.m_nInterf = FMI_TYPE.NONE
-            '      Mach.m_dSideAng = 0
-            '      Mach.m_bCanStartAll = False
-            '      Mach.m_bCanEndAll = False
-            '      Mach.m_bStartAll = False
-            '      Mach.m_bEndAll = False
-            '   End If
-            '   ' abilitazione
-            '   Mach.m_bEnabled = Not EgtExistsInfo(nOperId, INFO_MCH_USER_OFF)
-            '   ' pausa
-            '   Mach.m_bPause = GetPause(nOperId)
-            '   ' inserisco in lista
-            '   MachSplitList.Add(Mach)
-            '   ' altrimenti la disattivo
-            'Else
-            '   EgtSetOperationMode(nOperId, False)
-            'End If
-
          End If
          nOperId = EgtGetNextOperation(nOperId)
       End While
@@ -262,6 +124,8 @@ Public Module SplitAuto
                Mach.m_nEntId = nEntId
                EgtGetInfo(nOperId, "ManageLeadInOnIntCorner", Mach.m_bMngLeadInOnIntCorner)
             End If
+            Mach.m_bFinalCut = False
+            EgtGetInfo(nOperId, "FinalCut", Mach.m_bFinalCut)
             ' verifico se trasformabile in un taglio di separazione (almeno da un lato)
             If (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
                      Mach.m_sLay = NAME_OUTLOOP And (Mach.m_nInterf And FMI_TYPE.RM) = 0 Then
@@ -429,7 +293,7 @@ Public Module SplitAuto
                ' Se macchina con cambio utensile di lama
                If m_MainWindow.m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then
                   Dim sSawing As String = String.Empty, sSaw As String = String.Empty
-                  m_MainWindow.m_CadCutPageUC.m_SplitPage.GetCurrSawingandSaw(nOperId, sSawing, sSaw)
+                  m_MainWindow.m_CadCutPageUC.m_SplitPage.GetCurrSawingAndSaw(nOperId, sSawing, sSaw)
                   ' Setto l'utensile corrente
                   EgtTdbSetCurrTool(sSaw)
                   ' recupero il colore della lavorazione direttamente dall'utensile

CadCuts/SplitPageUC.xaml.vb

@@ -201,8 +201,9 @@ Public Class SplitPageUC
             If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL Then
                sText = EgtMsg(90791) & " " & i.ToString()
                If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
+               If Mach.m_bFinalCut Then AddFinalText(sText)
             Else
-               sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
+                  sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
             End If
             If Mach.m_bPause Then AddPauseText(sText)
             AddItemToList(i, Mach, sText, MCH_OY.SAWING)
@@ -236,7 +237,7 @@ Public Class SplitPageUC
       ' Visualizzo la posizione utensile solo se configurata
       If m_MainWindow.m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then
          Dim sSawing As String = String.Empty, sSaw As String = String.Empty
-         GetCurrSawingandSaw(Mach.m_nId, sSawing, sSaw)
+         GetCurrSawingAndSaw(Mach.m_nId, sSawing, sSaw)
          ' Verifico che sia montata su un portautensile
          EgtTdbSetCurrTool(sSaw)
          EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sTCPos)
@@ -655,8 +656,15 @@ Public Class SplitPageUC
       Dim SubEntId As Integer = GDB_ID.NULL
       EgtSetCurrMachining(nMchId)
       If Not EgtGetMachiningGeometry(0, EntId, SubEntId) Then Return
+      ' verifico se la lavorazione selezionata ha un angolo di inclinazione
+      Dim dSideAng As Double = 0.0
+      EgtGetMachiningParam(MCH_MP.SIDEANGLE, dSideAng)
+      Dim sDefMach As String = DEF_MACHINING
+      If Math.Abs(dSideAng) > 0 Then
+         sDefMach = DEF_MACHINING_TILTED
+      End If
       ' Recupero il nome della lavorazione
-      EgtGetInfo(EntId, DEF_MACHINING, sSawing)
+      EgtGetInfo(EntId, sDefMach, sSawing)
 
       ' Apro pagina di selezione della lavorazione
       Dim m_ChangeToolPage = New ChangeToolWD(m_MainWindow)
@@ -667,7 +675,7 @@ Public Class SplitPageUC
 
       ' se seleziono "Ok" allora resetto tutte le lavorazioni del progetto
       If m_ChangeToolPage.DialogResult Then
-         EgtSetInfo(EntId, DEF_MACHINING, m_ChangeToolPage.NewSawing)
+         EgtSetInfo(EntId, sDefMach, m_ChangeToolPage.NewSawing)
          Dim Index As Integer = 0
          For Index = 0 To m_MachiningList.Count() - 1
             If m_MachiningList(Index).m_nId = nMchId Then
@@ -697,13 +705,20 @@ Public Class SplitPageUC
       End If
    End Sub
 
-   Public Sub GetCurrSawingandSaw(ByVal nMchId As Integer, ByRef sSawing As String, ByRef sNameTool As String)
+   Public Sub GetCurrSawingAndSaw(ByVal nMchId As Integer, ByRef sSawing As String, ByRef sNameTool As String)
       Dim EntId As Integer = GDB_ID.NULL
       Dim SubEntId As Integer = GDB_ID.NULL
       EgtSetCurrMachining(nMchId)
       If Not EgtGetMachiningGeometry(0, EntId, SubEntId) Then Return
+      ' verifico se la lavorazione selezionata ha un angolo di inclinazione
+      Dim dSideAng As Double = 0.0
+      EgtGetMachiningParam(MCH_MP.SIDEANGLE, dSideAng)
+      Dim sDefMach As String = DEF_MACHINING
+      If Math.Abs(dSideAng) > EPS_ANG_SMALL Then
+         sDefMach = DEF_MACHINING_TILTED
+      End If
       ' Eventualmente recupero il nome della lavorazione
-      EgtGetInfo(EntId, DEF_MACHINING, sSawing)
+      EgtGetInfo(EntId, sDefMach, sSawing)
       If String.IsNullOrEmpty(sSawing) Then sSawing = m_MainWindow.m_CurrentMachine.sCurrSawing
       ' Imposto la lavorazione corrente
       EgtMdbSetCurrMachining(sSawing)
@@ -849,6 +864,10 @@ Public Class SplitPageUC
       sName &= EgtMsg(91217)    '   Top
    End Sub
 
+   Private Sub AddFinalText(ByRef sName As String)
+      sName = "Final " & sName
+   End Sub
+
    Private Sub RemovePauseText(ByRef sName As String)
       sName = sName.Replace(EgtMsg(MSG_SPLITPAGEUC + 32), "")
       sName = sName.TrimEnd()

Constants/ConstGen.vb

@@ -327,6 +327,8 @@ Module ConstGen
    Public Const SPLIT_CUT As String = "SplitCut"
    ' Forzo specifica lavorazione
    Public Const DEF_MACHINING As String = "Def_Machining"
+   ' Forzo specifica lavorazione solo per tagli con inclinazione
+   Public Const DEF_MACHINING_TILTED As String = "Def_Machining_Tilted"
 
    ' Nome di pezzo che è una cornice
    Public Const NAME_FRAME As String = "Frame"

Constants/ConstIni.vb

@@ -284,6 +284,8 @@ Module ConstIni
    Public Const K_MACHINESDIR As String = "MachinesDir"
    Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
    Public Const K_CURRMACH As String = "CurrMach"
+   Public Const K_ENABLEFINALSAWCUT As String = "EnableFinalSawCut"
+   Public Const K_FINALDEPTH As String = "FinalDepth"
 
    Public Const S_SIMUL As String = "Simul"
    Public Const K_SLIDERX As String = "SliderX"
@@ -354,6 +356,9 @@ Module ConstIni
    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 K_ENABLECUSTOMGRID As String = "EnableCustomGrid"
+   Public Const K_GRIDNUMDIMXCUSTOM As String = "GridNumDimXCustom"
+   Public Const K_GRIDNUMDIMYCUSTOM As String = "GridNumDimYCustom"
 
    Public Const S_STATDATA As String = "StatData"
    Public Const K_SD_DAY As String = "Day"

DirectCuts/ControlsDirectCutUC.xaml.vb

@@ -78,6 +78,7 @@ Public Class ControlsDirectCutUC
       ' 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)

DirectCuts/CustomGridUC.xaml

@@ -0,0 +1,80 @@
+<UserControl x:Class="CustomGridUC"
+             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}"
+             Background="#636974">
+
+   <Grid Name ="CustomGrid" Grid.Row="5" Grid.ColumnSpan="2">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="2.5*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+
+      <UniformGrid Grid.Row="0"
+                   Grid.ColumnSpan="2"
+                   Columns="4"
+                   Margin="2,2,0,2">
+         <Button Name="AddCutBtn" Content="+" 
+                 Style="{DynamicResource OmagCut_YellowTextButton}"
+                 Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+         <Button Name="RemoveCutBtn" Content="-" 
+                 Style="{DynamicResource OmagCut_YellowTextButton}"
+                 Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+         <ToggleButton Name="Cut_XTgBtn" Content="X"
+                       Style="{DynamicResource OmagCut_YellowToggleButton}"
+                       Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+         <ToggleButton Name="Cut_YTgBtn" Content="Y"
+                       Style="{DynamicResource OmagCut_YellowToggleButton}"
+                       Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+      </UniformGrid>
+
+      <TextBlock Name="NumPzXTxBl" Text="Number" Grid.Column="0" Grid.Row="1" HorizontalAlignment="Center"
+                 Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+      <TextBlock Name="DimPzXTxBl" Text="Dimension" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center"
+                 Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+
+      <ScrollViewer Background="Transparent" Grid.Row="2"  
+                    Grid.ColumnSpan="2"
+                    VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
+         <ListBox Name="CustomGridLstBx" ScrollViewer.CanContentScroll="False">
+            <ItemsControl.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <StackPanel Orientation="Vertical"/>
+               </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+               <DataTemplate>
+                  <Grid Width="210">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="5*"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="5*"/>
+                     </Grid.ColumnDefinitions>
+                     <EgtWPFLib:EgtTextBox Text="{Binding sNumber}" Grid.Column="0"
+                                           Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                     <EgtWPFLib:EgtTextBox Text="{Binding sInteraxis}" Grid.Column="2"
+                                           Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                  </Grid>
+               </DataTemplate>
+            </ItemsControl.ItemTemplate>
+         </ListBox>
+      </ScrollViewer>
+      <UniformGrid Grid.Row="3"
+                   Grid.ColumnSpan="2"
+                   Columns="2"
+                   Margin="0,2,0,2">
+         <Button Name="UpdateBtn" Content="Update" 
+                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
+         <Button Name="ExitBtn" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Button>
+      </UniformGrid>
+   </Grid>
+</UserControl>

DirectCuts/CustomGridUC.xaml.vb

@@ -0,0 +1,78 @@
+Imports EgtUILib
+
+Public Class CustomGridUC
+
+#Region "FIELDS & PROPERTIES"
+
+   ' Riferimento a GridCut
+   Private m_refGridCut As GridCut
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(GC As GridCut)
+      InitializeComponent()
+      m_refGridCut = GC
+      CustomGridLstBx.ItemsSource = m_refGridCut.m_ListOfCut_X
+      Cut_XTgBtn.IsChecked = True
+   End Sub
+
+#End Region    ' Constructor
+
+#Region "EVENTS"
+
+   Private Sub CutX_Selected() Handles Cut_XTgBtn.Click
+      If Cut_XTgBtn.IsChecked Then
+         Cut_YTgBtn.IsChecked = False
+         CustomGridLstBx.ItemsSource = m_refGridCut.m_ListOfCut_X
+         CustomGridLstBx.UpdateLayout()
+      End If
+   End Sub
+
+   Private Sub CutY_Selected() Handles Cut_YTgBtn.Click
+      If Cut_YTgBtn.IsChecked Then
+         Cut_XTgBtn.IsChecked = False
+         CustomGridLstBx.ItemsSource = m_refGridCut.m_ListOfCut_Y
+         CustomGridLstBx.UpdateLayout()
+      End If
+   End Sub
+
+   Private Sub AddCut_Click(sender As Object, e As EventArgs) Handles AddCutBtn.Click
+      If Cut_XTgBtn.IsChecked Then
+         m_refGridCut.m_ListOfCut_X.Add(New Cut_Axis(0, 0))
+      ElseIf Cut_YTgBtn.IsChecked Then
+         m_refGridCut.m_ListOfCut_Y.Add(New Cut_Axis(0, 0))
+      End If
+      CustomGridLstBx.UpdateLayout()
+   End Sub
+
+   Private Sub RemoveCut_Click(sender As Object, e As EventArgs) Handles RemoveCutBtn.Click
+      Dim CurrIndexListSelected As Integer = -1
+      CurrIndexListSelected = CustomGridLstBx.SelectedIndex
+      If Cut_XTgBtn.IsChecked Then
+         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_refGridCut.m_ListOfCut_X.Count - 1 Then
+            CurrIndexListSelected = m_refGridCut.m_ListOfCut_X.Count - 1
+         End If
+         m_refGridCut.m_ListOfCut_X.RemoveAt(CurrIndexListSelected)
+      ElseIf Cut_YTgBtn.IsChecked Then
+         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_refGridCut.m_ListOfCut_Y.Count - 1 Then
+            CurrIndexListSelected = m_refGridCut.m_ListOfCut_Y.Count - 1
+         End If
+         m_refGridCut.m_ListOfCut_Y.RemoveAt(CurrIndexListSelected)
+      End If
+      CustomGridLstBx.UpdateLayout()
+   End Sub
+
+   Public Sub Update_Click() Handles UpdateBtn.Click
+      m_refGridCut.CreateGridCut()
+      EgtDraw()
+   End Sub
+
+   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
+      m_refGridCut.SingleCutGrid.Children.Remove(Me)
+   End Sub
+
+#End Region    ' Events
+
+End Class

DirectCuts/FlatteningCut.xaml.vb

@@ -1,6 +1,7 @@
 Imports System.Reflection
 Imports EgtUILib
 Imports EgtUILib.EgtInterface
+Imports OmagCUT.MainWindow
 
 Public Class FlatteningCut
 
@@ -11,6 +12,8 @@ Public Class FlatteningCut
    Private m_bActive As Boolean = False
    ' Flag di simulazione in corso
    Private m_bSimul As Boolean = False
+   ' Definizione del taglio diretto di questa pagina
+   Private Const FLATTENING As String = "Flattening"
 
    ' Origine tavola e dati grezzo
    Private m_bRawOk As Boolean = False
@@ -725,7 +728,8 @@ Public Class FlatteningCut
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
-      EgtSetInfo(nCutId, INFO_DIRECTCUT, 1)
+      ' Inidico che è un taglio Diretto di tipo Flattening
+      EgtSetInfo(nCutId, INFO_DIRECTCUT, FlagDirectCuts.Flattening)
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
       If (m_nTool = TOOL.MILL) Then
@@ -844,8 +848,8 @@ Public Class FlatteningCut
                   End If
                End If
             End If
-               CutsList.Add(nCut2Id)
-            End If
+            CutsList.Add(nCut2Id)
+         End If
          ' ----------------------- CREO SEGMENTI PER CONCATENAMENTO CURVE -----------------------
 
       Next
@@ -876,7 +880,8 @@ Public Class FlatteningCut
          Dim ptNear As Point3d
          EgtStartPoint(CutsList(0), ptNear)
          Dim IdJointCurv As Integer = EgtCreateCurveCompoByChain(nLayerId, CutsList.ToArray, ptNear, True)
-         EgtSetInfo(IdJointCurv, INFO_DIRECTCUT, 1)
+         ' Inidico che è un taglio Diretto di tipo Flattening
+         EgtSetInfo(IdJointCurv, INFO_DIRECTCUT, FlagDirectCuts.Flattening)
          EgtSetInfo(IdJointCurv, INFO_STEP_TYPE, m_nMachType)
          EgtSetInfo(IdJointCurv, INFO_WIDTH, dThick)
          ' Se unisco il percorso devo per forza usare la fresa!

DirectCuts/GridCut.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="GridCut"
-   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">
+             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}">
@@ -34,19 +34,19 @@
                <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="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>
+            <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">
+                   Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
@@ -55,21 +55,22 @@
          </ComboBox>
 
          <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-         <Grid Grid.Row="5" Grid.ColumnSpan="2">
+         <!-- STANDARD -->
+         <Grid Name ="StandardGrid" Grid.Row="5" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1.5*"/>
                <ColumnDefinition Width="2"/>
@@ -85,31 +86,98 @@
             <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}"/>
+                       Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
             <TextBlock Name="DimPzXTxBl" Grid.Column="2" Grid.Row="0"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                       Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
 
             <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzXTxBx" Grid.Column="2" Grid.Row="1" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
+                                  Style="{StaticResource OmagCut_CalculatorTextBox}" />
+   
             <TextBlock Name="NumPzYTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                       Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
             <TextBlock Name="DimPzYTxBl" Grid.Column="2" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                       Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
 
             <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzYTxBx" Grid.Column="2" Grid.Row="3" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}" />
+                                  Style="{StaticResource OmagCut_CalculatorTextBox}" />
 
          </Grid>
 
+         <Button Name="CustomGridBtn" Grid.Row="5" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}" 
+                 Margin="10,30,10,30">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-grigliaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" Height="90" Width="90" />
+               <TextBlock Name="GridCutTxt" Grid.Column="1"
+                          HorizontalAlignment="Left"
+                          Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <!-- SPECIALE -->
+         <!--<Grid Name ="CustomGrid" Grid.Row="5" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="2.5*"/>
+            </Grid.RowDefinitions>
+
+            <StackPanel Orientation="Horizontal" Grid.Row="0">
+               <Button Name="AddCutBtn" Content="+" 
+                       Style="{DynamicResource OmagCut_YellowTextButton}"
+                       Width="35" Height="35" HorizontalAlignment="Left"/>
+               <Button Name="RemoveCutBtn" Content="-" 
+                       Style="{DynamicResource OmagCut_YellowTextButton}"
+                       Width="35" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+               <ToggleButton Name="Cut_XTgBtn" Content="X"
+                             Style="{DynamicResource OmagCut_YellowToggleButton}"
+                             Width="35" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+               <ToggleButton Name="Cut_YTgBtn" Content="Y"
+                             Style="{DynamicResource OmagCut_YellowToggleButton}"
+                             Width="35" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+               <Button Name="UpdateBtn" Content="Update" 
+                       Style="{DynamicResource OmagCut_YellowTextButton}"
+                       Width="85" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+            </StackPanel>
+
+            <ScrollViewer Background="Transparent" Grid.Row="1"
+                          Margin="0,5,0,0"
+                          VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
+               <ListBox Name="CustomGridLstBx" ScrollViewer.CanContentScroll="False">
+                  <ItemsControl.ItemsPanel>
+                     <ItemsPanelTemplate>
+                        <StackPanel Orientation="Vertical"/>
+                     </ItemsPanelTemplate>
+                  </ItemsControl.ItemsPanel>
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid Width="210">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="5*"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="5*"/>
+                           </Grid.ColumnDefinitions>
+                           <EgtWPFLib:EgtTextBox Text="{Binding sNumber}" Grid.Column="0"
+                                                 Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                           <EgtWPFLib:EgtTextBox Text="{Binding sInteraxis}" Grid.Column="2"
+                                                 Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ListBox>
+            </ScrollViewer>
+         </Grid>-->
+
          <TextBlock Name="SideTxBl" Grid.Row="6" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    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"/>
+                   HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
          <Grid Grid.Row="7" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
@@ -119,13 +187,13 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
          </Grid>
 
          <Grid Grid.Row="11" Grid.ColumnSpan="2">
@@ -135,19 +203,17 @@
                <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>
-
 </UserControl>

DirectCuts/GridCut.xaml.vb

@@ -1,4 +1,5 @@
 Imports EgtUILib
+Imports System.Collections.ObjectModel
 
 Public Class GridCut
    ' Riferimenti a pagine
@@ -41,6 +42,12 @@ Public Class GridCut
    ' Gestione spessore lama
    Private m_bSawTh As Boolean = False
 
+   ' Gestione griglia Custom
+   Dim m_bCustomGrid As Boolean = False
+   Public m_ListOfCut_X As New ObservableCollection(Of Cut_Axis)
+   Public m_ListOfCut_Y As New ObservableCollection(Of Cut_Axis)
+   Friend m_CustomGrid As CustomGridUC
+
    ' Costanti
    Private Const MAX_TAB_DEPTH As Double = 10.0
    Private Const MIN_CUT_LEN As Double = 10.0
@@ -77,22 +84,59 @@ Public Class GridCut
       SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
       SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
       OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      GridCutTxt.Text = EgtMsg(90264)
       ' Carico i dati dell'ultimo taglio
-      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
-      m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
-      m_dAngV = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
-      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_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
+      m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
+      m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
+      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_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
+      m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
+      m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
+      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())
 
+      ' Carico i dati per i tagli di griglia Custom
+      m_bCustomGrid = (GetPrivateProfileInt(S_DIRECTCUTS, K_ENABLECUSTOMGRID, 0, m_MainWindow.GetIniFile()) <> 0)
+      If m_bCustomGrid Then
+         LoadCustomData(K_GRIDNUMDIMXCUSTOM, m_ListOfCut_X)
+         LoadCustomData(K_GRIDNUMDIMYCUSTOM, m_ListOfCut_Y)
+      End If
+
       ' --- 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())
+      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())
+
+   End Sub
+
+   ' Lettura dei dati della griglia Custom
+   Private Sub LoadCustomData(sIpKeyName As String, LocalList As ObservableCollection(Of Cut_Axis))
+      Dim dVal As Double = 0
+      Dim nVal As Integer = 0
+      Dim sVal As String = String.Empty
+      GetPrivateProfileString(S_DIRECTCUTS, sIpKeyName, sVal, sVal, m_MainWindow.GetIniFile())
+      Dim sItems As String() = sVal.Split(";"c)
+      If sItems.Count > 0 Then
+         For Each Item As String In sItems
+            Dim sSubItems As String() = Item.Split(",")
+            If sSubItems.Count = 2 Then
+               If IsNumeric(sSubItems(0)) And IsNumeric(sSubItems(1)) Then
+                  nVal = CInt(sSubItems(0))
+                  StringToDouble(sSubItems(1), dVal)
+                  LocalList.Add(New Cut_Axis(nVal, dVal))
+               End If
+
+            End If
+         Next
+      End If
    End Sub
 
    Private Sub GridCut_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -131,7 +175,8 @@ Public Class GridCut
       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 = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG())
       m_ptPrev.z = m_ptRawMax.z
       ' Disegno crocetta che indica il punto acquisito
       CreateCross(m_nTempLay, m_ptPrev)
@@ -140,13 +185,18 @@ Public Class GridCut
       SetCoordVisibility(True)
       ShowCoord()
       ' Assegno parametri di lavorazione
-      DepthTxBx.Text = LenToString( m_dDepth, 1)
-      DirectionTxBx.Text = DoubleToString( m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
-      SideAngleTxBx.Text = DoubleToString( m_dAngV, 2)
+      DepthTxBx.Text = LenToString(m_dDepth, 1)
+      DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
+      SideAngleTxBx.Text = DoubleToString(m_dAngV, 2)
+      DepthTxBx.Text = LenToString(m_dDepth, 1)
+      DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
+      SideAngleTxBx.Text = DoubleToString(m_dAngV, 2)
       NumPzXTxBx.Text = m_nNumX.ToString()
-      DimPzXTxBx.Text = LenToString( m_dDimX, 1)
+      DimPzXTxBx.Text = LenToString(m_dDimX, 1)
+      DimPzXTxBx.Text = LenToString(m_dDimX, 1)
       NumPzYTxBx.Text = m_nNumY.ToString()
-      DimPzYTxBx.Text = LenToString( m_dDimY, 1)
+      DimPzYTxBx.Text = LenToString(m_dDimY, 1)
+      DimPzYTxBx.Text = LenToString(m_dDimY, 1)
       SideChBx.IsChecked = m_bHeadSide
 
       ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
@@ -162,21 +212,51 @@ Public Class GridCut
       Point1Btn.IsChecked = False
       ' Aggiorno visualizzazione
       EgtDraw()
+
+      If m_bCustomGrid Then
+         StandardGrid.Visibility = Visibility.Hidden
+         CustomGridBtn.Visibility = Visibility.Visible
+         m_CustomGrid = New CustomGridUC(Me)
+         'CustomGrid.Visibility = Visibility.Visible
+         'Cut_XTgBtn.IsChecked = True
+         'CustomGridLstBx.ItemsSource = m_ListOfCut_X
+      Else
+         StandardGrid.Visibility = Visibility.Visible
+         CustomGridBtn.Visibility = Visibility.Hidden
+         'CustomGrid.Visibility = Visibility.Hidden
+      End If
+
    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())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_ANGH, DoubleToString( m_dAngO, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_ANGV, DoubleToString( m_dAngV, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX.ToString(), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_DIMX, DoubleToString( m_dDimX, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY.ToString(), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_DIMY, DoubleToString( m_dDimY, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_HEADSIDE, If( m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_POSY, DoubleToString( m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DEPTH, DoubleToString(m_dDepth, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_ANGH, DoubleToString(m_dAngO, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_ANGV, DoubleToString(m_dAngV, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX.ToString(), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DIMX, DoubleToString(m_dDimX, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY.ToString(), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DIMY, DoubleToString(m_dDimY, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_HEADSIDE, If(m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_POSX, DoubleToString(m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+
+      If m_bCustomGrid Then
+         Dim sGridNumDimXCustom As String = ""
+         For Index_X As Integer = 0 To m_ListOfCut_X.Count - 1
+            sGridNumDimXCustom &= m_ListOfCut_X(Index_X).sNumber & "," & DoubleToString(m_ListOfCut_X(Index_X).dInteraxis, 2) & ";"
+         Next
+         If sGridNumDimXCustom <> "" Then sGridNumDimXCustom = sGridNumDimXCustom.Remove(sGridNumDimXCustom.Count - 1)
+         WritePrivateProfileString(S_DIRECTCUTS, "GridNumDimXCustom", sGridNumDimXCustom, m_MainWindow.GetIniFile())
+         Dim sGridNumDimYCustom As String = ""
+         For Index_Y As Integer = 0 To m_ListOfCut_Y.Count - 1
+            sGridNumDimYCustom &= m_ListOfCut_Y(Index_Y).sNumber & "," & DoubleToString(m_ListOfCut_Y(Index_Y).dInteraxis, 2) & ";"
+         Next
+         If sGridNumDimYCustom <> "" Then sGridNumDimYCustom = sGridNumDimYCustom.Remove(sGridNumDimYCustom.Count - 1)
+         WritePrivateProfileString(S_DIRECTCUTS, "GridNumDimYCustom", sGridNumDimYCustom, m_MainWindow.GetIniFile())
+      End If
+
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
@@ -315,7 +395,7 @@ Public Class GridCut
          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
@@ -405,7 +485,7 @@ Public Class GridCut
          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
@@ -521,6 +601,64 @@ Public Class GridCut
       EgtDraw()
    End Sub
 
+   Private Sub CustomGridBtn_Click(sender As Object, e As RoutedEventArgs) Handles CustomGridBtn.Click
+      m_CustomGrid.SetValue(Grid.RowProperty, 1)
+      m_CustomGrid.SetValue(Grid.RowSpanProperty, 6)
+      m_CustomGrid.SetValue(Grid.ColumnSpanProperty, 2)
+      SingleCutGrid.Children.Add(m_CustomGrid)
+   End Sub
+
+   '#Region "CUSTOM LIST GRID"
+
+   '   Private Sub CutX_Selected() Handles Cut_XTgBtn.Click
+   '      If Cut_XTgBtn.IsChecked Then
+   '         Cut_YTgBtn.IsChecked = False
+   '         CustomGridLstBx.ItemsSource = m_ListOfCut_X
+   '         CustomGridLstBx.UpdateLayout()
+   '      End If
+   '   End Sub
+
+   '   Private Sub CutY_Selected() Handles Cut_YTgBtn.Click
+   '      If Cut_YTgBtn.IsChecked Then
+   '         Cut_XTgBtn.IsChecked = False
+   '         CustomGridLstBx.ItemsSource = m_ListOfCut_Y
+   '         CustomGridLstBx.UpdateLayout()
+   '      End If
+   '   End Sub
+
+   '   Private Sub AddCut_Click(sender As Object, e As EventArgs) Handles AddCutBtn.Click
+   '      If Cut_XTgBtn.IsChecked Then
+   '         m_ListOfCut_X.Add(New Cut_Axis(0, 0))
+   '      ElseIf Cut_YTgBtn.IsChecked Then
+   '         m_ListOfCut_Y.Add(New Cut_Axis(0, 0))
+   '      End If
+   '      CustomGridLstBx.UpdateLayout()
+   '   End Sub
+
+   '   Private Sub RemoveCut_Click(sender As Object, e As EventArgs) Handles RemoveCutBtn.Click
+   '      Dim CurrIndexListSelected As Integer = -1
+   '      CurrIndexListSelected = CustomGridLstBx.SelectedIndex
+   '      If Cut_XTgBtn.IsChecked Then
+   '         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_ListOfCut_X.Count - 1 Then
+   '            CurrIndexListSelected = m_ListOfCut_X.Count - 1
+   '         End If
+   '         m_ListOfCut_X.RemoveAt(CurrIndexListSelected)
+   '      ElseIf Cut_YTgBtn.IsChecked Then
+   '         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_ListOfCut_Y.Count - 1 Then
+   '            CurrIndexListSelected = m_ListOfCut_Y.Count - 1
+   '         End If
+   '         m_ListOfCut_Y.RemoveAt(CurrIndexListSelected)
+   '      End If
+   '      CustomGridLstBx.UpdateLayout()
+   '   End Sub
+
+   '   Public Sub Update_Click() Handles UpdateBtn.Click
+   '      CreateGridCut()
+   '      EgtDraw()
+   '   End Sub
+
+   '#End Region    ' Custom Grid
+
    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
@@ -544,9 +682,9 @@ Public Class GridCut
       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
@@ -578,7 +716,7 @@ Public Class GridCut
       m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
-   Private Function CreateGridCut() As Boolean
+   Friend Function CreateGridCut() As Boolean
       ' Verifico sia definito il punto iniziale e il grezzo
       If Not m_bPointP1Ok Or Not m_bRawOk Then
          m_bCutOk = False
@@ -630,11 +768,18 @@ Public Class GridCut
    End Function
 
    Private Function MultiplyCut(nLayerId As Integer) As Boolean
+      If m_bCustomGrid Then
+         Return MultiplyCut_1(nLayerId)
+      End If
+      Return MultiplyCut_0(nLayerId)
+   End Function
+
+   Private Function MultiplyCut_0(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)
+      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
       Dim dThick As Double = 0
-      EgtTdbGetCurrToolParam( If( nType = MCH_TY.SAW_STD, MCH_TP.THICK, MCH_TP.DIAM), dThick)
+      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
@@ -656,7 +801,8 @@ 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)
-
+         ' Inidico che è un taglio Diretto di tipo GridCut
+         EgtSetInfo(nCutParaId, INFO_DIRECTCUT, MainWindow.FlagDirectCuts.GridCut)
          ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
          ' Recupero spessore lama corrente
          Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
@@ -683,7 +829,8 @@ 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)
-
+         ' Inidico che è un taglio Diretto di tipo GridCut
+         EgtSetInfo(nCutPerpId, INFO_DIRECTCUT, MainWindow.FlagDirectCuts.GridCut)
          ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
          If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then
             EgtOffsetCurve(nCutPerpId, -dThick, OFF_TYPE.EXTEND)
@@ -711,6 +858,116 @@ Public Class GridCut
       Return True
    End Function
 
+   Private Function MultiplyCut_1(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 = If(SideChBx.IsChecked(), -90, 90)
+
+      ' Recupero dati da interfaccia
+      Dim dDimPzX As Double = If(m_ListOfCut_X.Count = 0, 0.0, m_ListOfCut_X(0).dInteraxis)
+      Dim nNumPzX As Integer = If(m_ListOfCut_X.Count = 0, 0, m_ListOfCut_X(0).nNumber)
+
+      Dim dDimPzY As Double = If(m_ListOfCut_Y.Count = 0, 0.0, m_ListOfCut_Y(0).dInteraxis)
+      Dim nNumPzY As Integer = If(m_ListOfCut_Y.Count = 0, 0, m_ListOfCut_Y(0).nNumber)
+
+      Dim TotLenX As Double = 0
+      For Ind_X As Integer = 0 To m_ListOfCut_X.Count - 1
+         TotLenX = TotLenX + (m_ListOfCut_X(Ind_X).dInteraxis + dThick) * m_ListOfCut_X(Ind_X).nNumber
+      Next
+
+      Dim TotLenY As Double = 0
+      For Ind_Y As Integer = 0 To m_ListOfCut_Y.Count - 1
+         TotLenY = TotLenY + (m_ListOfCut_Y(Ind_Y).dInteraxis + dThick) * m_ListOfCut_Y(Ind_Y).nNumber
+      Next
+
+      ' 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
+         ' -------------- TAGLI PARALLELI ASSE Y --------------
+         Dim dLenX As Double = dThick + TotLenX
+         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)
+
+         For IndexList_Y As Integer = 0 To m_ListOfCut_Y.Count - 1
+            Dim nCut2Id As Integer = GDB_ID.NULL
+            dDimPzY = m_ListOfCut_Y(IndexList_Y).dInteraxis
+            nNumPzY = m_ListOfCut_Y(IndexList_Y).nNumber
+            ' 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
+               nCut2Id = EgtCopyGlob(nCutParaId, nLayerId)
+               EgtMove(nCut2Id, vtPerpMove, GDB_RT.GLOB)
+            Next
+            nCutParaId = nCut2Id
+         Next
+
+         ' -------------- TAGLI PARALLELI ASSE X --------------
+         ' Calcolo primo taglio perpendicolare
+         Dim dLenY As Double = dThick + TotLenY
+         ' 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)
+            EgtMirror(nCutPerpId, ptStart + Vector3d.FromPolar(dThick / 2, m_dAngO - 90), vtRot, GDB_RT.GLOB)
+            EgtInvertCurve(nCutPerpId)
+         End If
+
+         ' Imposto affondamento e angolo di fianco sul taglio
+         EgtSetInfo(nCutPerpId, INFO_DEPTH, m_dDepth)
+         EgtSetInfo(nCutPerpId, INFO_SIDE_ANGLE, m_dAngV)
+
+         For IndexList_X As Integer = 0 To m_ListOfCut_X.Count - 1
+            Dim nCut3Id As Integer = GDB_ID.NULL
+            dDimPzX = m_ListOfCut_X(IndexList_X).dInteraxis
+            nNumPzX = m_ListOfCut_X(IndexList_X).nNumber
+            ' 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
+               nCut3Id = EgtCopyGlob(nCutPerpId, nLayerId)
+               EgtMove(nCut3Id, vtPerpMove, GDB_RT.GLOB)
+            Next
+            nCutPerpId = nCut3Id
+         Next
+
+      End If
+      Return True
+   End Function
+
    Private Function CreateCross(nLayerId As Integer, ptP As Point3d) As Boolean
       ptP += New Vector3d(0, 0, 0.15)
       ' Aggiungo crocette
@@ -725,10 +982,10 @@ Public Class GridCut
 
    Private Sub NumPzsTxBx_EgtClosed(sender As Object, e As EventArgs) Handles NumPzXTxBx.EgtClosed, NumPzYTxBx.EgtClosed,
                                                                               DimPzXTxBx.EgtClosed, DimPzYTxBx.EgtClosed, SideChBx.Click
-      StringToInt( NumPzXTxBx.Text, m_nNumX)
-      StringToLen( DimPzXTxBx.Text, m_dDimX)
-      StringToInt( NumPzYTxBx.Text, m_nNumY)
-      StringToLen( DimPzYTxBx.Text, m_dDimY)
+      StringToInt(NumPzXTxBx.Text, m_nNumX)
+      StringToLen(DimPzXTxBx.Text, m_dDimX)
+      StringToInt(NumPzYTxBx.Text, m_nNumY)
+      StringToLen(DimPzYTxBx.Text, m_dDimY)
       m_bHeadSide = SideChBx.IsChecked
       ' Disegno il taglio
       CreateGridCut()
@@ -770,4 +1027,56 @@ Public Class GridCut
       Return True
    End Function
 
+End Class
+
+Public Class Cut_Axis
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   ' Numero di tagli con questo interasse
+   Private m_nNumber As Integer = 0
+   Public Property sNumber As String
+      Get
+         Return m_nNumber.ToString
+      End Get
+      Set(value As String)
+         If IsNumeric(value) Then
+            m_nNumber = CInt(value)
+         End If
+      End Set
+   End Property
+   Public ReadOnly Property nNumber As Double
+      Get
+         Return m_nNumber
+      End Get
+   End Property
+
+   ' Distanza dal taglio precedente
+   Private m_dInteraxis As Double = 0.0
+   Public Property sInteraxis As String
+      Get
+         Return LenToString(m_dInteraxis, 2)
+      End Get
+      Set(value As String)
+         Dim PrevValue As Double = m_dInteraxis
+         If Not StringToLen(value, m_dInteraxis) Then m_dInteraxis = PrevValue
+      End Set
+   End Property
+   Public ReadOnly Property dInteraxis As Double
+      Get
+         Return m_dInteraxis
+      End Get
+   End Property
+
+   'Public ReadOnly Property UpdateSub As Boolean
+   '   Get
+   '      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_CustomGrid.Update_Click()
+   '      Return True
+   '   End Get
+   'End Property
+
+   Sub New(nNumb As Integer, dInter As Double)
+      m_nNumber = nNumb
+      m_dInteraxis = dInter
+   End Sub
+
 End Class

DirectCuts/SingleCutUC.xaml.vb

@@ -1,5 +1,6 @@
 Imports System.Windows.Threading
 Imports EgtUILib
+Imports OmagCUT.MainWindow
 
 Public Class SingleCutUC
 
@@ -674,6 +675,8 @@ Public Class SingleCutUC
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
       EgtSetInfo(nCutId, INFO_SIDE_ANGLE, m_dAngV)
+      ' Inidico che è un taglio Diretto di tipo SingleCut
+      EgtSetInfo(nCutId, INFO_DIRECTCUT, FlagDirectCuts.SingleCut)
       ' 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

DirectCuts/SingleDrillUC.xaml.vb

@@ -1,4 +1,5 @@
 Imports EgtUILib
+Imports OmagCUT.MainWindow
 Imports System.Collections.ObjectModel
 Public Class SingleDrillUC
    ' Riferimenti a pagine
@@ -438,7 +439,8 @@ Public Class SingleDrillUC
       End If
 
       Dim nCutId = EgtCreateCircle(nLayerId, ptStart, m_dDiameter / 2)
-
+      ' Inidico che è un taglio Diretto di tipo SingleDrill
+      EgtSetInfo(nCutId, INFO_DIRECTCUT, FlagDirectCuts.SingleDrill)
       ' Calcolo punto di inserimento nel grezzo
       Dim ptMin, ptMax As Point3d
       EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, ptMin, ptMax)

DirectCuts/SquaringUC.xaml.vb

@@ -1,4 +1,5 @@
 Imports EgtUILib
+Imports OmagCUT.MainWindow
 
 Public Class SquaringUC
 
@@ -368,6 +369,8 @@ Public Class SquaringUC
       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)
+         ' Inidico che è un taglio Diretto di tipo Squaring
+         EgtSetInfo(nCutParaId, INFO_DIRECTCUT, FlagDirectCuts.Squaring)
          ' Imposto affondamento e angolo di fianco sul taglio (solo se non lama STD)
          If Not nType = MCH_TY.SAW_STD Then
             EgtSetInfo(nCutParaId, INFO_DEPTH, m_dDepth)

DrawImport/CompoDimensionUC.xaml

@@ -29,43 +29,43 @@
         </Grid.RowDefinitions>
 
       <TextBlock Name="Label1" Grid.Row="0"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox1" Grid.Column="1" Grid.Row="0" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label2" Grid.Row="1"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox2" Grid.Column="1" Grid.Row="1" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label3" Grid.Row="2"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox3" Grid.Column="1" Grid.Row="2" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label4" Grid.Row="3"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox4" Grid.Column="1" Grid.Row="3" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label5" Grid.Row="4"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox5" Grid.Column="1" Grid.Row="4" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label6" Grid.Row="5"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox6" Grid.Column="1" Grid.Row="5" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label7" Grid.Row="6"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox7" Grid.Column="1" Grid.Row="6" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label8" Grid.Row="7"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox8" Grid.Column="1" Grid.Row="7" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label9" Grid.Row="8"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox9" Grid.Column="1" Grid.Row="8" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label10" Grid.Row="9"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox10" Grid.Column="1" Grid.Row="9" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 

DrawImport/DrawPageUC.xaml

@@ -95,7 +95,7 @@
             <Grid Name="TopGrd">
 
                <TextBlock Name="TopTxBl"
-                  Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
+                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="TopChBx" Style="{StaticResource OmagCut_CheckBox}"
                   HorizontalAlignment="Right" Margin="6,0,6,0"/>
 
@@ -122,7 +122,7 @@
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
 
-            <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"
+               <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}"/>

DrawImport/SideAngle.vb

@@ -228,7 +228,7 @@ Module SideAngle
                         EgtSetInfo(EntId, INFO_HEEL, dHeel)
                         Dim sSawingTilted As String = m_MainWindow.m_CurrentMachine.sCurrSawingTilted
                         If Not String.IsNullOrEmpty(sSawingTilted) Then
-                           EgtSetInfo(EntId, DEF_MACHINING, sSawingTilted)
+                           EgtSetInfo(EntId, DEF_MACHINING_TILTED, sSawingTilted)
                         End If
                      End If
                   End If

DrawImport/SideAngleOneForAllWindow.xaml

@@ -0,0 +1,83 @@
+<Window x:Class="SideAngleOneForAllWindow"
+        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="ChooseTool" Height="255.9" 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.7*"/>
+            <RowDefinition Height="0.3*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.5*"/>
+         </Grid.RowDefinitions>
+         <TextBlock Name="TitleTxBl"
+                    Grid.ColumnSpan="3"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <Grid Grid.Row="1"
+               Grid.Column="1">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="A °"
+                       Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+            <TextBlock Grid.Column="1" 
+                       Text="T"
+                       Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+            <ComboBox Grid.Row="1"
+                      Name="SideAngleOneForAllCBx"
+                      Margin="10,0,10,0">
+               <ComboBox.ItemTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding}" FontSize="20"/>
+                  </DataTemplate>
+               </ComboBox.ItemTemplate>
+            </ComboBox>
+            <ComboBox Grid.Row="1"
+                      Grid.Column="1"
+                      Name="SideHeelOneForAllCBx"
+                      Margin="10,0,10,0">
+               <ComboBox.ItemTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding}" FontSize="20"/>
+                  </DataTemplate>
+               </ComboBox.ItemTemplate>
+            </ComboBox>            
+         </Grid>
+         
+         <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1">
+            <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>

DrawImport/SideAngleOneForAllWindow.xaml.vb

@@ -0,0 +1,20 @@
+Public Class SideAngleOneForAllWindow
+
+   Sub New()
+
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      TitleTxBl.Text = EgtUILib.EgtMsg(91253)
+   End Sub
+
+   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
+      DialogResult = True
+   End Sub
+
+   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
+      DialogResult = False
+   End Sub
+
+End Class

DrawImport/SideAngleUc.xaml

@@ -1,17 +1,17 @@
 <UserControl x:Class="SideAngleUC"
-   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" 
-   mc:Ignorable="d" 
-   d:DesignHeight="636.9" d:DesignWidth="255.9">
+             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" 
+             mc:Ignorable="d" 
+             d:DesignHeight="636.9" d:DesignWidth="255.9">
 
    <!-- Definizione della Grid Laterale -->
    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1.2*"/>
-         <ColumnDefinition Width="0.3*"/> 
+         <ColumnDefinition Width="0.3*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
@@ -34,182 +34,191 @@
          <RowDefinition Height="0.5*"/>-->
       </Grid.RowDefinitions>
 
-      <Grid>
+      <Grid Name="SideAngleGrid" Grid.ColumnSpan="2">
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.4*"/>
-            <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="0.4*"/>
+            <!--<ColumnDefinition Width="0.4*"/>-->
+            <ColumnDefinition Width="0.8*"/>
+            <ColumnDefinition Width="0.8*"/>
+            <ColumnDefinition Width="0.8*"/>
          </Grid.ColumnDefinitions>
-         <Button Name="PrevBtn" Grid.Column="1" Margin="4,0,4,0" Padding="0" Content="&lt;" Style="{StaticResource OmagCut_YellowTextButton}"/>
-         <Button Name="NextBtn" Grid.Column="2" Margin="4,0,4,0" Padding="0" Content="&gt;" Style="{StaticResource OmagCut_YellowTextButton}"/>
+         <Button Name="PrevBtn" Grid.Column="0" Margin="2,0,2,0" Padding="0" Content="&lt;" Style="{StaticResource OmagCut_YellowTextButton}"/>
+         <Button Name="NextBtn" Grid.Column="1" Margin="2,0,2,0" Padding="0" Content="&gt;" Style="{StaticResource OmagCut_YellowTextButton}"/>
+         <CheckBox Name="SideAngleChBx" Grid.Column="2" Margin="2,0,0,0" Padding="0"/>
       </Grid>
 
       <TextBlock Name="SideAngleBl" Grid.Row="0" Grid.Column="2" Text="A °"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
 
       <TextBlock Name="HeelBl" Grid.Row="0" Grid.Column="3" Text="T"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
 
-      <TextBlock Name="Entity1" Grid.Row="1" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="NewEntity" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="NewA1" Grid.Column="1" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <EgtWPFLib:EgtTextBox Name="NewA1TxBx" Grid.Column="2" Grid.Row="1" Width="60" IsLength="False"
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+      <EgtWPFLib:EgtTextBox Name="NewH1TxBx" Grid.Column="3" Grid.Row="1" Width="60"
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+      <TextBlock Name="Entity1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A1" Grid.Column="1" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H1TxBx" Grid.Column="3" Grid.Row="1" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity2" Grid.Row="2" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity2" Grid.Row="2" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A2" Grid.Column="1" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H2TxBx" Grid.Column="3" Grid.Row="2" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity3" Grid.Row="3" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity3" Grid.Row="3" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A3" Grid.Column="1" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H3TxBx" Grid.Column="3" Grid.Row="3" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity4" Grid.Row="4" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity4" Grid.Row="4" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A4" Grid.Column="1" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H4TxBx" Grid.Column="3" Grid.Row="4" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity5" Grid.Row="5" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity5" Grid.Row="5" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A5" Grid.Column="1" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H5TxBx" Grid.Column="3" Grid.Row="5" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity6" Grid.Row="6" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity6" Grid.Row="6" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A6" Grid.Column="1" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H6TxBx" Grid.Column="3" Grid.Row="6" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity7" Grid.Row="7" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity7" Grid.Row="7" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A7" Grid.Column="1" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H7TxBx" Grid.Column="3" Grid.Row="7" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity8" Grid.Row="8" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity8" Grid.Row="8" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A8" Grid.Column="1" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H8TxBx" Grid.Column="3" Grid.Row="8" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity9" Grid.Row="9" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity9" Grid.Row="9" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A9" Grid.Column="1" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
-         Margin="-20,0,0,0"/>
+                  Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60" IsLength="False"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H9TxBx" Grid.Column="3" Grid.Row="9" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-      <TextBlock Name="Entity10" Grid.Row="10" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <TextBlock Name="Entity10" Grid.Row="10" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A10" Grid.Column="1" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
-          Margin="-20,0,0,0"/>
+                Margin="-20,0,0,0"/>
       <EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60" IsLength="False"
                             Margin="0,0,0,-2"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H10TxBx" Grid.Column="3" Grid.Row="10" Width="60"
                             Margin="0,0,0,-2"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
       <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4" >
-          <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1.5*"/>
-                <ColumnDefinition Width="0.3*"/>
-                <ColumnDefinition Width="0.6*"/>
-                <ColumnDefinition Width="0.6*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
-            </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1.5*"/>
+            <ColumnDefinition Width="0.3*"/>
+            <ColumnDefinition Width="0.6*"/>
+            <ColumnDefinition Width="0.6*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <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"
-               Text="Offset"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter1TxBx" 
-               Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0" 
-               Width="85" Height="30"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+         <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                    Text="Offset"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                    FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter1TxBx" 
+                               Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0" 
+                               Width="85" Height="30"
+                               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-            <TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
-               Text="Offset2"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter2TxBx" 
-               Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" Width="85"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <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" IsLength="False"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                <EgtWPFLib:EgtTextBox Name="Parameter2bTxBx" 
-                                      Grid.Column="3" Grid.Row="12" 
-                                      Width="40" Height="30"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            </UniformGrid>
+         <TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
+                    Text="Offset2"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                    FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter2TxBx" 
+                               Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" Width="85"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <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" IsLength="False"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <EgtWPFLib:EgtTextBox Name="Parameter2bTxBx" 
+                                  Grid.Column="3" Grid.Row="12" 
+                                  Width="40" Height="30"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         </UniformGrid>
 
 
-            <TextBlock Name="Parameter3TxBl" Grid.Row="2" Grid.ColumnSpan="2"
-               Text="Affondamento"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter3TxBx" 
-                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" 
-                                  Margin="0,0,0,-2"
-                                  Width="85" Height="30"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+         <TextBlock Name="Parameter3TxBl" Grid.Row="2" Grid.ColumnSpan="2"
+                    Text="Affondamento"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                    FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter3TxBx" 
+                               Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" 
+                               Margin="0,0,0,-2"
+                               Width="85" Height="30"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <TextBlock Name="Parameter4TxBl" Grid.Row="3" Grid.ColumnSpan="2"
-               Text="Accorciamento"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter4TxBx" 
-                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="3" 
-                                  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}"/>
+         <TextBlock Name="Parameter4TxBl" Grid.Row="3" Grid.ColumnSpan="2"
+                    Text="Accorciamento"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                    FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter4TxBx" 
+                               Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="3" 
+                               Margin="0,0,0,-2"
+                               Width="85" Height="30"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <TextBlock Name="Parameter5TxBl" Grid.Row="4" Grid.ColumnSpan="2"
+                    Text="Angolo"
+                    Style="{DynamicResource 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="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-        </Grid>
+      </Grid>
 
-        <!--<TextBlock Name="Parameter1TxBl" Grid.Row="11" Text="Offset"
+      <!--<TextBlock Name="Parameter1TxBl" Grid.Row="11" Text="Offset"
                Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
                FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <EgtWPFLib:EgtTextBox Name="Parameter1TxBx" Grid.Column="1" Grid.ColumnSpan="3" Grid.Row="11" Width="90"

DrawImport/SideAngleUc.xaml.vb

@@ -171,25 +171,25 @@ Public Class SideAngleUC
 
       ' Aggiorno valori
       If m_Mode = ModeOpt.DRIP Then
-         m_dDripOffset = GetPrivateProfileDouble( S_SIDES, K_DRIPOFFSET, 20, m_MainWindow.GetIniFile())
-         m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_DRIPOFFSET2, 0, m_MainWindow.GetIniFile())
-         m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_DRIPDEPTH, 10, m_MainWindow.GetIniFile())
-         m_dDripShort = GetPrivateProfileDouble( S_SIDES, K_DRIPSHORT, 0, m_MainWindow.GetIniFile())
-         Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
-         Parameter2TxBx.Text = LenToString( m_dDripOffset2, 3)
-         Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
-         Parameter4TxBx.Text = LenToString( m_dDripShort, 3)
+         m_dDripOffset = GetPrivateProfileDouble(S_SIDES, K_DRIPOFFSET, 20, m_MainWindow.GetIniFile())
+         m_dDripOffset2 = GetPrivateProfileDouble(S_SIDES, K_DRIPOFFSET2, 0, m_MainWindow.GetIniFile())
+         m_dDripDepth = GetPrivateProfileDouble(S_SIDES, K_DRIPDEPTH, 10, m_MainWindow.GetIniFile())
+         m_dDripShort = GetPrivateProfileDouble(S_SIDES, K_DRIPSHORT, 0, m_MainWindow.GetIniFile())
+         Parameter1TxBx.Text = LenToString(m_dDripOffset, 3)
+         Parameter2TxBx.Text = LenToString(m_dDripOffset2, 3)
+         Parameter3TxBx.Text = LenToString(m_dDripDepth, 3)
+         Parameter4TxBx.Text = LenToString(m_dDripShort, 3)
       ElseIf m_Mode = ModeOpt.ENGRAVE Then
-         m_dDripOffset = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET, 20, m_MainWindow.GetIniFile())
-         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_dDripOffset = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEOFFSET, 20, m_MainWindow.GetIniFile())
+         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_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)
+         Parameter2bTxBx.Text = LenToString(m_dDripOffset2, 3)
+         Parameter3TxBx.Text = LenToString(m_dDripDepth, 3)
          Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
          Parameter5TxBx.Text = DoubleToString(m_dEngraveAngle, 3)
       End If
@@ -311,8 +311,14 @@ Public Class SideAngleUC
       ' Attualmente il vaore m_nCount è inizializzato ad "1"..
       ' Bottoni Prev Next
       If m_nCount <= MAX_LINES Then
-         PrevBtn.Visibility= Windows.Visibility.Hidden
-         NextBtn.Visibility= Windows.Visibility.Hidden
+         PrevBtn.Visibility = Windows.Visibility.Hidden
+         NextBtn.Visibility = Windows.Visibility.Hidden
+         SideAngleChBx.Visibility = Windows.Visibility.Hidden
+
+         NewEntity.Visibility = Windows.Visibility.Hidden
+         NewA1.Visibility = Windows.Visibility.Hidden
+         NewA1TxBx.Visibility = Windows.Visibility.Hidden
+         NewH1TxBx.Visibility = Windows.Visibility.Hidden
       Else
          Grid.SetRow(PrevBtn, MAX_LINES - m_nShow)
          PrevBtn.Visibility = Windows.Visibility.Visible
@@ -320,6 +326,8 @@ Public Class SideAngleUC
          Grid.SetRow(NextBtn, MAX_LINES - m_nShow)
          NextBtn.Visibility = Windows.Visibility.Visible
          NextBtn.IsEnabled = (m_nCount > m_nCurrPage * MAX_LINES)
+         Grid.SetRow(SideAngleGrid, MAX_LINES - m_nShow)
+         SideAngleChBx.Visibility = Windows.Visibility.Visible
       End If
 
       ' Intestazione per angoli di lato
@@ -335,6 +343,8 @@ Public Class SideAngleUC
             Grid.SetRow(HeelBl, MAX_LINES - m_nShow)
             HeelBl.Text = EgtMsg(91654)  ' T
             HeelBl.Visibility = Windows.Visibility.Visible
+            Grid.SetRow(SideAngleGrid, MAX_LINES - m_nShow)
+            SideAngleChBx.Visibility = Windows.Visibility.Visible
          End If
       Else
          If m_nCount = 0 Then
@@ -371,7 +381,7 @@ Public Class SideAngleUC
                GetHeelTxBxFromIndex(Index).Text = GetPrivateProfileDouble(S_SIDES, K_DRIPSHORT & "A" & nI.ToString & "_End", 0, m_MainWindow.GetIniFile())
             End If
          End If
-            Dim TxBlIndex As Integer = (m_nCurrPage - 1) * MAX_LINES + nI - 1
+         Dim TxBlIndex As Integer = (m_nCurrPage - 1) * MAX_LINES + nI - 1
          GetTxBlFromIndex(Index).Text = If(m_Mode = ModeOpt.SIDEANGLE,
                                            m_SideAngleEntityList(TxBlIndex).sEntityName,
                                            m_DripEntityList(TxBlIndex).sEntityName)
@@ -391,6 +401,145 @@ Public Class SideAngleUC
       Next
    End Sub
 
+   Private Sub CheckedSideAngle() Handles SideAngleChBx.Checked
+      Grid.SetRow(NewEntity, MAX_LINES - m_nShow + 1)
+      Grid.SetRow(NewA1TxBx, MAX_LINES - m_nShow + 1)
+      Grid.SetRow(NewH1TxBx, MAX_LINES - m_nShow + 1)
+
+      NewEntity.Text = "A#"
+      ' Se interrompo la creazione di un unico SideAng
+      If Not GetSideAngleFromAllEntities() Then Return
+
+      PrevBtn.Visibility = Visibility.Collapsed
+      NextBtn.Visibility = Visibility.Collapsed
+
+      NewEntity.Visibility = Visibility.Visible
+      NewA1TxBx.Visibility = Visibility.Visible
+      NewH1TxBx.Visibility = Visibility.Visible
+
+      Entity1.Visibility = Visibility.Collapsed
+      A1TxBx.Visibility = Visibility.Collapsed
+      H1TxBx.Visibility = Visibility.Collapsed
+
+      Entity2.Visibility = Visibility.Collapsed
+      A2TxBx.Visibility = Visibility.Collapsed
+      H2TxBx.Visibility = Visibility.Collapsed
+
+      Entity3.Visibility = Visibility.Collapsed
+      A3TxBx.Visibility = Visibility.Collapsed
+      H3TxBx.Visibility = Visibility.Collapsed
+
+      Entity4.Visibility = Visibility.Collapsed
+      A4TxBx.Visibility = Visibility.Collapsed
+      H4TxBx.Visibility = Visibility.Collapsed
+
+      Entity5.Visibility = Visibility.Collapsed
+      A5TxBx.Visibility = Visibility.Collapsed
+      H5TxBx.Visibility = Visibility.Collapsed
+
+      Entity6.Visibility = Visibility.Collapsed
+      A6TxBx.Visibility = Visibility.Collapsed
+      H6TxBx.Visibility = Visibility.Collapsed
+
+      Entity7.Visibility = Visibility.Collapsed
+      A7TxBx.Visibility = Visibility.Collapsed
+      H7TxBx.Visibility = Visibility.Collapsed
+
+      Entity8.Visibility = Visibility.Collapsed
+      A8TxBx.Visibility = Visibility.Collapsed
+      H8TxBx.Visibility = Visibility.Collapsed
+
+      Entity9.Visibility = Visibility.Collapsed
+      A9TxBx.Visibility = Visibility.Collapsed
+      H9TxBx.Visibility = Visibility.Collapsed
+
+      Entity10.Visibility = Visibility.Collapsed
+      A10TxBx.Visibility = Visibility.Collapsed
+      H10TxBx.Visibility = Visibility.Collapsed
+   End Sub
+
+   Private Sub UnCheckSideAngle() Handles SideAngleChBx.Unchecked
+      NewEntity.Visibility = Visibility.Collapsed
+      NewA1TxBx.Visibility = Visibility.Collapsed
+      NewH1TxBx.Visibility = Visibility.Collapsed
+
+      TxBlChBxView()
+      RefreshCheckAndValue()
+   End Sub
+
+   Private Function GetSideAngleFromAllEntities() As Boolean
+      Dim tmpSideAngleList As New List(Of Double)
+      tmpSideAngleList.Clear()
+      Dim tmpSideHeelList As New List(Of Double)
+      tmpSideHeelList.Clear()
+      Dim m_SideAngleOneForAllWindow As New SideAngleOneForAllWindow
+
+      For i As Integer = 0 To m_SideAngleEntityList.Count - 1
+         If Not tmpSideAngleList.Contains(m_SideAngleEntityList(i).dSideAngle) Then
+            tmpSideAngleList.Add(m_SideAngleEntityList(i).dSideAngle)
+         End If
+         If Not tmpSideHeelList.Contains(m_SideAngleEntityList(i).dSideHeel) Then
+            tmpSideHeelList.Add(m_SideAngleEntityList(i).dSideHeel)
+         End If
+      Next
+      NewA1TxBx.Text = DoubleToString(tmpSideAngleList(0), 2)
+      NewH1TxBx.Text = LenToString(tmpSideHeelList(0), 2)
+
+      If tmpSideAngleList.Count > 1 Or tmpSideHeelList.Count > 1 Then
+         m_SideAngleOneForAllWindow.SideAngleOneForAllCBx.ItemsSource = tmpSideAngleList
+         m_SideAngleOneForAllWindow.SideAngleOneForAllCBx.SelectedIndex = 0
+         m_SideAngleOneForAllWindow.SideHeelOneForAllCBx.ItemsSource = tmpSideHeelList
+         m_SideAngleOneForAllWindow.SideHeelOneForAllCBx.SelectedIndex = 0
+         m_SideAngleOneForAllWindow.ShowDialog()
+         If m_SideAngleOneForAllWindow.DialogResult Then
+            NewA1TxBx.Text = DoubleToString(m_SideAngleOneForAllWindow.SideAngleOneForAllCBx.SelectedItem, 2)
+            NewH1TxBx.Text = LenToString(m_SideAngleOneForAllWindow.SideHeelOneForAllCBx.SelectedItem, 2)
+            UpdateSideAngleAllEntities()
+            UpdateHeelAllEntities()
+         Else
+            SideAngleChBx.IsChecked = False
+            Return False
+         End If
+      End If
+      Return True
+   End Function
+
+   Private Sub UpdateHeelAllEntities()
+      ' Nuovo tallone
+      Dim dSideHeel As Double
+      StringToLen(NewH1TxBx.Text, dSideHeel)
+      ' Verifico stia nei limiti
+      If dSideHeel < 0 Then
+         dSideHeel = 0
+         NewH1TxBx.Text = "0"
+      End If
+      For Each Entity As SideAngleEntity In m_SideAngleEntityList
+         ' Lo modifico nella geometria e nella lista inclinazioni
+         ModifySideHeel(Entity.sEntityName, dSideHeel)
+         ' Aggiorno tutti i testi
+         RefreshSideAngleText()
+      Next
+   End Sub
+
+   Private Sub UpdateSideAngleAllEntities()
+      ' Nuovo angolo di inclinazione
+      Dim dSideAngle As Double
+      StringToDouble(NewA1TxBx.Text, dSideAngle)
+      ' Verifico stia nei limiti
+      If dSideAngle < -m_dMaxSideAng Then
+         dSideAngle = -m_dMaxSideAng
+         NewA1TxBx.Text = DoubleToString(dSideAngle, 2)
+      ElseIf dSideAngle > m_dMaxSideAng Then
+         dSideAngle = m_dMaxSideAng
+         NewA1TxBx.Text = DoubleToString(dSideAngle, 2)
+      End If
+      For Each Entity As SideAngleEntity In m_SideAngleEntityList
+         ' Lo modifico nella geometria e nella lista inclinazioni
+         ModifySideAngle(Entity.sEntityName, dSideAngle)
+         ' Aggiorno tutti i testi
+         RefreshSideAngleText()
+      Next
+   End Sub
 
    '-------------> Restituisce gli oggetto della grafica assegnato l'indice
    Private Function GetChBxFromIndex(Index As Integer) As CheckBox
@@ -495,15 +644,15 @@ Public Class SideAngleUC
    '-------------> Restituisce gli oggetto della grafica assegnato l'indice
 
    ' quando esco salvo nel file l'ultima configurazione per le incisioni
-   Private Sub SideAngleUC_Unloaded( sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+   Private Sub SideAngleUC_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       If m_CallingPage = MainWindow.Pages.Draw Then
          ' Ricavo nome pezzo
-         Dim PartId As Integer = EgtGetFirstInGroup( GDB_ID.ROOT)
+         Dim PartId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)
          ' Svuoto layer in cui sono presenti i testi con le inclinazioni dei lati
          If m_Mode = ModeOpt.SIDEANGLE Then
-            EgtEmptyGroup( EgtGetFirstNameInGroup( PartId, SIDE_ANGLE_LAYER))
+            EgtEmptyGroup(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
          Else
-            EgtEmptyGroup( EgtGetFirstNameInGroup( PartId, SIDE_ANGLE_LAYER))
+            EgtEmptyGroup(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
          End If
       ElseIf m_CallingPage = MainWindow.Pages.Import Then
          ' Nessuna azione necessaria
@@ -516,7 +665,7 @@ Public Class SideAngleUC
          'WritePrivateProfileString( S_SIDES, K_DRIPSHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
       ElseIf m_Mode = ModeOpt.ENGRAVE Then
          WritePrivateProfileString(S_SIDES, K_ENGRAVEOFFSET, LenToString(m_dDripOffset, 3), m_MainWindow.GetIniFile())
-         WritePrivateProfileString( S_SIDES, K_ENGRAVENUMBER2, m_nEngrNbr2.ToString(), m_MainWindow.GetIniFile())
+         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())
@@ -527,7 +676,6 @@ Public Class SideAngleUC
       EgtDraw()
    End Sub
 
-
    ' aggiunge il messaggio nel disegno, se DripGeom creo la geometria
    Private Sub RefreshSideAngleText()
       Dim PartId As Integer = GDB_ID.NULL
@@ -538,7 +686,7 @@ Public Class SideAngleUC
          PartId = If(m_MainWindow.m_DrawPageUC.SelectedLayer <> GDB_ID.NULL, EgtGetFirstPart(), GDB_ID.NULL)
          ' Recupero nome layer con geometria di contorno (esterno o interno) del pezzo
          LoopId = m_MainWindow.m_DrawPageUC.SelectedLayer
-         ElseIf m_CallingPage = MainWindow.Pages.Import Then
+      ElseIf m_CallingPage = MainWindow.Pages.Import Then
          ' Imposto contesto corrente
          EgtSetCurrentContext(m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())
          ' Recupero nome pezzo
@@ -600,7 +748,7 @@ Public Class SideAngleUC
          For nIndex As Integer = 1 To m_nCount
             Dim Entity As DripEntity = m_DripEntityList(nIndex - 1)
             ' Imposto check box (se sono stati definiti il numero corretto di CheckBox
-            If nIndex < ( m_nCurrPage - 1) * MAX_LINES Or nIndex > m_nCurrPage * MAX_LINES Then Continue For
+            If nIndex < (m_nCurrPage - 1) * MAX_LINES Or nIndex > m_nCurrPage * MAX_LINES Then Continue For
             Dim nChIndex As Integer = nIndex - (m_nCurrPage - 1) * MAX_LINES + MAX_LINES - m_nShow
             ' verifico se l'entità ha un gocciolatoio
             GetChBxFromIndex(nChIndex).IsChecked = Entity.bHaveDrip
@@ -973,15 +1121,15 @@ Public Class SideAngleUC
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
       If m_nCurrPage = 1 Then Return
       m_nCurrPage -= 1
-      m_nShow = Math.Min( m_nCount - ( m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
+      m_nShow = Math.Min(m_nCount - (m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
       TxBlChBxView()
       RefreshCheckAndValue()
    End Sub
 
    Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
-      If m_nCount <= ( m_nCurrPage - 1) * MAX_LINES Then Return
+      If m_nCount <= (m_nCurrPage - 1) * MAX_LINES Then Return
       m_nCurrPage += 1
-      m_nShow = Math.Min( m_nCount - ( m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
+      m_nShow = Math.Min(m_nCount - (m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
       TxBlChBxView()
       RefreshCheckAndValue()
    End Sub
@@ -993,7 +1141,7 @@ Public Class SideAngleUC
          Dim bVal As Boolean = CurrCheckBox.IsChecked()
          Dim SideIndex As Integer = CInt(CurrCheckBox.Name.Substring(1))
          ' Converto nome checkbox in nome elemento tenendo conto della pagina e dello slittamento verso il basso
-         Dim nCurrSide As Integer = ( m_nCurrPage - 1) * MAX_LINES + SideIndex - ( MAX_LINES - m_nShow)
+         Dim nCurrSide As Integer = (m_nCurrPage - 1) * MAX_LINES + SideIndex - (MAX_LINES - m_nShow)
          Dim sCurrSide As String = m_DripEntityList(nCurrSide - 1).sEntityName
          ' aggiorno l'entità con i valori scritti nel campo di testo
          Dim CurrEntity As DripEntity = DripEntity.FindEntity(sCurrSide)
@@ -1179,6 +1327,19 @@ Public Class SideAngleUC
       End If
    End Sub
 
+   '------->   riga nuova
+   Private Sub NewA1TxBx_EgtClosed(sender As Object, e As EventArgs) Handles NewA1TxBx.EgtClosed
+      If m_Mode = ModeOpt.SIDEANGLE Then
+         UpdateSideAngleAllEntities()
+      End If
+   End Sub
+
+   Private Sub NewH1TxBx_EgtClosed(sender As Object, e As EventArgs) Handles NewH1TxBx.EgtClosed
+      If m_Mode = ModeOpt.SIDEANGLE Then
+         UpdateHeelAllEntities()
+      End If
+   End Sub
+
    Private Sub SetSideAngleFromTxBx(SideIndex As Integer, AngleTxBx As EgtWPFLib.EgtTextBox)
       ' Nuovo angolo di inclinazione
       Dim dSideAngle As Double
@@ -1192,7 +1353,7 @@ Public Class SideAngleUC
          AngleTxBx.Text = DoubleToString(dSideAngle, 2)
       End If
       ' Converto nome checkbox in nome elemento tenendo conto della pagina e dello slittamento verso il basso
-      Dim nCurrSide As Integer = ( m_nCurrPage - 1) * MAX_LINES + SideIndex - ( MAX_LINES - m_nShow)
+      Dim nCurrSide As Integer = (m_nCurrPage - 1) * MAX_LINES + SideIndex - (MAX_LINES - m_nShow)
       Dim sCurrSide As String = m_SideAngleEntityList(nCurrSide - 1).sEntityName
       ' Lo modifico nella geometria e nella lista inclinazioni
       ModifySideAngle(sCurrSide, dSideAngle)
@@ -1262,7 +1423,7 @@ Public Class SideAngleUC
          HeelTxBx.Text = "0"
       End If
       ' Converto nome checkbox in nome elemento tenendo conto della pagina e dello slittamento verso il basso
-      Dim nCurrSide As Integer = ( m_nCurrPage - 1) * MAX_LINES + SideIndex - ( MAX_LINES - m_nShow)
+      Dim nCurrSide As Integer = (m_nCurrPage - 1) * MAX_LINES + SideIndex - (MAX_LINES - m_nShow)
       Dim sCurrSide As String = m_SideAngleEntityList(nCurrSide - 1).sEntityName
       ' Lo modifico nella geometria e nella lista inclinazioni
       ModifySideHeel(sCurrSide, dSideHeel)
@@ -1305,13 +1466,13 @@ Public Class SideAngleUC
          EgtSetInfo(CurrEntity.nGeomId, INFO_ORIG_SIDE_ANGLE, dSideAngle)
          Dim sSawingTilted As String = m_MainWindow.m_CurrentMachine.sCurrSawingTilted
          If Not String.IsNullOrEmpty(sSawingTilted) Then
-            EgtSetInfo(CurrEntity.nGeomId, DEF_MACHINING, sSawingTilted)
+            EgtSetInfo(CurrEntity.nGeomId, DEF_MACHINING_TILTED, sSawingTilted)
          End If
          ' Cancello inclinazione nell'apposito campo info
       Else
          EgtRemoveInfo(CurrEntity.nGeomId, INFO_SIDE_ANGLE)
          EgtRemoveInfo(CurrEntity.nGeomId, INFO_ORIG_SIDE_ANGLE)
-         EgtRemoveInfo(CurrEntity.nGeomId, DEF_MACHINING)
+         EgtRemoveInfo(CurrEntity.nGeomId, DEF_MACHINING_TILTED)
       End If
       ' Aggiorno lista entità con nuova inclinazione
       CurrEntity.dSideAngle = dSideAngle
@@ -1329,7 +1490,7 @@ Public Class SideAngleUC
       ' Scrivo nuovo tallone nelle info
       If dSideHeel > 10 * EPS_SMALL Then
          EgtSetInfo(CurrEntity.nGeomId, INFO_HEEL, dSideHeel)
-      ' Cancello inclinazione nell'apposito campo info
+         ' Cancello inclinazione nell'apposito campo info
       Else
          EgtRemoveInfo(CurrEntity.nGeomId, INFO_HEEL)
       End If

Machine/Alarms2PageUC.xaml

@@ -0,0 +1,58 @@
+<UserControl x:Class="Alarms2PageUC"
+             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" 
+             mc:Ignorable="d" 
+             d:DesignHeight="768" d:DesignWidth="1280">
+   
+   <Border Style="{DynamicResource OmagCut_PageBorder}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="3*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <GroupBox Name="FinalSawCutGpBx" Style="{DynamicResource OmagCut_GroupBox}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="EnableFinalSawCutTxBl" Grid.Column="0" Grid.Row="0"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <CheckBox Name="EnableFinalSawCutChBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
+                         Style="{StaticResource OmagCut_CheckBox_Single}" 
+                         HorizontalAlignment="Right"/>
+
+               <TextBlock Name="FinalDepthTxBl" Grid.Column="0" Grid.Row="1"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="FinalDepthTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+
+
+            </Grid>
+         </GroupBox>
+      </Grid>
+   </Border>
+</UserControl>

Machine/Alarms2PageUC.xaml.vb

@@ -0,0 +1,30 @@
+Imports EgtUILib
+
+Public Class Alarms2PageUC
+
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   Private Sub Alarms2Page_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      FinalSawCutGpBx.Header = EgtMsg(91254)     ' Taglio Finale
+      EnableFinalSawCutTxBl.Text = EgtMsg(91255) ' Abilita
+      FinalDepthTxBl.Text = EgtMsg(91256)        ' Ultimo Spessore
+   End Sub
+
+   Private Sub Allarm2Page_Loaded() Handles Me.Loaded
+      EnableFinalSawCutChBx.IsChecked = m_MainWindow.m_CurrentMachine.bEnableFinalSawCut
+      FinalDepthTxBx.Text = m_MainWindow.m_CurrentMachine.dFinalDepth
+   End Sub
+
+   Private Sub EnableFinalSawCutChBx_IsChecked() Handles EnableFinalSawCutChBx.Click
+      m_MainWindow.m_CurrentMachine.bEnableFinalSawCut = EnableFinalSawCutChBx.IsChecked
+      WritePrivateProfileString(S_MACH, K_ENABLEFINALSAWCUT, If(m_MainWindow.m_CurrentMachine.bEnableFinalSawCut, "1", "0"), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub FinalDepthTxBx_EgtClosed() Handles FinalDepthTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(FinalDepthTxBx.Text, dVal)
+      m_MainWindow.m_CurrentMachine.dFinalDepth = dVal
+      WritePrivateProfileString(S_MACH, K_FINALDEPTH, DoubleToString(m_MainWindow.m_CurrentMachine.dFinalDepth, 3), m_MainWindow.GetMachIniFile())
+   End Sub
+
+End Class

Machine/AlarmsPageUC.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="AlarmsPageUC"
-   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" 
-   mc:Ignorable="d" 
-   d:DesignHeight="768" d:DesignWidth="1280">
+             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" 
+             mc:Ignorable="d" 
+             d:DesignHeight="768" d:DesignWidth="1280">
 
     <!-- Definizione della AlarmsPage -->
     <Border Style="{DynamicResource OmagCut_PageBorder}" >
@@ -279,7 +279,7 @@
                 </Grid.RowDefinitions>
 
                 <GroupBox Name="SetUpGpBx" Grid.ColumnSpan="3" Grid.RowSpan="9"
-               Style="{DynamicResource OmagCut_GroupBox}">
+                          Style="{DynamicResource OmagCut_GroupBox}">
 
                     <Grid Name="CurrToolsGrid" Grid.ColumnSpan="2">
                         <Grid.ColumnDefinitions>
@@ -298,7 +298,7 @@
                         </Grid.RowDefinitions>
 
                         <TextBlock Name="CurrSawTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
-                                Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                                   Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
                         <ComboBox x:Name="CurrSawCmBx" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_ComboBox}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
@@ -308,8 +308,8 @@
                         </ComboBox>
 
                         <TextBlock Name="AuxiliaryToolTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
-                                Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                                Visibility="Hidden"/>
+                                   Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                                   Visibility="Hidden"/>
                         <ComboBox Name="AuxiliaryToolCmBx" Grid.Column="1" Grid.Row="3" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
@@ -319,8 +319,8 @@
                         </ComboBox>
 
                         <TextBlock Name="CurrDrillTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
-                                Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                                Visibility="Hidden"/>
+                                   Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                                   Visibility="Hidden"/>
                         <ComboBox Name="CurrDrillCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>

Machine/CurrentMachine.vb

@@ -212,6 +212,12 @@ Public Class CurrentMachine
    ' Massima altezza lavorabile con lama grande
    Private m_dHighPieceZ As Double = 200.0
 
+   ' 
+   Private m_dFinalDepth As Double = 0.0
+
+   ' Flag che abilita l'esecuzione del taglio finale
+   Private m_bEnableFinalSawCut As Boolean = False
+
 #Region "Proprietà che leggono e scrivono i valori anche da o su file ini"
    Friend ReadOnly Property MaxTabDepth As Double
       Get
@@ -1204,6 +1210,24 @@ Public Class CurrentMachine
       End Get
    End Property
 
+   Friend Property bEnableFinalSawCut As Boolean
+      Get
+         Return m_bEnableFinalSawCut
+      End Get
+      Set(value As Boolean)
+         m_bEnableFinalSawCut = value
+      End Set
+   End Property
+
+   Friend Property dFinalDepth As Double
+      Get
+         Return m_dFinalDepth
+      End Get
+      Set(value As Double)
+         m_dFinalDepth = value
+      End Set
+   End Property
+
 #End Region
 
    Sub New()
@@ -1488,6 +1512,12 @@ Public Class CurrentMachine
 
       ' Massimo spessore lavorabile con lama grande
       m_dHighPieceZ = GetPrivateProfileDouble(S_RAWMOVE, "MaxHeightPiece", 800.0, m_MainWindow.GetMachIniFile())
+
+      ' Flag per abilitare taglio finale
+      m_bEnableFinalSawCut = GetPrivateProfileInt(S_MACH, K_ENABLEFINALSAWCUT, 0, m_MainWindow.GetMachIniFile()) <> 0
+
+      ' Flag per abilitare taglio finale
+      m_dFinalDepth = GetPrivateProfileDouble(S_MACH, K_FINALDEPTH, 0.0, m_MainWindow.GetMachIniFile())
    End Sub
 
    ' Per il controllo FANUC al momento dell'inizializzazione del CN devono essere lette alcune variabili

Machine/MachinePageUC.xaml

@@ -5,16 +5,16 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280">
-      
+
    <!-- Definizione della MachinePage -->
    <Border  >
-      
+
       <Grid Name="MachinePageGrid" >
          <Grid.RowDefinitions>
-             <RowDefinition Height="1*"/>
-             <RowDefinition Height="9*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="9*"/>
          </Grid.RowDefinitions>
-         
+
          <!-- Definizione della grid superiore -->
          <Grid Name="UpperButtonGrid" Grid.Row="0" >
             <Grid.ColumnDefinitions>
@@ -25,37 +25,40 @@
                <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="AlarmsBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource DatiMacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="ToolsDBBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource DB-lavorazioniImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="MachiningDBBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource DB-utensiliImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="PolishingsBtn" Grid.Column="3" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
-                    <!--<Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
-                </ToggleButton>
-                <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="6" Style="{DynamicResource OmagCut_YellowToggleButton}">
-                    
-                </ToggleButton>
+            <ToggleButton Name="AlarmsBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource DatiMacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="Alarms2Btn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource DatiMacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="ToolsDBBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource DB-lavorazioniImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="MachiningDBBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource DB-utensiliImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="PolishingsBtn" Grid.Column="4" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
+               <!--<Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
+            </ToggleButton>
+            <ToggleButton Name="WaterJetBtn" Grid.Column="5" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
+               <!--<Image Source="{DynamicResource WaterJetImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
+            </ToggleButton>
+            <ToggleButton Name="TestingPageBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource MacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="StatisticsBtn" Grid.Column="7" Style="{DynamicResource OmagCut_YellowToggleButton}">
 
-            </Grid>
+            </ToggleButton>
+
+         </Grid>
 
       </Grid>
-      
+
    </Border>
-   
+
 </UserControl>

Machine/MachinePageUC.xaml.vb

@@ -13,6 +13,7 @@ Public Class MachinePageUC
    Friend m_WaterJetPageUC As WaterJetPageUC
    Friend m_MachineCNPageUC As MachineCNPageUC
    Friend m_StatisticsPageUC As StatisticsPageUC
+   Friend m_Alarms2PageUC As Alarms2PageUC
 
    ' Riferimento alla pagina correntemente attiva
    Friend m_ActiveMachinePage As MachinePages
@@ -25,6 +26,7 @@ Public Class MachinePageUC
       WaterJet
       MachineCN
       Statistics
+      Alarms2
    End Enum
 
    Private Sub MachinePage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
@@ -37,6 +39,7 @@ Public Class MachinePageUC
       m_WaterJetPageUC = New WaterJetPageUC
       m_MachineCNPageUC = New MachineCNPageUC
       m_StatisticsPageUC = New StatisticsPageUC
+      m_Alarms2PageUC = New Alarms2PageUC
 
       'Posizionemento nella griglia delle Page UserControl
       m_AlarmsPageUC.SetValue(Grid.RowProperty, 1)
@@ -46,8 +49,11 @@ Public Class MachinePageUC
       m_WaterJetPageUC.SetValue(Grid.RowProperty, 1)
       m_MachineCNPageUC.SetValue(Grid.RowProperty, 1)
       m_StatisticsPageUC.SetValue(Grid.RowProperty, 1)
+      m_Alarms2PageUC.SetValue(Grid.RowProperty, 1)
 
       AlarmsBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 5)
+      Alarms2Btn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 5)
+
       ToolsDBBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 6)
       MachiningDBBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 7)
       PolishingsBtn.Content = EgtMsg(91090)
@@ -171,6 +177,95 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_StatisticsPageUC)
             MachinePageGrid.Children.Add(m_AlarmsPageUC)
             m_ActiveMachinePage = MachinePages.Alarms
+         Case MachinePages.Alarms2
+            Alarms2Btn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_AlarmsPageUC)
+            m_ActiveMachinePage = MachinePages.Alarms
+      End Select
+   End Sub
+
+   Private Sub Alarms2Btn_Click(sender As Object, e As RoutedEventArgs) Handles Alarms2Btn.Click
+      Select Case m_ActiveMachinePage
+         Case MachinePages.Alarms
+            AlarmsBtn.IsChecked = False
+            Alarms2Btn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_AlarmsPageUC)
+            MachinePageGrid.Children.Add(m_Alarms2PageUC)
+            m_ActiveMachinePage = MachinePages.Alarms2
+         Case MachinePages.ToolsDb
+            ' Verifica ed eventuale salvataggio utensile corrente
+            If Not m_ToolsDbPageUC.SaveCurrTool() Then
+               Alarms2Btn.IsChecked = False
+               ToolsDBBtn.IsChecked = True
+               Return
+            End If
+            ' salvo il DB utensili
+            EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+            EgtTdbSave()
+            ' passo alla pagina Dati macchina
+            Alarms2Btn.IsChecked = True
+            ToolsDBBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_ToolsDbPageUC)
+            MachinePageGrid.Children.Add(m_Alarms2PageUC)
+            m_ActiveMachinePage = MachinePages.Alarms2
+         Case MachinePages.MachiningDb
+            ' Verifica ed eventuale salvataggio lavorazione corrente
+            If Not m_MachiningDbPageUC.SaveCurrMachining() Then
+               Alarms2Btn.IsChecked = False
+               MachiningDBBtn.IsChecked = True
+               Return
+            End If
+            ' salvo il DB lavorazioni
+            EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+            EgtMdbSave()
+            ' passo alla pagina Dati macchina
+            Alarms2Btn.IsChecked = True
+            MachiningDBBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
+            MachinePageGrid.Children.Add(m_Alarms2PageUC)
+            m_ActiveMachinePage = MachinePages.Alarms2
+         Case MachinePages.Polishings
+            ' Verifica ed eventuale salvataggio Lucidatura corrente
+            If Not m_PolishingsPageUC.SaveKit() Then
+               Alarms2Btn.IsChecked = False
+               PolishingsBtn.IsChecked = True
+               Return
+            End If
+            ' passo alla pagina Dati Macchina
+            Alarms2Btn.IsChecked = True
+            PolishingsBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_PolishingsPageUC)
+            MachinePageGrid.Children.Add(m_Alarms2PageUC)
+            m_ActiveMachinePage = MachinePages.Alarms2
+         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
+               Alarms2Btn.IsChecked = False
+               WaterJetBtn.IsChecked = True
+               Return
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
+               m_WaterJetPageUC.WaterJetPage_Reinitialize()
+            End If
+            ' passo alla pagina Dati Macchina
+            Alarms2Btn.IsChecked = True
+            WaterJetBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
+            MachinePageGrid.Children.Add(m_Alarms2PageUC)
+            m_ActiveMachinePage = MachinePages.Alarms2
+         Case MachinePages.MachineCN
+            Alarms2Btn.IsChecked = True
+            TestingPageBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_MachineCNPageUC)
+            MachinePageGrid.Children.Add(m_Alarms2PageUC)
+            m_ActiveMachinePage = MachinePages.Alarms2
+         Case MachinePages.Statistics
+            Alarms2Btn.IsChecked = True
+            StatisticsBtn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_StatisticsPageUC)
+            MachinePageGrid.Children.Add(m_Alarms2PageUC)
+            m_ActiveMachinePage = MachinePages.Alarms2
       End Select
    End Sub
 
@@ -241,6 +336,12 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_StatisticsPageUC)
             MachinePageGrid.Children.Add(m_ToolsDbPageUC)
             m_ActiveMachinePage = MachinePages.ToolsDb
+         Case MachinePages.Alarms2
+            Alarms2Btn.IsChecked = False
+            ToolsDBBtn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_ToolsDbPageUC)
+            m_ActiveMachinePage = MachinePages.ToolsDb
       End Select
    End Sub
 
@@ -313,6 +414,12 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_StatisticsPageUC)
             MachinePageGrid.Children.Add(m_MachiningDbPageUC)
             m_ActiveMachinePage = MachinePages.MachiningDb
+         Case MachinePages.Alarms2
+            Alarms2Btn.IsChecked = False
+            MachiningDBBtn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_MachiningDbPageUC)
+            m_ActiveMachinePage = MachinePages.MachiningDb
       End Select
    End Sub
 
@@ -386,6 +493,12 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_StatisticsPageUC)
             MachinePageGrid.Children.Add(m_PolishingsPageUC)
             m_ActiveMachinePage = MachinePages.Polishings
+         Case MachinePages.Alarms2
+            Alarms2Btn.IsChecked = False
+            PolishingsBtn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_PolishingsPageUC)
+            m_ActiveMachinePage = MachinePages.Polishings
       End Select
    End Sub
 
@@ -457,6 +570,12 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_StatisticsPageUC)
             MachinePageGrid.Children.Add(m_WaterJetPageUC)
             m_ActiveMachinePage = MachinePages.WaterJet
+         Case MachinePages.Alarms2
+            Alarms2Btn.IsChecked = False
+            WaterJetBtn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_WaterJetPageUC)
+            m_ActiveMachinePage = MachinePages.WaterJet
       End Select
    End Sub
 
@@ -537,6 +656,12 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_StatisticsPageUC)
             MachinePageGrid.Children.Add(m_MachineCNPageUC)
             m_ActiveMachinePage = MachinePages.MachineCN
+         Case MachinePages.Alarms2
+            Alarms2Btn.IsChecked = False
+            TestingPageBtn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_MachineCNPageUC)
+            m_ActiveMachinePage = MachinePages.MachineCN
       End Select
    End Sub
 
@@ -617,6 +742,12 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.Statistics
          Case MachinePages.Statistics
             StatisticsBtn.IsChecked = True
+         Case MachinePages.Alarms2
+            Alarms2Btn.IsChecked = False
+            StatisticsBtn.IsChecked = True
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_StatisticsPageUC)
+            m_ActiveMachinePage = MachinePages.Statistics
       End Select
    End Sub
 
@@ -670,6 +801,12 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_StatisticsPageUC)
             MachinePageGrid.Children.Add(m_AlarmsPageUC)
             m_ActiveMachinePage = MachinePages.Alarms
+         Case MachinePages.Alarms2
+            AlarmsBtn.IsChecked = True
+            Alarms2Btn.IsChecked = False
+            MachinePageGrid.Children.Remove(m_Alarms2PageUC)
+            MachinePageGrid.Children.Add(m_AlarmsPageUC)
+            m_ActiveMachinePage = MachinePages.Alarms
       End Select
    End Sub
 

MainWindow.xaml.vb

@@ -149,6 +149,19 @@ Class MainWindow
       Options
    End Enum
 
+   ' Elenco delle operazioni tagli diretti (decoficiato in CamAuto per riconoscere il tipo taglio diretto)
+   Friend Enum FlagDirectCuts
+      ManualMove = 1
+      SingleCut = 2
+      GridCut = 3
+      SingleDrill = 4
+      Flattening = 5
+      Squaring = 6
+      SawTest = 7
+      Polishing = 8
+      CopyTemplate = 9
+   End Enum
+
    Public Function GetExeRootDir() As String
       Return m_sExeRoot
    End Function

My Project/AssemblyInfo.vb

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

NcComm/M_Num.vb

@@ -1651,6 +1651,11 @@ Namespace Num
 
          n_ret = objDGeneralFunctions.ActivateProgram(l_glbPartProgramNumber, 0)
 
+         If n_ret <> 0 Then
+            EgtOutLog("Error: ActivateProgram error : " + n_ret.ToString())
+            Return n_ret
+         End If
+
          Return n_ret
 
       End Function
@@ -1698,17 +1703,24 @@ Namespace Num
          Dim ngroup0 As Short = 0
          Dim nTimeOut As Integer = 0
          bSetModeDone = False
+
+         ' ' Per prima versione FLEXIUM (3.5.040 - 2013)
+         ' EgtOutLog("Scrittura modalità (" & nmode.ToString & ")")
+         ' objDGeneralFunctions.WriteCncMode(nmode, ngroup0)
+         ' Return 0
+
+         ' Per ultime versioni FLEXIUM
          objDGeneralFunctions.WriteCncMode2(nHandle, nmode, ngroup0)
          While Not bSetModeDone And nTimeOut < SHORTSLEEPCOUNT
             System.Threading.Thread.Sleep(SHORTSLEEPTIME)
             nTimeOut += 1
          End While
          If Not bSetModeDone Then
-            EgtOutLog("Errore cambio modalit� in MDI: " & TIMEOUT)
+            EgtOutLog("Errore cambio modalità in MDI: " & TIMEOUT)
             Return TIMEOUT   'Errore di timeout
          End If
          If nSetModeResult <> 0 Then
-            EgtOutLog("Errore 2 cambio modalit� in MDI: " & nSetModeResult)
+            EgtOutLog("Errore 2 cambio modalità in MDI: " & nSetModeResult)
          End If
          Return nSetModeResult
 

OmagCUT.vbproj

@@ -196,6 +196,9 @@
     <Compile Include="DirectCuts\ControlsDirectCutUC1.xaml.vb">
       <DependentUpon>ControlsDirectCutUC1.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DirectCuts\CustomGridUC.xaml.vb">
+      <DependentUpon>CustomGridUC.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DirectCuts\Polishing.xaml.vb">
       <DependentUpon>Polishing.xaml</DependentUpon>
     </Compile>
@@ -218,12 +221,18 @@
     <Compile Include="DrawImport\FiloTopUC.xaml.vb">
       <DependentUpon>FiloTopUC.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DrawImport\SideAngleOneForAllWindow.xaml.vb">
+      <DependentUpon>SideAngleOneForAllWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DrawImport\UnderDrillUC.xaml.vb">
       <DependentUpon>UnderDrillUC.xaml</DependentUpon>
     </Compile>
     <Compile Include="LicenseWindow.xaml.vb">
       <DependentUpon>LicenseWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Machine\Alarms2PageUC.xaml.vb">
+      <DependentUpon>Alarms2PageUC.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Machine\AlarmsPageUC.xaml.vb">
       <DependentUpon>AlarmsPageUC.xaml</DependentUpon>
     </Compile>
@@ -484,6 +493,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DirectCuts\CustomGridUC.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DirectCuts\Polishing.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -512,6 +525,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="DrawImport\SideAngleOneForAllWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DrawImport\UnderDrillUC.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
@@ -520,6 +537,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Machine\Alarms2PageUC.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Machine\AlarmsPageUC.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

OmagCUTDarkDictionary.xaml

@@ -387,7 +387,7 @@
       <Setter Property="Keyboard" Value="Calculator"/>
       <Setter Property="KeyboardDimension" Value="300"/>
       <Setter Property="Background" Value="#636974"/>
-      <Setter Property="Foreground" Value="White"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
    </Style>
 
    <Style x:Key="OmagCut_MachToolCalculatorTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_CalculatorTextBox}">
@@ -509,6 +509,7 @@
       <!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>-->
       <Setter Property="Background" Value="#1C1D22"/>
       <Setter Property="BorderBrush" Value="#1C1D22"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
       <Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
       <Style.Triggers>
          <Trigger Property="IsChecked" Value="True">
@@ -629,21 +630,21 @@
    <Style x:Key="OmagCut_CenteredLowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_UpperCaseCharacterTextBlock}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="Foreground" Value="White"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
    </Style>
 
    <Style x:Key="OmagCut_KeyboardTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
       <Setter Property="Keyboard" Value="Alphanumeric"/>
       <Setter Property="KeyboardDimension" Value="600"/>
       <Setter Property="Background" Value="#636974"/>
-      <Setter Property="Foreground" Value="White"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
    </Style>
 
    <Style x:Key="OmagCut_LowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}">
       <Setter Property="TextWrapping" Value="Wrap"/>
       <Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Foreground" Value="White"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
    </Style>
 
    <DataTemplate x:Key="GroupBoxHeaderTemplate">

OmagCUTDictionary.xaml

@@ -1224,6 +1224,7 @@
    </Style>
 
    <Style x:Key="OmagCut_CenteredLowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_UpperCaseCharacterTextBlock}">
+      <Setter Property="Foreground" Value="{StaticResource Omag_Black}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
@@ -1257,6 +1258,7 @@
    </Style>
 
    <Style x:Key="OmagCut_CalculatorTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
+      <Setter Property="Foreground" Value="{StaticResource Omag_Black}"/>
       <Setter Property="Keyboard" Value="Calculator"/>
       <Setter Property="IsLength" Value="True"/>
       <Setter Property="KeyboardDimension" Value="300"/>

Project/ProjectMgrUC.xaml.vb

@@ -142,7 +142,7 @@ Public Class ProjectMgrUC
       End If
       Dim nCountTable As Integer = GetTableCount()
       Select Case nCountTable
-         Case 4, 2
+         Case 4, 3, 2
             ' visualizzo l'elenco dei bottoni associati alle tavole disponibili
             Dim SelTabWD As New SelectTableWD(m_MainWindow)
             SelTabWD.ShowDialog()