OmagCUT 3.1c1 :

- sistemata scrittura e lettura nomi utensili e lavorazioni in ini di macchina come UTF8 - sistemazione scelta lavorazioni in Split anche per lama fissa - eliminati parametri WaterJet non usati - sistemazioni varie.
2026-03-09 17:47:57 +01:00
parent 82a99ff2b0
commit bd006a197f
26 changed files with 176 additions and 471 deletions
@@ -32,7 +32,7 @@ Friend Module CamAuto
      Return bOk
   End Function

-   Friend Function AddSawMachining(nOperId As Integer, ByRef nNewOperation As Integer) As Boolean
+   Friend Function UpdateSawing(nOperId As Integer, ByRef nNewOperation As Integer) As Boolean
      EgtLuaCreateGlobTable("CAM")
      SetLuaStandardCamParams()
      EgtLuaSetGlobIntVar("CAM.OPERID", nOperId)
@@ -702,14 +702,18 @@ Friend Module CamAuto
      Return False
   End Function

-   Friend Function CanChangeTool() As Boolean
-      If m_MainWindow.m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then
-         For Each ToolPosition As ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
-            If m_MainWindow.m_CurrentMachine.sCurrSaw = ToolPosition.sTool And ToolPosition.sName = "T0" Then
-               Return False
-            End If
-         Next
+   Friend Function CanChangeSaw() As Boolean
+      ' Se non è TC anche per lama, non è possibile
+      If m_MainWindow.m_CurrentMachine.MountedToolConfig <> CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then
+         Return False
      End If
+      ' Se è nei TC manuali con posizione T0, non è possibile
+      For Each ToolPosition As ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
+         If m_MainWindow.m_CurrentMachine.sCurrSaw = ToolPosition.sTool And ToolPosition.sName = "T0" Then
+            Return False
+         End If
+      Next
+      ' Si può cambiare
      Return True
   End Function

@@ -1033,7 +1037,7 @@ Friend Module CamAuto
   End Function

   Private Function SetLuaStandardCamParams(Optional bDripOk As Boolean = True) As Boolean
-      Dim bCanChangeTool As Boolean = CanChangeTool()
+      Dim bCanChangeTool As Boolean = CanChangeSaw()
      Dim sMaterial As String = m_MainWindow.m_CurrentMachine.CurrMat.sName
      Dim sSawMch As String = m_MainWindow.m_CurrentMachine.sCurrSawing
      Dim sSawTiltedMch As String = If( bCanChangeTool, m_MainWindow.m_CurrentMachine.sCurrSawingTilted, sSawMch)
@@ -10,9 +10,9 @@
   <Border Style="{DynamicResource OmagCut_Border}">
      <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="0.15*"/>
            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="0.15*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
            <RowDefinition Height="0.5*"/>
@@ -131,6 +131,8 @@ Public Class ChangeToolWD
   Private Sub CreateSawingList(SawingFam As TreeViewItem.CathegoryItem)
      ' Recupero le info della lama montata di default
      GetDiamAndThickDefaultSaw()
+      ' Verifico se lama fissa
+      Dim bFixedSaw As Boolean = Not CamAuto.CanChangeSaw()
      ' recupero la prima lavorazione
      For Each Item As TreeViewItem.CustomItem In SawingFam.Items
         Dim sNameTool As String = String.Empty
@@ -139,12 +141,17 @@ Public Class ChangeToolWD
         ' Recupero il nome dell'utensile della lavorazione
         EgtMdbGetCurrMachiningParam(MCH_MP.TOOL, sNameTool)
         If Not String.IsNullOrEmpty(sNameTool) And VerifyCurrSawTolerance(sNameTool) Then
-            ' Verifico che sia montata su un portautensile
+            ' Recupero la posizione
            EgtTdbSetCurrTool(sNameTool)
            Dim sTCPos As String = String.Empty
            EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sTCPos)
-            If Not String.IsNullOrEmpty(sTCPos) Then
-               ' Cerco nel porta utensili automatico 
+            ' Se lama fissa sono ammesse solo altre lavorazioni con la stessa
+            If bFixedSaw Then
+               If sNameTool = m_DefaultSaw_Name AndAlso VerifyCurrMachiningMaterial() Then
+                  m_SetUpMachiningList.Add(New ItemMachining(Item.Name, sNameTool, sTCPos, Utility.GetColorPV()))
+               End If
+            ' altrimenti cerco le lame compatibili nel TC automatico
+            ElseIf Not String.IsNullOrEmpty(sTCPos) Then
               For Each ToolPosition As ToolChangerPos In m_MainWindow.m_CurrentMachine.ToolChanger
                  If ToolPosition.sTool <> String.Empty Then
                     If sNameTool = ToolPosition.sTool Then
@@ -1029,7 +1029,7 @@ Public Class MoveRawPartPage
            Next
            If Not bOkRotate Then Return
         Else
-            ' sposto il pezzo in centro tavola → perchè tutti i movimenti sono fatti ruotando il pezzo in centro tavola!
+            ' sposto il pezzo in centro tavola, perchè tutti i movimenti sono fatti ruotando il pezzo in centro tavola!
            Dim b3Area As New BBox3d
            EgtGetTableArea(1, b3Area)
            Dim b3RawTemp As New BBox3d
@@ -1323,7 +1323,7 @@ Public Class NestPageUC
            m_dStartAng = dVAng
         End If
         Dim dDeltaAng As Double = dVAng - m_dStartAng
-         ' gestione del passaggio da 0° → 360° evitando mantenendo la visualizzazione fluida       
+         ' gestione del passaggio da 0° a 360° evitando mantenendo la visualizzazione fluida       
         If Math.Abs(dDeltaAng) > 90 Then
            If m_dStartAng < 180 And dVAng > 180 Then
               dDeltaAng = dVAng - 360 - m_dStartAng
@@ -3700,10 +3700,10 @@ Public Class NestPageUC
      ' Ruoto del valor medio delle differenze angolari
      Dim bRotOk As Boolean = RotateAllRawParts(dAngAverage, ptCentCUTList(0))
      Dim sCurrINdexSpot As String = GetIndexGroupSpotReg(SpotRegCUTList(0)).ToString
-      EgtOutLog(" → REG Adjustment data :")
-      EgtOutLog("   → move SpotReg_" & sCurrINdexSpot & " : " & DoubleToString(vtMoveStart.x, 3) & ", " & DoubleToString(vtMoveStart.y, 3) & If( bMoveOk, " Ok", " NO"))
-      EgtOutLog("   → rotation around SpotRegCUT_" & sCurrINdexSpot & " : " & DoubleToString(dAngAverage, 3) & If( bRotOk, " Ok", " NO"))
-      EgtOutLog("   → average scale deformation : " & DoubleToString(dScaleAverage, 6))
+      EgtOutLog(" -> REG Adjustment data :")
+      EgtOutLog("   -> move SpotReg_" & sCurrINdexSpot & " : " & DoubleToString(vtMoveStart.x, 3) & ", " & DoubleToString(vtMoveStart.y, 3) & If( bMoveOk, " Ok", " NO"))
+      EgtOutLog("   -> rotation around SpotRegCUT_" & sCurrINdexSpot & " : " & DoubleToString(dAngAverage, 3) & If( bRotOk, " Ok", " NO"))
+      EgtOutLog("   -> average scale deformation : " & DoubleToString(dScaleAverage, 6))

      ' Correggo lo spostamento medio residuale
      GetAllCenterSpotReg(SpotRegCUTList, SpotRegList, ptCentCUTList, ptCentLIst)
@@ -3714,7 +3714,7 @@ Public Class NestPageUC
      vtMoveSum.z = 0
      vtMoveSum = vtMoveSum / ptCentCUTList.Count
      Dim bMSumOk As Boolean = MoveAllRawParts(vtMoveSum)
-      EgtOutLog("   → average move : " & DoubleToString(vtMoveSum.x, 3) & ", " & DoubleToString(vtMoveSum.y, 3) & If( bMSumOk, " Ok", " NO"))
+      EgtOutLog("   -> average move : " & DoubleToString(vtMoveSum.x, 3) & ", " & DoubleToString(vtMoveSum.y, 3) & If( bMSumOk, " Ok", " NO"))

      EgtDraw()

@@ -286,7 +286,7 @@ Public Class SplitPageUC
               nIdParentPart = EgtGetParent(nIdParent)
               ' se non esiste almeno 1 Preview di tipo WaterJet
               If IsWaterJetting(nIdMy) Then
-                  ' NON RECUPERO LA PREVIEW DELLA LAVORAZIONE → m_nIdSelectedWaterJet
+                  ' NON RECUPERO LA PREVIEW DELLA LAVORAZIONE : m_nIdSelectedWaterJet
                  m_nIdSelectedSideWJ = nIdMy
                  ' recupero il punto più vicino alla curva passata
                  If IsFirst Then
@@ -527,7 +527,7 @@ Public Class SplitPageUC
            Return
         End If

-         ChangeMachinig(nMchId)
+         ChangeMachining(nMchId)
         GetCurrSelection()
         Return
      End If
@@ -651,7 +651,7 @@ Public Class SplitPageUC
      GetCurrSelection()
   End Sub

-   Private Sub ChangeMachinig(nMchId As Integer)
+   Private Sub ChangeMachining(nMchId As Integer)
      ' Cambiamenti possibili solo se taglio di lama
      If EgtGetOperationType( nMchId) <> MCH_OY.SAWING Then Return
      ' Imposto la lavorazione corrente
@@ -687,7 +687,7 @@ Public Class SplitPageUC
         EgtErase(m_MachiningList(Index).m_nNbrId)
         ' Aggiorno la lavorazione
         Dim nNewMchId As Integer = GDB_ID.NULL
-         CamAuto.AddSawMachining(nMchId, nNewMchId)
+         CamAuto.UpdateSawing(nMchId, nNewMchId)
         ' Aggiorno anche le lavorazioni dipendenti disabilitate
         Dim sOthMid As String = ""
         For Each nOthMId As Integer In m_MachiningList(Index).m_vOthId
@@ -695,7 +695,7 @@ Public Class SplitPageUC
            If EgtGetMachiningGeometry(0, EntId, SubEntId) Then
               EgtSetInfo(EntId, sDefMach, m_ChangeToolPage.NewSawing)
               Dim nNewOthMchId As Integer = GDB_ID.NULL
-               CamAuto.AddSawMachining(nOthMId, nNewOthMchId)
+               CamAuto.UpdateSawing(nOthMId, nNewOthMchId)
               EgtSetOperationMode(nNewOthMchId, False)
               sOthMid &= If( String.IsNullOrEmpty( sOthMid), "", ",") & nNewOthMchId.ToString() 
            End If
@@ -948,7 +948,7 @@ Public Class SplitPageUC
      Dim Index As Integer = MachiningLsBx.SelectedIndex
      If Index = -1 Then Return
      If m_MainWindow.m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then
-         ChangeMachinig(m_MachiningList(Index).m_nId)
+         ChangeMachining(m_MachiningList(Index).m_nId)
      End If
   End Sub

@@ -272,16 +272,7 @@
   Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
   Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
   Public Const K_USELASERORIGIN As String = "UseLaserOrigin"
-   Public Const K_HOLES_DIAMITERWJ As String = "HolesDiameterWJ"
-   Public Const K_HOLES_OFFSETWJ As String = "HolesOffsetWJ"
-   Public Const K_MIN_RADIUSWJ As String = "MinRadiusWJ"
-   Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners"
-   Public Const K_MACH_RECTIFICATION_ON_SUBSQUARE As String = "RectificationSubSqWJ"
   Public Const K_MACH_DRILL_MILL_C90 As String = "DrillMillC90"
-   ' CutLongDxSx
-   ' AngRotMultiCut
-   ' MinDistHeadsMultiCut
-   ' MinSawRbHeight

   Public Const S_MACH_FRAME As String = "Frame"
   Public Const K_MACH_PAUSE As String = "Pause"
@@ -36,7 +36,7 @@ Public Class ControlsDirectCutUC
   ' Variabile che indica se sono attivi i bottoni macchina nuovi o vecchi
   Friend m_NewMachineButtonsType As Boolean
   ' Indica che la finestra del talio Singolo deve essere di tipo manuale
-   Friend m_bManulaCut As Boolean = False
+   Friend m_bManualCut As Boolean = False

   ' elenco dei nuovi bottoni
   Private m_ButtonJogList As New List(Of MachineButton)
@@ -61,7 +61,7 @@ Public Class ControlsDirectCutUC

   Private Sub ControlsDirectCutUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
      ' leggo la configurazione del programma per i nuovi tagli manuali
-      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
+      m_bManualCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0

      'Creazione delle Page UserControl
      m_MachineButtons = New MachineButtonsUC
@@ -84,7 +84,7 @@ Public Class ControlsDirectCutUC
      m_MachineButtons.SetValue(Grid.RowProperty, 2)
      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
      m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
-      If m_bManulaCut Then
+      If m_bManualCut Then
         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
      Else
         m_SingleCut.SetValue(Grid.RowProperty, 1)
@@ -149,11 +149,11 @@ Public Class ControlsDirectCutUC

      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
-      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      Dim bH1Exists As Boolean = m_MainWindow.m_CurrentMachine.ExistsSawHead()

      ManualBtn.IsEnabled = bH1Exists
      ' sviluppo rimasto in sospeso
-      If m_bManulaCut Then
+      If m_bManualCut Then
         ' anche se non è presente un grezzo mantengo abilitato il bottone
         SingleCutBtn.IsEnabled = True
      Else
@@ -200,7 +200,7 @@ Public Class ControlsDirectCutUC
   End Sub

   Private Sub SingleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleCutBtn.Click
-      If m_bManulaCut Then
+      If m_bManualCut Then
         LeftButtonGrid.Children.Add(m_SingleCutAuto)
         m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto
      Else
@@ -73,13 +73,13 @@ Public Class ControlsDirectCutUC1
      ' Caso standard
      m_ActiveDirectCutPage = DirectCutPages.DirectCut1

-      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
+      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa per lama (H1)
      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
-      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      Dim bSawHeadOk As Boolean = m_MainWindow.m_CurrentMachine.ExistsSawHead()

      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
-      SawTestBtn.IsEnabled = (bRawOk And bH1Exists)
-      CopyTemplateBtn.IsEnabled = bH1Exists
+      SawTestBtn.IsEnabled = (bRawOk And bSawHeadOk)
+      CopyTemplateBtn.IsEnabled = bSawHeadOk

      ' aggiorno la visualizzazione dei parametri
      ReloadParam()
@@ -163,7 +163,7 @@ Public Class ManualAxesMoveUC
   Private m_MoveClicked As Boolean = False
   Private Sub XXBtn_Click(sender As Object, e As MouseButtonEventArgs) Handles L1Btn.PreviewMouseDown, L2Btn.PreviewMouseDown, L3Btn.PreviewMouseDown, R1Btn.PreviewMouseDown, R2Btn.PreviewMouseDown
      If e.ClickCount > 1 OrElse m_MoveClicked Then
-         EgtOutLog(" → Hold on! Do not click compulsively.")
+         EgtOutLog(" -> Hold on! Do not click compulsively.")
         Return
      End If
      m_MoveClicked = True
@@ -4,7 +4,7 @@
        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
        FontFamily="{DynamicResource OmagCut_Font}"
        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-        Title="ChooseMachining" Height="276.5" Width="426.5">
+        Title="CompoCsvData" Height="276.5" Width="426.5">

   <!--Definizione della pagina di impostazione dati Trf su componenti-->
   <Border Style="{DynamicResource OmagCut_Border}">
@@ -4,7 +4,7 @@
        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
        FontFamily="{DynamicResource OmagCut_Font}"
        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-        Title="ChooseMachining" Height="426.5" Width="426.5">
+        Title="CompoTrfData" Height="426.5" Width="426.5">

   <!--Definizione della pagina di impostazione dati Trf su componenti-->
   <Border Style="{DynamicResource OmagCut_Border}">
@@ -112,74 +112,6 @@
            </Grid>
         </GroupBox>

-         <!--Parametri rettifica tagli sottosquadra: 1 Parametro -->
-         <GroupBox Name="RectificationWJParamGpBx"  Grid.Column="1" Grid.Row="4" Margin="0,0,5,0"
-                   Style="{DynamicResource OmagCut_GroupBox}" >
-            <Grid Grid.Column="3" Grid.Row="2">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="*"/>
-               </Grid.RowDefinitions>
-
-               <TextBlock Name="EnableRectificationTxBl" Grid.Row="0" Grid.ColumnSpan="2"
-                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-               <CheckBox Name="EnableRectificationChBx" Grid.Row="0" Grid.ColumnSpan="2" 
-                         Style="{DynamicResource OmagCut_CheckBox_Single}"
-                         HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-            </Grid>
-         </GroupBox>
-
-         <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
-         <GroupBox Name="WjsParamGpBx" Grid.Column="1" Grid.RowSpan="4" Margin="0,0,5,0"
-                   Style="{DynamicResource OmagCut_GroupBox}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="145*"/>
-                  <ColumnDefinition Width="23*"/>
-                  <ColumnDefinition Width="169*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-               </Grid.RowDefinitions>
-
-               <TextBlock Name="WjIntCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
-                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-               <CheckBox Name="WjIntCutsChBx" Grid.Column="2" Grid.Row="0" 
-                         Style="{DynamicResource OmagCut_CheckBox_Single}"
-                         HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-               <TextBlock Name="HolesDiameterWJTxBl" Grid.Column="0" Grid.Row="1"
-                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-               <EgtWPFLib:EgtTextBox Name="HolesDiameterWJTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
-                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-               <TextBlock Name="HolesOffsetWJTxBl" Grid.Column="0" Grid.Row="2"
-                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-               <EgtWPFLib:EgtTextBox Name="HolesOffsetWJTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
-                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-               <TextBlock Name="MinRadiusWJTxBl" Grid.Column="0" Grid.Row="3"
-                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-               <EgtWPFLib:EgtTextBox Name="MinRadiusWJTxBx" Grid.Column="2" Grid.Row="3" Margin="10,0,10,0"
-                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-               <TextBlock Name="OneHoleInCornerWJTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
-                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-               <CheckBox Name="OneHoleInCornerWJChBx" Grid.Column="2" Grid.Row="4" 
-                         Style="{DynamicResource OmagCut_CheckBox_Single}"
-                         HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-            </Grid>
-         </GroupBox>
-
         <!--Parametri Fresatura: 3 Parametri-->
         <GroupBox Name="MillingsParamGpBx" Grid.Column="2" Grid.RowSpan="3" Margin="0,0,5,0"
                   Style="{DynamicResource OmagCut_GroupBox}">
@@ -213,7 +145,6 @@

            </Grid>
         </GroupBox>
-
      </Grid>
   </Border>
 </UserControl>
@@ -17,9 +17,6 @@ Public Class Alarms2PageUC
      SawGpBx.Header = EgtMsg(90925)                                     ' Parametri lama
      HolesGpBx.Header = EgtMsg(90917)                                   ' Parametri fori
      MillingsParamGpBx.Header = EgtMsg(90929)                           ' Parametri fresature
-      WjsParamGpBx.Header = EgtMsg(91058)                                ' Parametri waterjet
-      WjsParamGpBx.Header = EgtMsg(91058)                                ' Parametri waterjet
-      RectificationWJParamGpBx.Header = EgtMsg(91047)                    ' Rettifica

      HolesOffsetTxBl.Text = EgtMsg(90909)                               ' Offset fori
      HolesOverlapTxBl.Text = EgtMsg(90910)                              ' Sovrapp. fori
@@ -33,21 +30,12 @@ Public Class Alarms2PageUC
      CornerCutsTxBl.Text = EgtMsg(90944)                                ' Sempre sugli angoli
      InternalCutsTxBl.Text = EgtMsg(90930)                              ' Sempre sugli interni
      ShortTxBl.Text = EgtMsg(90949)                                     ' Accorciamento
-      '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
-      EnableRectificationTxBl.Text = EgtMsg(91048)                       ' Abilita (sottosquadra)
-      '-- INIZIO -- nuovi parametri per preforo lavello
-      WjIntCutsTxBl.Text = EgtMsg(90930)                                 ' Sempre sugli interni
-      HolesDiameterWJTxBl.Text = EgtMsg(91044)                           ' Diametro
-      HolesOffsetWJTxBl.Text = EgtMsg(91045)                             ' Offset
-      MinRadiusWJTxBl.Text = EgtMsg(91046)                               ' Raggio Minimo
-      OneHoleInCornerWJTxBl.Text = EgtMsg(90926)                         ' Un solo foro in angolo
-
   End Sub

   Private Sub Allarm2Page_Loaded() Handles Me.Loaded
      If m_bFirst Then
-         ' in assenza dell'uscita H1 nascondo i parametri lama
-         If EgtGetHeadId("H1") = GDB_ID.NULL Then
+         ' in assenza della testa per lama (H1) nascondo i parametri lama
+         If Not m_CurrentMachine.ExistsSawHead() Then
            SawGpBx.Visibility = Visibility.Hidden
         End If

@@ -72,12 +60,6 @@ Public Class Alarms2PageUC
            MillingsParamGpBx.Visibility = Visibility.Hidden
         End If

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

@@ -130,17 +112,6 @@ Public Class Alarms2PageUC
      ' Leggo accorciamento angoli con fresa
      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
      ShortTxBx.Text = LenToString(dVal, 2)
-      ' leggo se attiva la rettifica degli angoli per WaterJet
-      EnableRectificationChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      WjIntCutsChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      ' Lavorazione preforo lavello con WaterJet
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_DIAMITERWJ, 0, m_MainWindow.GetMachIniFile())
-      HolesDiameterWJTxBx.Text = LenToString(dVal, 2)
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_OFFSETWJ, 0, m_MainWindow.GetMachIniFile())
-      HolesOffsetWJTxBx.Text = LenToString(dVal, 2)
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MIN_RADIUSWJ, 0, m_MainWindow.GetMachIniFile())
-      MinRadiusWJTxBx.Text = LenToString(dVal, 2)
-      OneHoleInCornerWJChBx.IsChecked = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
   End Sub

   Private Sub CutExtraLenTxBx_EgtClosed(sender As Object, e As EventArgs) Handles CutExtraLenTxBx.EgtClosed
@@ -241,50 +212,4 @@ Public Class Alarms2PageUC
      End If
   End Sub

-   ' -- INIZIO -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
-   Private Sub EnableRectificationChBx_Click(sender As Object, e As EventArgs) Handles EnableRectificationChBx.Click
-      If EnableRectificationChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "1", m_MainWindow.GetMachIniFile)
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "0", m_MainWindow.GetMachIniFile)
-      End If
-   End Sub
-   ' --   FINE   -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
-
-   Private Sub WjIntCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles WjIntCutsChBx.Click
-      If WjIntCutsChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
-   ' -- INIZIO -- nuovi parametri per prefori WaterJet
-   Private Sub HolesDiameterWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesDiameterWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesDiameterWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_HOLES_DIAMITERWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub HolesOffsetWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesOffsetWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesOffsetWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_HOLES_OFFSETWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub MinRadiusWJTxBx_Click(sender As Object, e As EventArgs) Handles MinRadiusWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(MinRadiusWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MIN_RADIUSWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub OneHoleInCornerWJChBx_Click(sender As Object, e As EventArgs) Handles OneHoleInCornerWJChBx.Click
-      If OneHoleInCornerWJChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-   ' --   FINE   -- nuovi parametri per prefori WaterJet
-
 End Class
@@ -135,115 +135,9 @@
                          Style="{DynamicResource OmagCut_YellowTextButton}"/>

               </Grid>
-
            </GroupBox>
-
         </Grid>

-         <!--<Grid Grid.Column="2" Grid.Row="2" Grid.RowSpan="6">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition />
-               <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="*"/>
-               <RowDefinition Height="*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="*"/>
-               <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-
-            <GroupBox Name="HolesGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="3" 
-               Style="{DynamicResource OmagCut_GroupBox}">
-
-               <Grid>
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="145*"/>
-                     <ColumnDefinition Width="23*"/>
-                     <ColumnDefinition Width="169*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                  <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="2" Grid.Row="0" Margin="10,0,10,0"
-                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                  <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
-                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                  <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
-                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                  <CheckBox Name="OneHoleInCornerChBx" Grid.Column="2" Grid.Row="3" Style="{StaticResource OmagCut_CheckBox_Single}"
-                     HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-               </Grid>
-
-            </GroupBox>
-
-            <GroupBox Name="MillingsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="2">
-               <Grid Grid.Column="3" Grid.Row="2">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="*"/>
-                     <RowDefinition Height="*"/>
-                     <RowDefinition Height="*"/>
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Name="CornerCutsTxBl" Grid.Row="0" Grid.ColumnSpan="2"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                  <CheckBox Name="CornerCutsChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-                     HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-                  <TextBlock Name="InternalCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
-                  <CheckBox Name="InternalCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-                     HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-                  <TextBlock Name="ShortTxBl" Grid.Column="0" Grid.Row="2"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ShortTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
-                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-               </Grid>
-
-            </GroupBox>
-
-            <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="1" 
-               Style="{DynamicResource OmagCut_GroupBox}">
-               <Grid Grid.Column="3" Grid.Row="2">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="*"/>
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Name="WjIntCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
-               <CheckBox Name="WjIntCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-                     HorizontalAlignment="Right" Margin="0,0,10,0"/>
-               </Grid>
-            </GroupBox>
-
-         </Grid>-->
-
         <GroupBox Name="MaterialsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Margin="5,0,5,0"
                   Grid.Row="3" Grid.ColumnSpan="1" Grid.RowSpan="5">

@@ -353,44 +247,6 @@

         </GroupBox>

-         <!--<GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.RowSpan="2">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-               </Grid.RowDefinitions>
-
-               <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
-                  Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-               <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
-                  Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-               <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
-                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-               <TextBlock Name="IntArcMaxSideAngTxBl" Grid.Column="0" Grid.Row="3"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="IntArcMaxSideAngTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
-                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-            </Grid>
-
-         </GroupBox>-->
-
         <Grid Grid.Column="1" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,5,0" >
            <Grid.ColumnDefinitions>
               <ColumnDefinition />
@@ -428,16 +284,6 @@
            </GroupBox>
         </Grid>

-         <!--<GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="8">
-            <Grid>
-               <TextBlock Name="FinalHomeTxBl"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-               <CheckBox Name="FinalHomeChBx" Style="{StaticResource OmagCut_CheckBox_Single}"
-                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
-            </Grid>
-
-         </GroupBox>-->
-
         <GroupBox Name="NestingParamGpBx" Margin="0,0,5,0"
                   Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3">
            <Grid Name="NestingGrid">
@@ -113,8 +113,8 @@ Public Class AlarmsPageUC

   Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         ' in assenza dell'uscita H1 nascondo i parametri lama
-         If EgtGetHeadId("H1") = GDB_ID.NULL Then
+         ' in assenza della testa lama (H1) nascondo i parametri lama
+         If Not m_CurrentMachine.ExistsSawHead() Then
            TopMillGpBx.Visibility = Visibility.Hidden
            CurrSawTxBl.Visibility = Visibility.Hidden
            CurrSawCmBx.Visibility = Visibility.Hidden
@@ -151,7 +151,7 @@ Public Class AlarmsPageUC
         End If

         ' Abilitazione Feed ridotta su inizio/fine tagli
-         If m_CurrentMachine.bFsevEnable And EgtGetHeadId("H1") <> GDB_ID.NULL Then
+         If m_CurrentMachine.bFsevEnable And m_CurrentMachine.ExistsSawHead() Then
            CutFredGpBx.Visibility = Windows.Visibility.Visible
         Else
            CutFredGpBx.Visibility = Windows.Visibility.Hidden
@@ -183,7 +183,7 @@ Public Class AlarmsPageUC

         Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
            m_AuxToolTypeList.Clear()
-            ' creo l'elenco degli utensili ausiliri
+            ' creo l'elenco degli utensili ausiliari
            If m_CurrentMachine.bDrill Then
               m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(90921)))      ' Foretto
            End If
@@ -265,7 +265,7 @@ Public Class AlarmsPageUC
                  EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sTCPos)
                  If Not String.IsNullOrEmpty(sTCPos) Then
                     ' Cerco nel TC automatico 
-                     For Each ToolPosition As ToolChangerPos In m_MainWindow.m_CurrentMachine.ToolChanger
+                     For Each ToolPosition As ToolChangerPos In m_CurrentMachine.ToolChanger
                        If ToolPosition.sTool <> String.Empty Then
                           If sNameTool = ToolPosition.sTool Then
                              SawOnAllTcList.Add(sNameTool)
@@ -277,7 +277,7 @@ Public Class AlarmsPageUC
                        End If
                     Next
                     ' Cerco nel TC manuale 
-                     For Each ToolPosition As ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
+                     For Each ToolPosition As ToolChangerPos In m_CurrentMachine.ManualToolChanger
                        If ToolPosition.sTool <> String.Empty Then
                           If sNameTool = ToolPosition.sTool Then
                              SawOnAllTcList.Add(sNameTool)
@@ -311,7 +311,7 @@ Public Class AlarmsPageUC
            End If

            ' Se abilitato TC, visualizzo la selezione della lama per il taglio inclinato
-            If CamAuto.CanChangeTool() Then
+            If CamAuto.CanChangeSaw() Then
               CurrSawTiltedTxBl.Visibility = Visibility.Visible
               CurrSawTiltedCmBx.Visibility = Visibility.Visible
            End If
@@ -333,7 +333,7 @@ Public Class AlarmsPageUC
      ' Salvo DB lavorazioni con aggiornamenti parametri generali
      EgtMdbSave()
      ' Leggo flag abilitazione incisioni con fresa
-      TmEnableChBx.IsChecked =
+      TmEnableChBx.IsChecked = m_CurrentMachine.bMilling AndAlso
             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile()) <> 0)
      ' Leggo profondità e larghezza incisioni
      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_ENGRAVING_DEPTH, 0, m_MainWindow.GetMachIniFile())
@@ -352,7 +352,7 @@ Public Class AlarmsPageUC
      AutomaticChBx.IsChecked = (GetPrivateProfileInt(S_NEST, K_AUTOMATICOPTIMIZE, 0, m_MainWindow.GetIniFile()) <> 0)
      AdjustGhigliottinaTextOnAutomaticOrCompleteCuts()
      ' Flag per inserire la puasa dopo la sgrossatura delle cornici
-      If m_MainWindow.m_CurrentMachine.bSawRoughing Then
+      If m_CurrentMachine.bSawRoughing Then
         FrameGpBx.Visibility = Visibility.Visible
         FramePauseChBx.IsChecked = (GetPrivateProfileInt(S_MACH_FRAME, K_MACH_PAUSE, 1, m_MainWindow.GetMachIniFile()) <> 0)
      Else
@@ -400,9 +400,9 @@ Public Class AlarmsPageUC
      End If

      ' Taglio finale
-      If m_MainWindow.m_CurrentMachine.bSawing Then
+      If m_CurrentMachine.bSawing Then
         FinalSawCutGpBx.Visibility = Visibility.Visible
-         EnableFinalSawCutChBx.IsChecked = m_MainWindow.m_CurrentMachine.bEnableFinalSawCut
+         EnableFinalSawCutChBx.IsChecked = m_CurrentMachine.bEnableFinalSawCut
      Else
         FinalSawCutGpBx.Visibility = Visibility.Hidden
         EnableFinalSawCutChBx.IsChecked = False
@@ -516,7 +516,13 @@ Public Class AlarmsPageUC
      Select Case SelectedItem.nId
         Case 0
            m_CurrentMachine.sCurrDrill = String.Empty
+            m_CurrentMachine.sCurrDrilling = String.Empty
            m_CurrentMachine.sCurrMill = String.Empty
+            m_CurrentMachine.sCurrMilling = String.Empty
+            m_CurrentMachine.sCurrMillNoTip = String.Empty
+            m_CurrentMachine.sCurrPocketing = String.Empty
+            m_CurrentMachine.sCurrWaterJet = String.Empty
+            m_CurrentMachine.sCurrWaterJetting = String.Empty
         Case 1
            CreateToolList(MCH_TF.DRILLBIT, m_DrillList)
            m_DrillList.Add(NO_TOOL)
@@ -582,7 +588,7 @@ Public Class AlarmsPageUC
            CurrWJetTxBl.Visibility = Windows.Visibility.Visible
            CurrWJetCmBx.Visibility = Windows.Visibility.Visible
      End Select
-      ' aggionro l'elenco delle lavoarzioni
+      ' aggiorno l'elenco delle lavorazioni
      RefreshMachining()

   End Sub
@@ -644,7 +650,7 @@ Public Class AlarmsPageUC
      ' Se TC anche con lame
      If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then
         ' Se in uso lama da TC
-         If CamAuto.CanChangeTool() Then
+         If CamAuto.CanChangeSaw() Then
            CurrSawTiltedTxBl.Visibility = Visibility.Visible
            CurrSawTiltedCmBx.Visibility = Visibility.Visible
            If Not String.IsNullOrEmpty(m_CurrentMachine.sCurrSawTilted) Then
@@ -1368,8 +1374,8 @@ Public Class AlarmsPageUC
   End Function

   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())
+      m_CurrentMachine.bEnableFinalSawCut = EnableFinalSawCutChBx.IsChecked
+      WritePrivateProfileString(S_MACH, K_ENABLEFINALSAWCUT, If(m_CurrentMachine.bEnableFinalSawCut, "1", "0"), m_MainWindow.GetMachIniFile())
   End Sub

 End Class
@@ -30,8 +30,6 @@ Public Class CurrentMachine

   ' Dati su linea di produzione
   Private m_bDemo As Boolean = False
-   Public nLastProjSentToViewDEMO As Integer = 0
-
   Private m_bProdLine As Boolean = False
   Private m_sVarProg1 As String = "E80021"
   Private m_nProg1 As Integer = 901
@@ -81,8 +79,8 @@ Public Class CurrentMachine
   Private m_bPolishingWheel As Boolean = False
   Private m_bWaterJet As Boolean = False

-   ' Flag che indica se gesire l'inversione del taglio nei tagli singoli
-   Private m_bEnableInvetrt As Boolean = True
+   ' Flag che indica se gestire l'inversione del taglio nei tagli singoli
+   Private m_bEnableInvert As Boolean = True

   ' Abilitazione DB WaterJet
   Private m_bFromDBWaterJet As Boolean = False
@@ -454,6 +452,10 @@ Public Class CurrentMachine
      End Set
   End Property

+   Friend Function ExistsSawHead As Boolean
+      Return ( EgtGetHeadId("H1") <> GDB_ID.NULL)
+   End Function
+
   Friend ReadOnly Property bSaw As Boolean
      Get
         Return m_bSaw
@@ -579,7 +581,7 @@ Public Class CurrentMachine
         Return m_sCurrSaw
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAW, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAW, value, sMachIniFile) Then
            m_sCurrSaw = value
            m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text = value
         End If
@@ -591,7 +593,7 @@ Public Class CurrentMachine
         Return m_sCurrSawTilted
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWTILTED, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAWTILTED, value, sMachIniFile) Then
            m_sCurrSawTilted = value
            ' m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text = value
         End If
@@ -603,7 +605,7 @@ Public Class CurrentMachine
         Return m_sCurrDrill
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRDRILL, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRDRILL, value, sMachIniFile) Then
            m_sCurrDrill = value
         End If
      End Set
@@ -614,7 +616,7 @@ Public Class CurrentMachine
         Return m_sCurrMill
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRMILL, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRMILL, value, sMachIniFile) Then
            m_sCurrMill = value
         End If
      End Set
@@ -625,7 +627,7 @@ Public Class CurrentMachine
         Return m_sCurrMillNoTip
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRMILLNOTIP, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRMILLNOTIP, value, sMachIniFile) Then
            m_sCurrMillNoTip = value
         End If
      End Set
@@ -636,7 +638,7 @@ Public Class CurrentMachine
         Return m_sCurrDripSaw
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRDRIPSAW, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRDRIPSAW, value, sMachIniFile) Then
            m_sCurrDripSaw = value
         End If
      End Set
@@ -647,7 +649,7 @@ Public Class CurrentMachine
         Return m_sCurrDripDrill
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILL, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRDRIPDRILL, value, sMachIniFile) Then
            m_sCurrDripDrill = value
         End If
      End Set
@@ -658,7 +660,7 @@ Public Class CurrentMachine
         Return m_sCurrWaterJet
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJET, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRWATERJET, value, sMachIniFile) Then
            m_sCurrWaterJet = value
         End If
      End Set
@@ -669,7 +671,7 @@ Public Class CurrentMachine
         Return m_sCurrSawing
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAWING, value, sMachIniFile) Then
            m_sCurrSawing = value
            m_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
         End If
@@ -681,7 +683,7 @@ Public Class CurrentMachine
         Return m_sCurrSawingTilted
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWINGTILTED, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAWINGTILTED, value, sMachIniFile) Then
            m_sCurrSawingTilted = value
            'm_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
         End If
@@ -694,11 +696,7 @@ Public Class CurrentMachine
      End Get
      Set(value As Boolean)
         m_bApplySawingTilted = value
-         If m_bApplySawingTilted Then
-            WritePrivateProfileString(S_MACH_MACH, K_APPLYSAWINGTILTED, "1", sMachIniFile)
-         Else
-            WritePrivateProfileString(S_MACH_MACH, K_APPLYSAWINGTILTED, "0", sMachIniFile)
-         End If
+         EgtWriteStringUtf8toIni(S_MACH_MACH, K_APPLYSAWINGTILTED, If( m_bApplySawingTilted,"1","0"), sMachIniFile)
      End Set
   End Property

@@ -707,7 +705,7 @@ Public Class CurrentMachine
         Return m_sCurrDrilling
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRDRILLING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRDRILLING, value, sMachIniFile) Then
            m_sCurrDrilling = value
         End If
      End Set
@@ -718,7 +716,7 @@ Public Class CurrentMachine
         Return m_sCurrMilling
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRMILLING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRMILLING, value, sMachIniFile) Then
            m_sCurrMilling = value
         End If
      End Set
@@ -729,7 +727,7 @@ Public Class CurrentMachine
         Return m_sCurrPocketing
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRPOCKETING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRPOCKETING, value, sMachIniFile) Then
            m_sCurrPocketing = value
         End If
      End Set
@@ -740,7 +738,7 @@ Public Class CurrentMachine
         Return m_sCurrSawRoughing
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWROUGHING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAWROUGHING, value, sMachIniFile) Then
            m_sCurrSawRoughing = value
         End If
      End Set
@@ -751,7 +749,7 @@ Public Class CurrentMachine
         Return m_sCurrSawFinishing
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWFINISHING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAWFINISHING, value, sMachIniFile) Then
            m_sCurrSawFinishing = value
         End If
      End Set
@@ -762,7 +760,7 @@ Public Class CurrentMachine
         Return m_sCurrSawSideFinishing
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWSIDEFINISHING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAWSIDEFINISHING, value, sMachIniFile) Then
            m_sCurrSawSideFinishing = value
         End If
      End Set
@@ -773,7 +771,7 @@ Public Class CurrentMachine
         Return m_sCurrSawSingle
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWSINGLE, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRSAWSINGLE, value, sMachIniFile) Then
            m_sCurrSawSingle = value
         End If
      End Set
@@ -784,7 +782,7 @@ Public Class CurrentMachine
         Return m_sCurrDripSawing
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRDRIPSAWING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRDRIPSAWING, value, sMachIniFile) Then
            m_sCurrDripSawing = value
         End If
      End Set
@@ -795,7 +793,7 @@ Public Class CurrentMachine
         Return m_sCurrDripDrilling
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILLING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRDRIPDRILLING, value, sMachIniFile) Then
            m_sCurrDripDrilling = value
         End If
      End Set
@@ -806,12 +804,11 @@ Public Class CurrentMachine
         Return m_sCurrWaterJetting
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRWATERJETTING, value, sMachIniFile) Then
            m_sCurrWaterJetting = value
-            If m_MainWindow.m_CurrentMachine.bWaterJet And EgtGetHeadId("H1") = GDB_ID.NULL Then
+            If m_bWaterJet And Not ExistsSawHead() Then
               m_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
            End If
-
         End If
      End Set
   End Property
@@ -821,7 +818,7 @@ Public Class CurrentMachine
         Return m_sCurrWaterJettingQuality
      End Get
      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, value, sMachIniFile) Then
+         If EgtWriteStringUtf8toIni(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, value, sMachIniFile) Then
            m_sCurrWaterJettingQuality = value
         End If
      End Set
@@ -835,7 +832,7 @@ Public Class CurrentMachine

   Friend ReadOnly Property bEnableInvert As Boolean
      Get
-         Return m_bEnableInvetrt
+         Return m_bEnableInvert
      End Get
   End Property

@@ -1046,7 +1043,7 @@ Public Class CurrentMachine
      Set(value As String)
         If value <> m_ToolChanger(Index).sTool Then
            m_ToolChanger(Index).sTool = value
-            WritePrivateProfileString(S_TOOLCHANGER, K_POS & Index + 1, value, sMachIniFile)
+            EgtWriteStringUtf8toIni(S_TOOLCHANGER, K_POS & (Index + 1).ToString(), value, sMachIniFile)
         End If
      End Set
   End Property
@@ -1077,7 +1074,7 @@ Public Class CurrentMachine
      Set(value As String)
         If value <> m_ManualToolChanger(Index).sTool Then
            m_ManualToolChanger(Index).sTool = value
-            WritePrivateProfileString(S_TOOLCHANGER, K_MANUALPOS & Index + 1, value, sMachIniFile)
+            EgtWriteStringUtf8toIni(S_TOOLCHANGER, K_MANUALPOS & (Index + 1).ToString(), value, sMachIniFile)
         End If
      End Set
   End Property
@@ -1235,9 +1232,9 @@ Public Class CurrentMachine
      ' Leggo da file ini nome macchina corrente
      GetPrivateProfileString(S_MACH, K_CURRMACH, "", m_sMachineName, m_MainWindow.GetIniFile())
      ' Impostazione direttorio macchina
-      m_sMachDir = m_MainWindow.GetMachinesRootDir & "\" & sMachineName
+      m_sMachDir = m_MainWindow.GetMachinesRootDir & "\" & m_sMachineName
      ' Impostazione path MachIni file
-      m_sMachIniFile = m_MainWindow.GetMachinesRootDir & "\" & sMachineName & "\" & sMachineName & ".ini"
+      m_sMachIniFile = m_MainWindow.GetMachinesRootDir & "\" & m_sMachineName & "\" & m_sMachineName & ".ini"
      ' Leggo estensione del file programma pezzo
      GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, "xpi", m_sIsoFileExt, sMachIniFile)
      ' per gestione canali separati (macchina NUM con più di 5 Assi) ver. 2.5g1
@@ -1274,12 +1271,12 @@ Public Class CurrentMachine
      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGSTATE2VAR, "", m_sProdLiProbingState2Var, sMachIniFile)
      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGTCPOS2VAR, "0", m_sProdLiProbingTcPos2Var, sMachIniFile)
      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLISAWDIAMETER2VAR, "", m_sProdLiSawDiameter2Var, sMachIniFile)
-
+      ' Leggo parametri per foto su linea di lucidatura
      GetPrivateProfileString(S_POLISHLINE, K_CLICKSTATE, "", m_sClickState, sMachIniFile)
      GetPrivateProfileString(S_POLISHLINE, k_CLICKDIR, "", m_sClickDir, sMachIniFile)
-      If Not Directory.Exists(m_sClickDir) Then
+      If Not String.IsNullOrEmpty( m_sClickState) AndAlso Not Directory.Exists(m_sClickDir) Then
         m_sClickState = ""
-         EgtOutLog("Directory " & m_sClickDir & " does not exist")
+         EgtOutLog("Polish Line Directory " & m_sClickDir & " does not exist")
      End If

      ' Leggo configurazione degli utensili in macchina
@@ -1339,61 +1336,61 @@ Public Class CurrentMachine
      ' possibilità di definire attacco speciale per materiali ceramici
      m_bSawingSpecialLeadIn = (GetPrivateProfileInt(S_MACHININGS, K_SAWINGSPECIALLEADIN, 0, sMachIniFile) > 0)
      ' mantengo la direzione del taglio definita nel taglio diretto
-      m_bEnableInvetrt = (GetPrivateProfileInt(S_DIRECTCUTS, K_ENABLEINVERT, 1, sMachIniFile) <> 0)
+      m_bEnableInvert = (GetPrivateProfileInt(S_DIRECTCUTS, K_ENABLEINVERT, 1, sMachIniFile) <> 0)

      ' Leggo utensili correnti
      ' lama
-      GetPrivateProfileString(S_MACH_MACH, K_CURRSAW, Nothing, m_sCurrSaw, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAW, "", m_sCurrSaw, sMachIniFile)
      ' lama inclinata
      If m_MountedToolConfig = 4 Then
-         GetPrivateProfileString(S_MACH_MACH, K_CURRSAWTILTED, Nothing, m_sCurrSawTilted, sMachIniFile)
+         EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAWTILTED, "", m_sCurrSawTilted, sMachIniFile)
      Else
         ' se non è configurato il cambio utensile e allora imposto l'unica lama disponibile per i tagli inclinati
         m_sCurrSawTilted = m_sCurrSaw
      End If

      ' foretto
-      GetPrivateProfileString(S_MACH_MACH, K_CURRDRILL, Nothing, m_sCurrDrill, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRDRILL, "", m_sCurrDrill, sMachIniFile)
      ' fresa
-      GetPrivateProfileString(S_MACH_MACH, K_CURRMILL, Nothing, m_sCurrMill, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRMILL, "", m_sCurrMill, sMachIniFile)
      ' mola
-      GetPrivateProfileString(S_MACH_MACH, K_CURRMILLNOTIP, Nothing, m_sCurrMillNoTip, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRMILLNOTIP, "", m_sCurrMillNoTip, sMachIniFile)
      ' lama da sotto
-      GetPrivateProfileString(S_MACH_MACH, K_CURRDRIPSAW, Nothing, m_sCurrDripSaw, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRDRIPSAW, "", m_sCurrDripSaw, sMachIniFile)
      ' foretto da sotto
-      GetPrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILL, Nothing, m_sCurrDripDrill, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRDRIPDRILL, "", m_sCurrDripDrill, sMachIniFile)
      ' waterjet
-      GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJET, Nothing, m_sCurrWaterJet, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRWATERJET, "", m_sCurrWaterJet, sMachIniFile)

      ' Leggo lavorazioni correnti
      ' lama
-      GetPrivateProfileString(S_MACH_MACH, K_CURRSAWING, Nothing, m_sCurrSawing, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAWING, "", m_sCurrSawing, sMachIniFile)
      ' lama inlicnata
-      GetPrivateProfileString(S_MACH_MACH, K_CURRSAWINGTILTED, Nothing, m_sCurrSawingTilted, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAWINGTILTED, "", m_sCurrSawingTilted, sMachIniFile)
      ' applica lavorazione di lama inclinata
      m_bApplySawingTilted = (GetPrivateProfileInt(S_MACH_MACH, K_APPLYSAWINGTILTED, 0, sMachIniFile) <> 0)
      ' foretto
-      GetPrivateProfileString(S_MACH_MACH, K_CURRDRILLING, Nothing, m_sCurrDrilling, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRDRILLING, "", m_sCurrDrilling, sMachIniFile)
      ' fresa
-      GetPrivateProfileString(S_MACH_MACH, K_CURRMILLING, Nothing, m_sCurrMilling, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRMILLING, "", m_sCurrMilling, sMachIniFile)
      ' svuotatura
-      GetPrivateProfileString(S_MACH_MACH, K_CURRPOCKETING, Nothing, m_sCurrPocketing, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRPOCKETING, "", m_sCurrPocketing, sMachIniFile)
      ' sgrossatura con lama
-      GetPrivateProfileString(S_MACH_MACH, K_CURRSAWROUGHING, Nothing, m_sCurrSawRoughing, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAWROUGHING, "", m_sCurrSawRoughing, sMachIniFile)
      ' finitura con lama
-      GetPrivateProfileString(S_MACH_MACH, K_CURRSAWFINISHING, Nothing, m_sCurrSawFinishing, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAWFINISHING, "", m_sCurrSawFinishing, sMachIniFile)
      ' spatolatura con lama
-      GetPrivateProfileString(S_MACH_MACH, K_CURRSAWSIDEFINISHING, Nothing, m_sCurrSawSideFinishing, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAWSIDEFINISHING, "", m_sCurrSawSideFinishing, sMachIniFile)
      ' taglio singolo
-      GetPrivateProfileString(S_MACH_MACH, K_CURRSAWSINGLE, Nothing, m_sCurrSawSingle, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRSAWSINGLE, "", m_sCurrSawSingle, sMachIniFile)
      ' lama da sotto
-      GetPrivateProfileString(S_MACH_MACH, K_CURRDRIPSAWING, Nothing, m_sCurrDripSawing, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRDRIPSAWING, "", m_sCurrDripSawing, sMachIniFile)
      ' foretto da sotto
-      GetPrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILLING, Nothing, m_sCurrDripDrilling, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRDRIPDRILLING, "", m_sCurrDripDrilling, sMachIniFile)
      ' waterjetting
-      GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING, Nothing, m_sCurrWaterJetting, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRWATERJETTING, "", m_sCurrWaterJetting, sMachIniFile)
      ' waterjettingquality
-      GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, Nothing, m_sCurrWaterJettingQuality, sMachIniFile)
+      EgtGetStringUtf8FromIni(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, "", m_sCurrWaterJettingQuality, sMachIniFile)

      ' Leggo numero di portautensili
      m_ToolChangerNbr = GetPrivateProfileInt(S_TOOLCHANGER, K_NUMBER, 0, sMachIniFile)
@@ -1403,8 +1400,8 @@ Public Class CurrentMachine
      For Index As Integer = 1 To m_ToolChangerNbr
         Dim sName As String = String.Empty
         Dim sTool As String = String.Empty
-         GetPrivateProfileString(S_TOOLCHANGER, K_NAME & Index, Nothing, sName, sMachIniFile)
-         GetPrivateProfileString(S_TOOLCHANGER, K_POS & Index, Nothing, sTool, sMachIniFile)
+         EgtGetStringUtf8FromIni(S_TOOLCHANGER, K_NAME & Index.ToString(), "", sName, sMachIniFile)
+         EgtGetStringUtf8FromIni(S_TOOLCHANGER, K_POS & Index.ToString(), "", sTool, sMachIniFile)
         m_ToolChanger.Add(New ToolChangerPos(Index, sName, sTool))
      Next

@@ -1416,8 +1413,8 @@ Public Class CurrentMachine
      For Index As Integer = 1 To m_ManualToolChangerNbr
         Dim sName As String = String.Empty
         Dim sTool As String = String.Empty
-         GetPrivateProfileString(S_TOOLCHANGER, K_MANUALNAME & Index, Nothing, sName, sMachIniFile)
-         GetPrivateProfileString(S_TOOLCHANGER, K_MANUALPOS & Index, Nothing, sTool, sMachIniFile)
+         EgtGetStringUtf8FromIni(S_TOOLCHANGER, K_MANUALNAME & Index.ToString(), "", sName, sMachIniFile)
+         EgtGetStringUtf8FromIni(S_TOOLCHANGER, K_MANUALPOS & Index.ToString(), "", sTool, sMachIniFile)
         m_ManualToolChanger.Add(New ToolChangerPos(Index, sName, sTool))
      Next

@@ -1662,7 +1659,7 @@ Public Class CurrentMachine
      ' Imposto utensile lama corrente
      If Not String.IsNullOrWhiteSpace(Machining) AndAlso EgtMdbSetCurrMachining(Machining) Then
         Dim UserNotes As String = String.Empty
-         ' salvo nel db corrente della lavorazione questa info → devo gestire l'inserimento: sovrascrivo NON ESEGUE un APPEND delle info
+         ' Aggiunge Key=Value; alle UserNotes della lavorazione
         EgtMdbSetCurrMachiningParam(MCH_MP.USERNOTES, AssembUserNote(sKeyUserNote, sValUserNote, Machining))
         EgtMdbSaveCurrMachining()
         EgtMdbSave()
@@ -1679,7 +1676,7 @@ Public Class CurrentMachine
      ' Imposto utensile lama corrente
      If Not String.IsNullOrWhiteSpace(Tool) AndAlso EgtTdbSetCurrTool(Tool) Then
         Dim UserNotes As String = String.Empty
-         ' salvo nel db corrente della lavorazione questa info → devo gestire l'inserimento: sovrascrivo NON ESEGUE un APPEND delle info
+         ' Aggiunge Key=Value; alle UserNotes dell'utensile
         EgtTdbSetCurrToolParam(MCH_TP.USERNOTES, AssembUserNote(sKeyUserNote, sValUserNote, Tool))
         EgtTdbSaveCurrTool()
         EgtTdbSave()
@@ -369,8 +369,8 @@ Class MainWindow
      ' Verifico abilitazione nesting automatico
      m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
      ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 3102, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 3102, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 3103, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 3103, 1, m_nKeyOptions)
      ' Verifico abilitazione prodotto
      Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
      ' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo
@@ -710,7 +710,7 @@ Class MainWindow
         GetPrivateProfileString(S_GENERAL, "Assistances", "", sAssistance, GetIniFile)
         Dim sItems As String() = sAssistance.Split(","c)
         For Each Item As String In sItems
-            sMsg_RefAssistance &= " → " & Item.Trim & " /n"
+            sMsg_RefAssistance &= " -> " & Item.Trim & " /n"
         Next
         ' 91148=Grazie per la vostra collaborazione.
         Dim sMsg_ThankYou As String = EgtMsg(91148)
@@ -1365,38 +1365,32 @@ Class MainWindow
      ' Verifico presenza testa H1 per lama/fresa (nel contesto principale)
      Dim nCurrCtx As Integer = EgtGetCurrentContext()
      EgtSetCurrentContext(m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-      Dim bHeadH1 As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      Dim bHeadH1 As Boolean = m_CurrentMachine.ExistsSawHead()
      EgtSetCurrentContext(nCurrCtx)
      ' Aggiorno interfaccia
      If m_OnlyFrame Then
         If nPrjType = CurrentProjectPageUC.PRJ_TYPE.FLATS And
            m_ActivePage <> Pages.RawPart And m_ActivePage <> Pages.DirectCut And m_ActivePage <> Pages.Simulation Then
-            Dim FrameWnd As New EgtMsgBox(Me, EgtMsg(91141), EgtMsg(91142), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) ' Attenzione! Licenza non abilitata per tagli CAD.
-            '' Gestione stato FastGrid
-            'm_CadCutPageUC.m_FastGridSlabManager.OnPreNewProject()
+            ' Attenzione! Licenza non abilitata per tagli CAD.
+            Dim FrameWnd As New EgtMsgBox(Me, EgtMsg(91141), EgtMsg(91142), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
            ' Cancello progetto salvato con nome da file ini
            WritePrivateProfileString(S_GENERAL, K_LASTNAMEPROJ, "", GetIniFile())
            ' Scelta tavola della macchina
            Dim nTabInd As Integer = m_CadCutPageUC.m_ProjectMgr.ChooseTable()
            ' Creo nuovo progetto
            m_CurrentProjectPageUC.NewProject(nTabInd, False)
-            '' Gestione stato FastGrid
-            'm_CadCutPageUC.m_FastGridSlabManager.OnPostNewProject()
+            ' 
            FrameCutBtn_Click(Nothing, Nothing)
            CadCutBtn.IsEnabled = False
         Else
            FrameCutBtn.IsEnabled = True
            CadCutBtn.IsEnabled = False
-            ' Attivo il pulsante FRAME
-            'FrameCutBtn.IsChecked = True
-            'CadCutBtn.IsChecked = False
         End If
      Else
         CadCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FRAMES)
         FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS) AndAlso bHeadH1
      End If

-      ' DirectCutBtn.IsEnabled = bHeadH1
   End Sub

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

-<Assembly: AssemblyVersion("3.1.2.2")>
-<Assembly: AssemblyFileVersion("3.1.2.2")>
+<Assembly: AssemblyVersion("3.1.3.1")>
+<Assembly: AssemblyFileVersion("3.1.3.1")>
@@ -384,7 +384,7 @@ Public Class CNCommunication

         ' Recupero e imposto le variabili per i dati del CN (feed, speed,...)
         GetPrivateProfileString(S_NCDATA, K_COMM, "XIP01, 0, 10, 0, 0, 0", sVal, m_MainWindow.GetMachIniFile())
-         EgtOutLog(" → Tipo di comunicazione: " & sVal)
+         EgtOutLog(" -> Tipo di comunicazione: " & sVal)
         m_CN.SetCnDataVar(CN_generico.CnData.Comm, sVal)
         GetPrivateProfileString(S_NCDATA, K_REFRESH, "200", sVal, m_MainWindow.GetMachIniFile())
         m_CN.SetCnDataVar(CN_generico.CnData.Refresh, sVal)
@@ -673,7 +673,7 @@ Public Class CNCommunication
                                 End Select
                              End If
                           Else
-                              EgtOutLog(" ATTENZIONE: in [NcData] '" & m_CN.m_szCnDataVar(ItemIndex) & "' non è indicato il tipo (0→Bool,1→Int,2→Long,3→Double,4→String,5→Bit)")
+                              EgtOutLog(" ATTENZIONE: in [NcData] '" & m_CN.m_szCnDataVar(ItemIndex) & "' non è indicato il tipo (0=Bool,1=Int,2=Long,3=Double,4=String,5=Bit)")
                           End If
                        End If
                     Next
@@ -847,7 +847,7 @@ Public Class CNCommunication
         'End If
      End If

-      ' QUESTE VARIABILI NON SONO LETTE IN QUANTO NON SONO STATE CARICATE → vedere come esempio il NUM che assegna queste variabili
+      ' QUESTE VARIABILI NON SONO LETTE IN QUANTO NON SONO STATE CARICATE : vedere come esempio il NUM che assegna queste variabili
      ' Flag e variabili per bottoni macchina, che verifico solo nelle pagine in cui ci sono
      If m_MainWindow.m_ActivePage = MainWindow.Pages.DirectCut Then
         If m_MainWindow.m_DirectCutPageUC.m_NewMachineButtonsType Then
@@ -1020,7 +1020,7 @@ Public Class CNCommunication
         m_CN.nMachineMode = m_nCurrMode
      End If

-      ' QUESTE VARIABILI NON SONO LETTE IN QUANTO NON SONO STATE CARICATE → vedere come esempio il NUM che assegna queste variabili
+      ' QUESTE VARIABILI NON SONO LETTE IN QUANTO NON SONO STATE CARICATE : vedere come esempio il NUM che assegna queste variabili
      ' Flag e variabili per bottoni macchina, che verifico solo nelle pagine in cui ci sono
      If m_MainWindow.m_ActivePage = MainWindow.Pages.DirectCut Then
         If m_MainWindow.m_DirectCutPageUC.m_NewMachineButtonsType Then
@@ -376,7 +376,7 @@ Module M_MMFiles

      execute_command()
      ' Rimango in attesa
-      EgtOutLog(" → CycleStart")
+      EgtOutLog(" -> CycleStart")
      Return SiemensRet.n_result

   End Function
@@ -603,7 +603,7 @@ Module M_MMFiles
      'EgtOutLog("Write_Nc_var start dell'm_mmFiles")
      SiemensSend.n_Command = CMD.CMD_Read_NC_subscription
      SiemensSend.sz_string_2 = VarAddr ' indirizzo su CN dell' oggetto da scrivere 
-      EgtOutLog(" → Sottoscrivo lettura di '" & VarAddr & "'")
+      EgtOutLog(" -> Sottoscrivo lettura di '" & VarAddr & "'")
      SiemensSend.n_param1 = Index   ' tipo di dato da scrivere
      EgtOutLog("   Indice del vettore associato '" & Index & "'")
      SiemensSend.n_param2 = ParType   ' tipo di dato da scrivere
@@ -289,7 +289,7 @@ Namespace Num

         ' Stringhe valide : "COM" o "XIP01, 0, 10, 0, 0, 0"
         Dim nret As Integer = NC_connect(m_szCnDataVar(CnData.Comm))
-         EgtOutLog(" → Risultatao apertura connessiione: " & nret)
+         EgtOutLog(" -> Risultato apertura connessione: " & nret)
         If nret <> 0 Then Return False

         n_state = 2
@@ -538,7 +538,7 @@ Namespace Num
         If nret <> 0 Then
            EgtOutLog("Error in set_NC_mode(" & n_mode.ToString() & ") : " & nret.ToString())
         Else
-            EgtOutLog("set_NC_mode(" & n_mode.ToString() & ") : " & nret.ToString() & " → ok")
+            EgtOutLog("set_NC_mode(" & n_mode.ToString() & ") : " & nret.ToString() & " -> ok")
         End If

         global_state = eStateType.READY
@@ -928,7 +928,7 @@ Namespace Num
         ' Ultimo numero di segmento invaito
         Dim i As UInt16
         ' Invia il primo segmento (dati comunicazione)
-         EgtOutLog(" -> Invia il primo segmento " & " → PPport: " & n_PPport & " → NC file name: " & sz_PC_filename & " → Dnc Mode: " & DNC_MODE_FIRST)
+         EgtOutLog(" -> Invia il primo segmento " & " -> PPport: " & n_PPport & " -> NC file name: " & sz_PC_filename & " -> Dnc Mode: " & DNC_MODE_FIRST)
         Dim nRet As Int16 = DownLoadPPPFile2(n_PPport, l, 32768, sz_PC_filename, Nothing, DNC_MODE_FIRST, i)
         ' Inserisco un tempo di attesa di sicurezza
         Thread.Sleep(100)
@@ -89,7 +89,7 @@ Public Class AddToDataBaseUC
      If Not EgtPHOTOLib.MainData.bEnableTextId Then
         WritePrivateProfileString(S_SCRAPS, K_LASTBLOCK, EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.sNameBlock, m_OmagPhotoWD.m_MainWindow.GetIniFile())
      End If
-      ' aggiorno il testo del messaggio "Add" → "Save"
+      ' aggiorno il testo del messaggio "Add" -> "Save"
      AddBtn.Content = EgtMsg(91252)      ' Save

      ' notifico che da ora la lastra inserita è in modalità di modifica (non salvo la lastra come nuova, ma la sovrascrivo come in modifica)
@@ -632,7 +632,7 @@ Public Class CurrentProjectPageUC
      ' Se la macchina del file è quella impostata
      If String.Compare(sFileMachine, m_MainWindow.GetCurrMachine(), True) = 0 Then
         AdjustAdditionalTable(True)
-         ' altrimenti avverto, porto i pezzi in parcheggio e cancello il grezzo
+      ' altrimenti avverto, porto i pezzi in parcheggio e cancello il grezzo
      Else
         ' Emetto messaggio
         Dim sOut As String = EgtMsg(90320) & " (" & sFileMachine & ")"        ' Macchina diversa
@@ -1081,7 +1081,7 @@ Public Class CurrentProjectPageUC

   Friend Sub UpdateMachiningTxBx()
      ' se macchina waterjet e senza uscita lama allora visualizzo info WJ
-      If m_MainWindow.m_CurrentMachine.bWaterJet And EgtGetHeadId("H1") = GDB_ID.NULL Then
+      If m_MainWindow.m_CurrentMachine.bWaterJet And Not m_MainWindow.m_CurrentMachine.ExistsSawHead() Then
         MachiningTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrWaterJetting
         '& "-" & m_MainWindow.m_CurrentMachine.sCurrWaterJettingQuality
      Else
@@ -68,7 +68,7 @@ Public Class OmagPhotoWD
      End If

      '--------------- DEFINSCO nuova lastra esistente ---------------
-      ' imposto come prima pagina sempre la lista (per inizializzare gli elementi della libreria) → ACCELERARE il processo di creazione di questo oggetto!
+      ' imposto come prima pagina sempre la lista (per inizializzare gli elementi della libreria) -> ACCELERARE il processo di creazione di questo oggetto!
      EgtPHOTOLib.PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.NEWSLAB
      ' imposto il percoso della foto appena generato
      EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.ImagePath = sImage
@@ -142,7 +142,7 @@ Public Class OmagPhotoWD
         m_AddToDataBaseUC.MatTxBx.Text = EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.Material
         m_AddToDataBaseUC.ThicknessTxBx.Text = EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.Thickness
         m_AddToDataBaseUC.ProjectTxBx.Text = EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.ProjectAssignedTo
-         ' aggiorno il testo del messaggio "Add" → "Save"
+         ' aggiorno il testo del messaggio "Add" -> "Save"
         m_AddToDataBaseUC.AddBtn.Content = EgtMsg(91252)      ' Save
         Return
      End If
@@ -64,7 +64,7 @@ Public Class ChooseMachining
   Private Sub InitializeMachiningLists()

      ' in assenza dell'uscita H1 nascondo i parametri lama
-      If EgtGetHeadId("H1") = GDB_ID.NULL Then
+      If Not m_CurrentMachine.ExistsSawHead() Then
         CurrSawingTxBl.Visibility = Visibility.Hidden
         CurrSawingCmBx.Visibility = Visibility.Hidden
      End If
@@ -87,7 +87,8 @@ Public Class ChooseMachining
            ChooseMachiningGrid.Children.Remove(AuxiliaryMachiningTxBl)
            ChooseMachiningGrid.Children.Remove(AuxiliaryMachiningCmBx)

-         Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL, CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW
+         Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL, CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER,
+              CurrentMachine.MountedToolConfigs.TOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW
            ' Creo lista lavorazioni foretto e fresa
            If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL Then
               CreateMachiningList(MCH_MY.DRILLING, m_CurrentMachine.sCurrDrill, m_DrillingList)
@@ -121,14 +122,15 @@ Public Class ChooseMachining
                  m_WJettingList.Add("")
               End If

-               ' ---- MACCHINA CON CAMBIO UTENSILE ----
+            ' ---- MACCHINA CON CAMBIO UTENSILE ----
            ElseIf m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or
                   m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Or
                   m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then
               ' -- TAGLIO --
               ' Il taglio è aggiunto sempre (all'inizio di questo metodo)
-               ' -- FORATURA -- 
-               CreateMachiningList(MCH_MY.DRILLING, m_DrillingList)
+               ' -- FORATURA --
+               m_DrillingList.Clear()
+               If CanChangeSaw() Then CreateMachiningList(MCH_MY.DRILLING, m_DrillingList)
               ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
               If m_DrillingList.Count = 0 Then
                  m_CurrentMachine.sCurrDrilling = String.Empty
@@ -136,8 +138,9 @@ Public Class ChooseMachining
                  ' aggiungo il campo vuoto
                  m_DrillingList.Add("")
               End If
-               ' -- FRESATURA -- 
-               CreateMachiningList(MCH_MY.MILLING, m_MillingList)
+               ' -- FRESATURA --
+               m_MillingList.Clear()
+               If CanChangeSaw() Then CreateMachiningList(MCH_MY.MILLING, m_MillingList)
               ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
               If m_MillingList.Count = 0 Then
                  m_CurrentMachine.sCurrMilling = String.Empty
@@ -146,7 +149,8 @@ Public Class ChooseMachining
                  m_MillingList.Add("")
               End If
               ' -- SVUOTATURA --
-               CreateMachiningList(MCH_MY.POCKETING, m_PocketingList)
+               m_PocketingList.Clear()
+               If CanChangeSaw() Then CreateMachiningList(MCH_MY.POCKETING, m_PocketingList)
               If m_PocketingList.Count = 0 Then
                  m_CurrentMachine.sCurrPocketing = String.Empty
               Else
@@ -187,12 +191,12 @@ Public Class ChooseMachining

      End Select

-      If m_CurrentMachine.bWaterJet And EgtGetHeadId("H1") = GDB_ID.NULL Then
+      If m_CurrentMachine.bWaterJet And Not m_CurrentMachine.ExistsSawHead() Then

      Else
         ' verifico che lista delle lavorazioni di lama non sia vuoto
         If m_SawingList.Count > 0 Then
-            ' provo ad assegnare la lama corrente (se l'associazione fallisce corrispoende ad impostare un campo vuoto)
+            ' provo ad assegnare la lama corrente (se l'associazione fallisce corrisponde ad impostare un campo vuoto)
            CurrSawingCmBx.SelectedItem = m_MainWindow.m_CurrentMachine.sCurrSawing
         Else
            m_MainWindow.m_CurrentMachine.sCurrSawing = String.Empty