diff --git a/CompoWindow/CompoParamPage/CompoParamPageVM.vb b/CompoWindow/CompoParamPage/CompoParamPageVM.vb
index 0c204b8..2642cae 100644
--- a/CompoWindow/CompoParamPage/CompoParamPageVM.vb
+++ b/CompoWindow/CompoParamPage/CompoParamPageVM.vb
@@ -64,9 +64,11 @@ Public Class CompoParamPageVM
       End Set
    End Property
 
-   Private m_AlzAndFront_Visibility As Visibility
+   Private m_AlzAndFront_Visibility As Visibility 
    Public Property AlzAndFront_Visibility As Visibility
       Get
+         ' !!!! Temporaneamente in attesa di completamento Frontalini e alzatine !!!!
+         Return Visibility.Collapsed 
          Return m_AlzAndFront_Visibility
       End Get
       Set(value As Visibility)
@@ -409,8 +411,13 @@ Public Class CompoParamPageVM
                                                             CompoWindowMap.refCompoSceneHostV.CompoScene,
                                                             SideEntityControlVM.ModeOpt.ENGRAVE)
             SideEntityControl = New SideEntityControlV(m_SideEntityControlVM)
+            If m_SideEntityControlVM.SideEntityList.Count < 1 Then
+               ' eventulmente stamnpare messaggio!
+               ' OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+               ' OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Lavorazioni non disponibile", MSG_TYPE.WARNING)
+            End If
          Else
-            SideAngle_IsEnabled = True
+               SideAngle_IsEnabled = True
             Drip_IsEnabled = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.UNDER_CUT) And
                              Not String.IsNullOrWhiteSpace(CurrentMachine.sCurrDripSaw)
             FiloTop_IsEnabled = True
diff --git a/CurrMachWindow/CurrMachWindowV.xaml b/CurrMachWindow/CurrMachWindowV.xaml
index 4780657..9b92a8b 100644
--- a/CurrMachWindow/CurrMachWindowV.xaml
+++ b/CurrMachWindow/CurrMachWindowV.xaml
@@ -14,9 +14,11 @@
    <StackPanel Margin="5,5,5,0">
 <!--TAGLIO-->
       <TextBlock Text="{Binding CurrSawingMsg}"
+                 Visibility="{Binding CurrSawing_Visibility}"
                  Margin="0,0,0,5"/>
       <ComboBox ItemsSource="{Binding CurrSawingList}"
                 SelectedItem="{Binding SelCurrSawing}"
+                Visibility="{Binding CurrSawing_Visibility}"
                 Margin="0,0,0,5"/>
 
       <!--<TextBlock Text="{Binding AuxMachTypeMsg}"
@@ -56,10 +58,24 @@
       <TextBlock Text="{Binding CurrWaterjettingMsg}"
                Visibility="{Binding CurrWaterjetting_Visibility}"
                Margin="0,0,0,5"/>
-      <ComboBox ItemsSource="{Binding CurrWaterjettingList}"
-              SelectedItem="{Binding SelCurrWaterjetting}"
-              Visibility="{Binding CurrWaterjetting_Visibility}"
-              Margin="0,0,0,5"/>
+      <Grid>
+          <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="2*"/>
+              <ColumnDefinition Width="1*"/>
+          </Grid.ColumnDefinitions>
+          <ComboBox ItemsSource="{Binding CurrWaterjettingList}"
+            SelectedItem="{Binding SelCurrWaterjetting}"
+            Visibility="{Binding CurrWaterjetting_Visibility}"
+            Margin="0,0,5,5"/>
+
+          <!--Quality-->
+          <ComboBox ItemsSource="{Binding CurrWaterjettingQualityList}"
+                    SelectedItem="{Binding SelCurrWaterjettingQuality}"
+                    Visibility="{Binding CurrWaterjettingQuality_Visibility}"
+                    Margin="5,0,0,5"
+                    Grid.Column="1">
+          </ComboBox>
+      </Grid>
 
         <UniformGrid Columns="2"
                    Margin="0,0,0,5">
diff --git a/CurrMachWindow/CurrMachWindowVM.vb b/CurrMachWindow/CurrMachWindowVM.vb
index 2982384..d09b4f5 100644
--- a/CurrMachWindow/CurrMachWindowVM.vb
+++ b/CurrMachWindow/CurrMachWindowVM.vb
@@ -32,6 +32,16 @@ Public Class CurrMachWindowVM
       End Set
    End Property
 
+   Public ReadOnly Property CurrSawing_Visibility As Visibility
+      Get
+         If EgtGetHeadId("H1") = GDB_ID.NULL Then
+            Return Visibility.Collapsed
+         Else
+            Return Visibility.Visible
+         End If
+      End Get
+   End Property
+
 #End Region    ' Saw
 
 #Region " AUX MACHINING "
@@ -257,6 +267,29 @@ Public Class CurrMachWindowVM
       End Set
    End Property
 
+   Private m_CurrWaterjettingQualityList As New List(Of String)
+   Public Property CurrWaterjettingQualityList As List(Of String)
+      Get
+         Return m_CurrWaterjettingQualityList
+      End Get
+      Set(value As List(Of String))
+         m_CurrWaterjettingQualityList = value
+      End Set
+   End Property
+
+   Private m_SelCurrWaterjettingQuality As String
+   Public Property SelCurrWaterjettingQuality As String
+      Get
+         Return m_SelCurrWaterjettingQuality
+      End Get
+      Set(value As String)
+         If value <> m_SelCurrWaterjettingQuality Then
+            m_SelCurrWaterjettingQuality = value
+            CurrentMachine.sCurrWaterJettingQuality = m_SelCurrWaterjettingQuality
+         End If
+      End Set
+   End Property
+
    Private m_CurrWaterjetting_Visibility As Visibility
    Public Property CurrWaterjetting_Visibility As Visibility
       Get
@@ -264,7 +297,18 @@ Public Class CurrMachWindowVM
       End Get
       Set(value As Visibility)
          m_CurrWaterjetting_Visibility = value
-         NotifyPropertyChanged("CurrWaterjetting_Visibility")
+         NotifyPropertyChanged(NameOf(CurrWaterjetting_Visibility))
+      End Set
+   End Property
+
+   Private m_CurrWaterjettingQuality_Visibility As Visibility
+   Public Property CurrWaterjettingQuality_Visibility As Visibility
+      Get
+         Return m_CurrWaterjettingQuality_Visibility
+      End Get
+      Set(value As Visibility)
+         m_CurrWaterjettingQuality_Visibility = value
+         NotifyPropertyChanged(NameOf(CurrWaterjettingQuality_Visibility))
       End Set
    End Property
 
@@ -313,6 +357,13 @@ Public Class CurrMachWindowVM
          Return EgtMsg(MSG_CHOOSEMACHININGPAGEUC + 10)
       End Get
    End Property
+
+   Public ReadOnly Property CurrWaterjettingQualityMsg As String
+      Get
+         Return "Quality"
+      End Get
+   End Property
+
    Public ReadOnly Property OkMsg As String
       Get
          Return "Ok"
@@ -381,6 +432,7 @@ Public Class CurrMachWindowVM
                If m_CurrWaterjettingList.Count = 0 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
+               m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)
 
             ElseIf CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER Or
                    CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.TOOLCHANGER Then
@@ -411,6 +463,7 @@ Public Class CurrMachWindowVM
                If m_CurrWaterjettingList.Count = 0 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
+               m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)
             End If
 
             ' Nascondo la selezione dell'utensile ausiliario -- DA ELIMINARE? --
@@ -459,11 +512,20 @@ Public Class CurrMachWindowVM
 
       If CurrentMachine.bWaterJetting And CurrWaterjettingList.Count > 1 Then
          CurrWaterjetting_Visibility = Visibility.Visible
-         If CurrentMachine.sCurrWaterJetting <> String.Empty Then
-            SelCurrWaterjetting = CurrentMachine.sCurrWaterJetting
+         ' se DB WaterJet abilitato avrò anche la CmBx della Quality solo la CmBx del Waterjetting corrente
+         If CurrentMachine.bFromDBWaterJet Then
+            If CurrentMachine.sCurrWaterJetting <> String.Empty Then
+               SelCurrWaterjetting = CurrentMachine.sCurrWaterJetting
+            End If
+            If CurrentMachine.sCurrWaterJettingQuality <> String.Empty Then
+               SelCurrWaterjettingQuality = CurrentMachine.sCurrWaterJettingQuality
+            End If
+            CurrWaterjettingQuality_Visibility = Visibility.Visible
+         Else
+            CurrWaterjettingQuality_Visibility = Visibility.Collapsed
          End If
       Else
-         CurrWaterjetting_Visibility = Visibility.Collapsed
+         CurrWaterjettingQuality_Visibility = Visibility.Collapsed
       End If
 
       ' Con le nuove modifiche questa selezione dovrebbe scompaire definitivamente -- DA ELIMINARE? --
@@ -595,26 +657,56 @@ Public Class CurrMachWindowVM
          EgtMdbGetCurrMachiningParam(MCH_MP.SYSNOTES, SysNotes)
          If SysNotes <> String.Empty Then
             Dim MachiningMaterials() = SysNotes.Split(";".ToCharArray)
-            For Each Material In MachiningMaterials
-               Dim Param() As String = Material.Split(",".ToCharArray)
-               If Param.Count() < 2 Then Continue For
-               Dim CurrMatId As String = String.Empty
-               For Each Mat In CurrentMachine.Materials
-                  If Mat.sName = EstCalc.GetMaterialName Then
-                     CurrMatId = Mat.nId.ToString()
-                     Exit For
+
+            If CurrentMachine.bWaterJet And CurrentMachine.bFromDBWaterJet Then
+               For Each Material As Object In MachiningMaterials
+                  Dim Param() As String = Material.Split(",".ToCharArray)
+                  If Param.Count() < 2 Then Continue For
+                  Dim CurrMatId As String = String.Empty
+                  Dim CurrMatSubId As String = String.Empty
+                  For Each Mat In CurrentMachine.Materials
+                     If Mat.sName = EstCalc.GetMaterialName Then
+                        CurrMatId = Mat.nId.ToString()
+                        CurrMatSubId = Mat.SubId.ToString()
+                        Exit For
+                     End If
+                  Next
+                  Dim SubParam() As String = Param(0).Split(".".ToCharArray)
+                  If SubParam(0) = CurrentMachine.CurrMat.nId.ToString() AndAlso SubParam.Count > 1 AndAlso SubParam(1) = CurrentMachine.CurrMat.SubId.ToString() Then
+                     Dim MatMinH As Double = 0
+                     StringToDouble(Param(1), MatMinH)
+                     Dim MatMaxH As Double = 0
+                     StringToDouble(Param(2), MatMaxH)
+                     If EstCalc.GetRawHeight > MatMinH - EPS_SMALL And EstCalc.GetRawHeight < MatMaxH + EPS_SMALL Then
+                        Return True
+                     End If
                   End If
                Next
-               If Param(0) = CurrMatId Then
-                  Dim MatMinH As Double = 0
-                  StringToDouble(Param(1), MatMinH)
-                  Dim MatMaxH As Double = 0
-                  StringToDouble(Param(2), MatMaxH)
-                  If EstCalc.GetRawHeight > MatMinH - EPS_SMALL And EstCalc.GetRawHeight < MatMaxH + EPS_SMALL Then
-                     Return True
+            Else
+
+               For Each Material In MachiningMaterials
+                  Dim Param() As String = Material.Split(",".ToCharArray)
+                  If Param.Count() < 2 Then Continue For
+                  Dim CurrMatId As String = String.Empty
+                  For Each Mat In CurrentMachine.Materials
+                     If Mat.sName = EstCalc.GetMaterialName Then
+                        CurrMatId = Mat.nId.ToString()
+                        Exit For
+                     End If
+                  Next
+                  If Param(0) = CurrMatId Then
+                     Dim MatMinH As Double = 0
+                     StringToDouble(Param(1), MatMinH)
+                     Dim MatMaxH As Double = 0
+                     StringToDouble(Param(2), MatMaxH)
+                     If EstCalc.GetRawHeight > MatMinH - EPS_SMALL And EstCalc.GetRawHeight < MatMaxH + EPS_SMALL Then
+                        Return True
+                     End If
                   End If
-               End If
-            Next
+               Next
+
+            End If
+
             Return False
          Else
             Return True
@@ -624,6 +716,53 @@ Public Class CurrMachWindowVM
       End If
    End Function
 
+   'Private Function VerifyMatThickCompatibility() As Boolean
+   '   If Not IsNothing(m_CurrentMachine.CurrMat) Then
+   '      Dim SysNotes As String = String.Empty
+   '      EgtMdbGetCurrMachiningParam(MCH_MP.SYSNOTES, SysNotes)
+   '      If SysNotes <> String.Empty Then
+   '         Dim MachiningMaterials() = SysNotes.Split(";".ToCharArray)
+   '         SysNotes = String.Empty
+   '         If m_CurrentMachine.bWaterJet Then
+   '            For Each Material As Object In MachiningMaterials
+   '               Dim Param() As String = Material.Split(",".ToCharArray)
+   '               Dim SubParam() As String = Param(0).Split(".".ToCharArray)
+   '               If SubParam(0) = m_CurrentMachine.CurrMat.nId.ToString() AndAlso SubParam.Count > 1 AndAlso SubParam(1) = m_CurrentMachine.CurrMat.SubId.ToString() Then
+   '                  Dim dRawHeight = GetRawHeight()
+   '                  Dim MatMinH As Double = 0
+   '                  StringToDouble(Param(1), MatMinH)
+   '                  Dim MatMaxH As Double = 0
+   '                  StringToDouble(Param(2), MatMaxH)
+   '                  If dRawHeight > MatMinH - EPS_SMALL And dRawHeight < MatMaxH + EPS_SMALL Then
+   '                     Return True
+   '                  End If
+   '               End If
+   '            Next
+   '         Else
+   '            For Each Material As Object In MachiningMaterials
+   '               Dim Param() As String = Material.Split(",".ToCharArray)
+   '               If Param(0) = m_CurrentMachine.CurrMat.nId.ToString() Then
+   '                  Dim dRawHeight = GetRawHeight()
+   '                  Dim MatMinH As Double = 0
+   '                  StringToDouble(Param(1), MatMinH)
+   '                  Dim MatMaxH As Double = 0
+   '                  StringToDouble(Param(2), MatMaxH)
+   '                  If dRawHeight > MatMinH - EPS_SMALL And dRawHeight < MatMaxH + EPS_SMALL Then
+   '                     Return True
+   '                  End If
+   '               End If
+   '            Next
+   '         End If
+
+   '         Return False
+   '      Else
+   '         Return False
+   '      End If
+   '   Else
+   '      Return True
+   '   End If
+   'End Function
+
 #End Region    ' METHODS
 
 End Class
diff --git a/EgtStoneLib/CamAuto.vb b/EgtStoneLib/CamAuto.vb
index 3d32098..9766be5 100644
--- a/EgtStoneLib/CamAuto.vb
+++ b/EgtStoneLib/CamAuto.vb
@@ -668,6 +668,9 @@ Friend Module CamAuto
       End If
       ' Lo sposto dalla lavorazione al pezzo
       Dim nId As Integer = EgtGetFirstInGroup(nMchPvId)
+
+      If nId = GDB_ID.NULL Then Return False
+
       While nId <> GDB_ID.NULL
          EgtRelocateGlob(nId, nPartPvId)
          nId = EgtGetFirstInGroup(nMchPvId)
diff --git a/EgtStoneLib/ConstMachIni.vb b/EgtStoneLib/ConstMachIni.vb
index 5e651eb..fc22a66 100644
--- a/EgtStoneLib/ConstMachIni.vb
+++ b/EgtStoneLib/ConstMachIni.vb
@@ -253,11 +253,13 @@
    Public Const K_CURRDRIPSAWING As String = "CurrDripSawing"
    Public Const K_CURRDRIPDRILLING As String = "CurrDripDrilling"
    Public Const K_CURRWATERJETTING As String = "CurrWaterJetting"
+   Public Const K_CURRWATERJETTINGQUALITY As String = "CurrWaterJettingQuality"
 
    Public Const S_MATERIALS As String = "Materials"
    Public Const K_CURRMATERIAL As String = "CurrMaterial"
    Public Const K_CURROFFICEMATERIAL As String = "CurrOfficeMaterial"
    Public Const K_MATERIAL As String = "Material"
+   Public Const K_FROMDBWATERJET As String = "FromDBWaterJet"
 
    Public Const S_SETUP As String = "SetUp"
    Public Const K_DEFAULT As String = "Default"
diff --git a/EgtStoneLib/CurrentMachine.vb b/EgtStoneLib/CurrentMachine.vb
index e41ec89..3e4cdb0 100644
--- a/EgtStoneLib/CurrentMachine.vb
+++ b/EgtStoneLib/CurrentMachine.vb
@@ -86,6 +86,9 @@ Public Module CurrentMachine
    Private m_bPolishingWheel As Boolean = False
    Private m_bWaterJet As Boolean = False
 
+   ' Abilitazione DB WaterJet
+   Private m_bFromDBWaterJet As Boolean = False
+
    ' Flag per visualizzazione TcPos, Testa/uscita e Note utente
    Private m_nShowToolChanger As Integer = 0                 ' 0=no, 1=tutti utensili, 2=solo lame
    Private m_bShowHeadExit As Boolean = False
@@ -123,6 +126,7 @@ Public Module CurrentMachine
    Private m_sCurrDripSawing As String = String.Empty
    Private m_sCurrDripDrilling As String = String.Empty
    Private m_sCurrWaterJetting As String = String.Empty
+   Private m_sCurrWaterJettingQuality As String = String.Empty
 
    ' Spessore sottopezzo
    Private m_dAdditionalTable As Double = 0
@@ -162,6 +166,9 @@ Public Module CurrentMachine
    ' Lista dei materiali
    Private m_Materials As New ObservableCollection(Of Material)
 
+   ' Lista delle qualità di lavorazioni disponibili nel WaterJet
+   Private m_Qualities As New ObservableCollection(Of String)
+
    ' Massimo id della lista materiali nel file ini
    Private m_MaxIdMat As Integer = 0
 
@@ -559,6 +566,12 @@ Public Module CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property bFromDBWaterJet As Boolean
+      Get
+         Return m_bFromDBWaterJet
+      End Get
+   End Property
+
    Friend ReadOnly Property ShowToolChanger As Integer
       Get
          Return m_nShowToolChanger
@@ -828,6 +841,17 @@ Friend Property sCurrMillNoTip As String
       End Set
    End Property
 
+   Friend Property sCurrWaterJettingQuality As String
+      Get
+         Return m_sCurrWaterJettingQuality
+      End Get
+      Set(value As String)
+         If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, value, sMachIniFile) Then
+            m_sCurrWaterJettingQuality = value
+         End If
+      End Set
+   End Property
+
    Friend ReadOnly Property WaterJettingActive As Boolean
       Get
          Return m_bWaterJetting AndAlso Not String.IsNullOrWhiteSpace(m_sCurrWaterJetting)
@@ -1006,6 +1030,12 @@ Friend Property sCurrMillNoTip As String
       End Get
    End Property
 
+   Friend ReadOnly Property Qualities As ObservableCollection(Of String)
+      Get
+         Return m_Qualities
+      End Get
+   End Property
+
    Friend Sub AddMaterial(value As Material)
       For Each Material In Materials
          If Material.nId = value.nId Then
@@ -1089,9 +1119,13 @@ Friend Property sCurrMillNoTip As String
          If Not IsNothing(value) Then
             Dim CurrMatId As String = value.nId.ToString
             Dim sKey As String = If(m_bOffice, K_CURROFFICEMATERIAL, K_CURRMATERIAL)
-            WritePrivateProfileString(S_MATERIALS, sKey, CurrMatId, sMachIniFile)
+            If bWaterJet And bFromDBWaterJet Then
+               WritePrivateProfileString(S_MATERIALS, sKey, CurrMatId & "." & value.SubId, sMachIniFile)
+            Else
+               WritePrivateProfileString(S_MATERIALS, sKey, CurrMatId, sMachIniFile)
+            End If
+            m_CurrMat = value
          End If
-         m_CurrMat = value
       End Set
    End Property
 
@@ -1200,6 +1234,8 @@ Friend Property sCurrMillNoTip As String
       m_bPolishingWheel = (GetPrivateProfileInt(S_TOOLS, K_POLISHINGWHEEL, 0, sMachIniFile) > 0) And bKeyPolish
       ' waterjet
       m_bWaterJet = (GetPrivateProfileInt(S_TOOLS, K_WATERJET, 0, sMachIniFile) > 0) And bKeyWJ
+      ' Leggo abilitazione DB WaterJet
+      m_bFromDBWaterJet = (GetPrivateProfileInt(S_MATERIALS, K_FROMDBWATERJET, 0, sMachIniFile) > 0)
       ' Leggo abilitazione visualizzazione TcPos e Head/exit
       m_nShowToolChanger = GetPrivateProfileInt(S_TOOLS, K_SHOWTOOLCHANGER, 0, sMachIniFile)
       m_bShowHeadExit = (GetPrivateProfileInt(S_TOOLS, K_SHOWHEADEXIT, 0, sMachIniFile) > 0)
@@ -1272,6 +1308,8 @@ Friend Property sCurrMillNoTip As String
       GetPrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILLING, Nothing, m_sCurrDripDrilling, sMachIniFile)
       ' waterjetting
       GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING, Nothing, m_sCurrWaterJetting, sMachIniFile)
+      ' waterjettingquality
+      GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, Nothing, m_sCurrWaterJettingQuality, sMachIniFile)
 
       ' Leggo numero di portautensili
       m_ToolChangerNbr = GetPrivateProfileInt(S_TOOLCHANGER, K_NUMBER, 0, sMachIniFile)
@@ -1330,24 +1368,80 @@ Friend Property sCurrMillNoTip As String
       ' Leggo la lista dei materiali
       Dim Material As Material = Nothing
       Dim nIndex As Integer = 1
-      While (GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & nIndex, Material, sMachIniFile))
-         m_Materials.Add(Material)
-         nIndex += 1
-      End While
+      If m_bWaterJet And m_bFromDBWaterJet Then
+         LoadWJMaterial(True)
+      Else
+         While (GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & nIndex, Material, sMachIniFile))
+            m_Materials.Add(Material)
+            nIndex += 1
+         End While
+      End If
       ' Salvo massimo indice a cui sono arrivato per usarlo quando devo aggiungere nuovi elementi alla lista
       m_MaxIdMat = nIndex - 1
 
       ' Leggo materiale correntemente attivo
+      Dim sCurrMatId As String = String.Empty
       Dim sKey As String = If(m_bOffice, K_CURROFFICEMATERIAL, K_CURRMATERIAL)
-      Dim CurrMatId As Integer = GetPrivateProfileInt(S_MATERIALS, sKey, 0, sMachIniFile)
-      For Each Material In Materials
-         If Material.nId = CurrMatId Then
-            m_CurrMat = Material
-            Exit For
+      EgtUILib.GetPrivateProfileString(S_MATERIALS, sKey, "0", sCurrMatId, sMachIniFile)
+      If bWaterJet And bFromDBWaterJet Then
+         Dim sCurrMatIds As String()
+         sCurrMatIds = sCurrMatId.Split("."c)
+         If sCurrMatIds.Length > 1 Then
+            Dim nCurrMatId As Integer
+            Dim nCurrSubMatId As Integer
+            If Not Integer.TryParse(sCurrMatIds(0), nCurrMatId) Then nCurrMatId = 0
+            If Not Integer.TryParse(sCurrMatIds(1), nCurrSubMatId) Then nCurrSubMatId = 0
+            For Each Material In Materials
+               If Material.nId = nCurrMatId AndAlso Material.SubId = nCurrSubMatId Then
+                  m_CurrMat = Material
+                  Exit For
+               End If
+            Next
          End If
-      Next
+      Else
+         Dim nCurrMatId As Integer
+         If Not Integer.TryParse(sCurrMatId, nCurrMatId) Then nCurrMatId = 0
+         For Each Material In Materials
+            If Material.nId = nCurrMatId Then
+               m_CurrMat = Material
+               Exit For
+            End If
+         Next
+      End If
       ' Leggo se la macchina ha il tastatore dello spessore lastra
       m_HasRawProbe = (GetPrivateProfileInt(S_MACH_PROBING, K_ENABLERAWPROBE, 1, sMachIniFile) <> 0)
+
+      ' Se macchina ha Waterjet mostro il bottone per DB Waterjet
+      OmagOFFICEMap.refMachinePanelVM.NotifyPropertyChanged(NameOf(OmagOFFICEMap.refMachinePanelVM.WjDb_Visibility))
+   End Sub
+
+   Public Sub LoadWJMaterial(Optional bIsStart As Boolean = False)
+      Dim TempCurrMat As Material = CurrMat
+      ' Svuoto l'attuale lista di materiali e delle qualità
+      m_Materials.Clear()
+      m_Qualities.Clear()
+      ' Leggo valori da file .data e li carico nelle proprietà
+      Dim sFilePath As String = sMachDir & EgtWPFLib5.WaterjetDbWindowVM.WATERJETDB_PATH
+      WjMaterialList = EgtWPFLib5.WaterjetDbWindowVM.LoadWjMaterials(sFilePath)
+      ' definisco la lista delle qualità
+      m_Qualities.Add("")
+      m_Qualities.Add("Q1")
+      m_Qualities.Add("Q2")
+      m_Qualities.Add("Q3")
+      m_Qualities.Add("Q4")
+      m_Qualities.Add("Q5")
+      m_Qualities.Add("QExtra")
+      ' costruisco la lista 
+      Dim i As Integer = 0
+      Dim sName As String = String.Empty
+      For i = 0 To WjMaterialList.Count - 1
+         sName = WjMaterialList(i).Name
+         Dim j As Integer = 0
+         For j = 0 To WjMaterialList(i).SubMaterialList.Count - 1
+            m_Materials.Add(New Material(i + 1, sName & "." & WjMaterialList(i).SubMaterialList(j).Name, j + 1))
+         Next
+      Next
+      If Not bIsStart Then CurrMat = TempCurrMat
    End Sub
 
    Friend Function IsVacuumMovePossible() As Boolean
@@ -1456,6 +1550,7 @@ Public Class Material
 
    Private m_nId As Integer
    Private m_sName As String
+   Private m_SubId As Integer = 0
 
    Public ReadOnly Property nId As Integer
       Get
@@ -1472,6 +1567,15 @@ Public Class Material
       End Set
    End Property
 
+   Public Property SubId As Integer
+      Get
+         Return m_SubId
+      End Get
+      Set(value As Integer)
+         m_SubId = value
+      End Set
+   End Property
+
    Sub New(sName As String, MaterialList As ObservableCollection(Of Material))
       Dim nMaxId As Integer = 0
       For Each Material In MaterialList
@@ -1488,4 +1592,10 @@ Public Class Material
       m_sName = sName
    End Sub
 
+   Sub New(nId As Integer, sName As String, nSubId As Integer)
+      m_nId = nId
+      m_sName = sName
+      m_SubId = nSubId
+   End Sub
+
 End Class
diff --git a/EgtStoneLib/EstPhoto.vb b/EgtStoneLib/EstPhoto.vb
index 6234323..21476f0 100644
--- a/EgtStoneLib/EstPhoto.vb
+++ b/EgtStoneLib/EstPhoto.vb
@@ -1,13 +1,13 @@
 '----------------------------------------------------------------------------
-'  EgalTech 2015-2017
+'  EgalTech 2015-2021
 '----------------------------------------------------------------------------
-' File : GenPhoto.vb       Data : 12.04.17        Versione : 1.8d1
+' File : GenPhoto.vb       Data : 15.11.21        Versione : 2.3k1
 ' Contenuto : Modulo gestione fotografie.
 '             Ogni gruppo di lavoro può avere una sua foto della lastra.
 '
 '
 ' Modifiche : 12.04.17 DS Creazione modulo.
-'
+'             15.11.21 PS Correzioni per scalatura foto da CameraMng senza sovratavola.
 '
 '----------------------------------------------------------------------------
 
@@ -35,12 +35,12 @@ Module EstPhoto
       If dThick > EPS_SMALL Then
          OmagOFFICEMap.refRawPartTabVM.Height = DoubleToString( dThick, 3)
       End If
-      ' Altezza eventuale tavola aggiuntiva
+      ' Altezza della eventuale tavola aggiuntiva per solo posizionamento in Z
       Dim dAddTable As Double = CurrentMachine.dAdditionalTable
       ' Aggiusto dati per spessore grezzo
       If Math.Abs(EstCalc.GetRawHeight() + dAddTable) > EPS_SMALL Then
-         ' Coefficiente di scalatura
-         Dim dFsca As Double = (ptCen.z - EstCalc.GetRawHeight() - dAddTable) / (ptCen.z - ptOri.z)
+         ' Coefficiente di scalatura (non va considerata la sovratavola)
+         Dim dFsca As Double = (ptCen.z - EstCalc.GetRawHeight()) / (ptCen.z - ptOri.z)
          dMMxPixel *= dFsca
          ptOri.x = ptCen.x + (ptOri.x - ptCen.x) * dFsca
          ptOri.y = ptCen.y + (ptOri.y - ptCen.y) * dFsca
@@ -67,7 +67,11 @@ Module EstPhoto
       End If
       EgtSetLevel(nPhGrpId, GDB_LV.SYSTEM)
       ' Carico la fotografia
-      Return EgtAddPhoto(GetPhotoName(), sPath, ptOri, ptCen, dMMxPixel, nPhGrpId, b3Tab.Min(), b3Tab.Max()) <> GDB_ID.NULL
+      Dim nPhotoId As Integer = EgtAddPhoto(GetPhotoName(), sPath, ptOri, ptCen, dMMxPixel, nPhGrpId, b3Tab.Min(), b3Tab.Max())
+      If nPhotoId = GDB_ID.NULL Then Return False
+      ' Salvo spessore sovratavola usato per posizionamento in Z
+      EgtSetInfo( nPhotoId, "OvTab", dAddTable)
+      Return True
    End Function
 
    Friend Function LoadContour(sPath As String) As Boolean
@@ -92,12 +96,12 @@ Module EstPhoto
       Dim nPixelX As Integer = 0
       Dim nPixelY As Integer = 0
       If Not EgtGetPhotoImagePixels(GetPhoto(), nPixelX, nPixelY) Then Return False
-      ' Altezza eventuale tavola aggiuntiva
+      ' Altezza della eventuale tavola aggiuntiva per solo posizionamento in Z
       Dim dAddTable As Double = CurrentMachine.dAdditionalTable
       ' Aggiusto dati per spessore grezzo
       If Math.Abs(EstCalc.GetRawHeight() + dAddTable) > EPS_SMALL Then
-         ' Coefficiente di scalatura
-         Dim dFsca As Double = (ptCen.z - EstCalc.GetRawHeight() - dAddTable) / (ptCen.z - ptOri.z)
+         ' Coefficiente di scalatura (non va considerata la sovratavola)
+         Dim dFsca As Double = (ptCen.z - EstCalc.GetRawHeight()) / (ptCen.z - ptOri.z)
          dMMxPixel *= dFsca
          ptOri.x = ptCen.x + (ptOri.x - ptCen.x) * dFsca
          ptOri.y = ptCen.y + (ptOri.y - ptCen.y) * dFsca
@@ -385,10 +389,13 @@ Module EstPhoto
       ' Porto i punti in locale
       ptOri.ToLoc(New Frame3d(ptTab))
       ptCen.ToLoc(New Frame3d(ptTab))
-      ' Altezza eventuale tavola aggiuntiva
+      ' Altezza della eventuale tavola aggiuntiva originaria
+      Dim dOrigAddTable As Double = 0
+      EgtGetInfo( nPhotoId, "OvTab", dOrigAddTable)
+      ' Altezza della eventuale tavola aggiuntiva per solo posizionamento in Z
       Dim dAddTable As Double = CurrentMachine.dAdditionalTable
       ' Aggiusto dati per spessore grezzo (Coefficiente di scalatura)
-      Dim dFsca As Double = (ptCen.z - EstCalc.GetRawHeight() - dAddTable) / (ptCen.z - ptOri.z)
+      Dim dFsca As Double = (ptCen.z - EstCalc.GetRawHeight()) / (ptCen.z - ptOri.z + dOrigAddTable)
       dDimX *= dFsca
       dDimY *= dFsca
       ptOri.x = ptCen.x + (ptOri.x - ptCen.x) * dFsca
@@ -426,6 +433,8 @@ Module EstPhoto
       EgtSetInfo(nNewPhotoId, "OffsX", dOffsetX)
       EgtSetInfo(nNewPhotoId, "OffsY", dOffsetY)
       EgtSetInfo(nNewPhotoId, "Rot", dRot)
+      ' Salvo sovratavola attuale
+      EgtSetInfo( nNewPhotoId, "OvTab", dAddTable)
       Return True
    End Function
 
@@ -482,17 +491,20 @@ Module EstPhoto
       ' Recupero origine della tavola
       Dim ptTab As Point3d
       If Not EgtGetTableRef(1, ptTab) Then Return False
-      ' Altezza eventuale tavola aggiuntiva
+      ' Altezza della eventuale tavola aggiuntiva originaria
+      Dim dOrigAddTable As Double = 0
+      EgtGetInfo( nPhotoId, "OvTab", dOrigAddTable)
+      ' Altezza della eventuale tavola aggiuntiva per solo posizionamento in Z
       Dim dAddTable As Double = CurrentMachine.dAdditionalTable
       ' Recupero inizio contorno
       Dim ptStart As Point3d
       EgtStartPoint(nCrvId, GDB_ID.ROOT, ptStart)
       ' Calcolo coefficiente di scalatura
-      Dim dFsca As Double = (ptCen.z - ptTab.z - EstCalc.GetRawHeight() - dAddTable) / (ptCen.z - ptStart.z)
+      Dim dFsca As Double = (ptCen.z - ptTab.z - EstCalc.GetRawHeight()) / (ptCen.z - ptStart.z + dOrigAddTable)
       ' Scalo opportunamente
       EgtScale(nCrvId, New Frame3d(ptCen), dFsca, dFsca, 1, GDB_RT.GLOB)
       ' Sposto in Z
-      Dim vtMove As New Vector3d(0, 0, ptTab.z + EstCalc.GetRawHeight() + dAddTable - ptStart.z)
+      Dim vtMove As New Vector3d(0, 0, ptTab.z + EstCalc.GetRawHeight() + CurrentMachine.dAdditionalTable - ptStart.z)
       EgtMove(nCrvId, vtMove, GDB_RT.GLOB)
       Return True
    End Function
diff --git a/EgtStoneLib/SplitAuto.vb b/EgtStoneLib/SplitAuto.vb
index a4d097a..232d83f 100644
--- a/EgtStoneLib/SplitAuto.vb
+++ b/EgtStoneLib/SplitAuto.vb
@@ -160,6 +160,17 @@ Public Module SplitAuto
    End Function
 
    '-----------------------------------------------------------------------------------------------
+   ' calcolo il numero di tipi di lavorazioni
+   Friend Sub CountMachiningType(MachSplit As SplitMach, ByRef nCountSawing As Integer, ByRef nCountWaterjetting As Integer, ByRef nCountOtherMachining As Integer)
+      If MachSplit.m_nType = MCH_OY.SAWING Then
+         nCountSawing += 1
+      ElseIf MachSplit.m_nType = MCH_OY.WATERJETTING Then
+         nCountWaterjetting += 1
+      Else
+         nCountOtherMachining += 1
+      End If
+   End Sub
+
    Friend Sub ColorMachining(MachSplit As SplitMach, Optional bReset As Boolean = False)
       EgtDisableModified()
       ' Assegno stato
diff --git a/MachOptionWindow/MachOptionWindowV.xaml b/MachOptionWindow/MachOptionWindowV.xaml
index e28ddb7..94b3fa7 100644
--- a/MachOptionWindow/MachOptionWindowV.xaml
+++ b/MachOptionWindow/MachOptionWindowV.xaml
@@ -75,7 +75,7 @@
 
        <!--Prima Colonna quarta riga - Lista Materiali-->
       <GroupBox Header="{Binding MaterialsMsg}" Grid.Column="0"
-                Grid.Row="3" Grid.RowSpan="5">
+                Grid.Row="3" Grid.RowSpan="5" Visibility="{Binding Materials_Visibility}">
 
          <DockPanel>
 
@@ -126,7 +126,7 @@
       </GroupBox>
 
        <!--Parametri taglio lama-->
-      <GroupBox Header="{Binding SawParamMsg}">
+      <GroupBox Header="{Binding SawParamMsg}" Visibility="{Binding SawParam_Visibility}">
          <UniformGrid Columns="2" >
 
             <TextBlock Text="{Binding CutExtraLenMsg}"
@@ -171,7 +171,7 @@
       <GroupBox Header="{Binding MillingParamMsg}" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2">
          <UniformGrid Rows="3">
             
-            <Grid>
+            <Grid Visibility="{Binding MillingParam_Visibility}">
                <TextBlock Text="{Binding CornerCutsMsg}"
                           Style="{StaticResource OptionTextBlock}"/>
                <CheckBox IsChecked="{Binding CornerCuts}"
@@ -183,7 +183,7 @@
                <CheckBox IsChecked="{Binding InternalCuts}"
                          Style="{StaticResource OptionCheckBox}"/>
             </Grid>
-            <UniformGrid Columns="2">
+            <UniformGrid Columns="2" Visibility="{Binding MillingParam_Visibility}">
                <TextBlock Text="{Binding ShortMsg}"
                           Style="{StaticResource OptionTextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding ShortCut}"/>
@@ -193,7 +193,7 @@
 
       </GroupBox>
 
-       <!--Nesting-->
+        <!--Nesting-->
       <GroupBox Header="{Binding NestingParamMsg}" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2">
          <UniformGrid Columns="2" >
 
diff --git a/MachOptionWindow/MachOptionWindowVM.vb b/MachOptionWindow/MachOptionWindowVM.vb
index 497a10b..695830c 100644
--- a/MachOptionWindow/MachOptionWindowVM.vb
+++ b/MachOptionWindow/MachOptionWindowVM.vb
@@ -33,7 +33,7 @@ Public Class MachOptionWindowVM
 
    Public Property HolesOffset As String
       Get
-         Return LenToString(CurrentMachine.dHolesOffset, -2)
+         Return LenToString(CurrentMachine.dHolesOffset, 2)
       End Get
       Set(value As String)
          Dim dHolesOffset As Double = 0
@@ -45,7 +45,7 @@ Public Class MachOptionWindowVM
 
    Public Property HolesOverlap As String
       Get
-         Return LenToString(CurrentMachine.dHolesOverlap, -2)
+         Return LenToString(CurrentMachine.dHolesOverlap, 2)
       End Get
       Set(value As String)
          Dim dHolesOverlap As Double = 0
@@ -57,7 +57,7 @@ Public Class MachOptionWindowVM
 
    Public Property HolesTolerance As String
       Get
-         Return LenToString(CurrentMachine.dHolesTolerance, -2)
+         Return LenToString(CurrentMachine.dHolesTolerance, 2)
       End Get
       Set(value As String)
          Dim dHolesTolerance As Double = 0
@@ -82,7 +82,7 @@ Public Class MachOptionWindowVM
 
    Public Property CutExtraLen As String
       Get
-         Return LenToString(CurrentMachine.dCutExtraLen, -2)
+         Return LenToString(CurrentMachine.dCutExtraLen, 2)
       End Get
       Set(value As String)
          Dim dCutExtraLen As Double = 0
@@ -94,7 +94,7 @@ Public Class MachOptionWindowVM
 
    Public Property AngleCutExtraLen As String
       Get
-         Return LenToString(CurrentMachine.dAngleCutExtraLen, -2)
+         Return LenToString(CurrentMachine.dAngleCutExtraLen, 2)
       End Get
       Set(value As String)
          Dim dAngleCutExtraLen As Double = 0
@@ -106,7 +106,7 @@ Public Class MachOptionWindowVM
 
    Public Property ExtArcMinRad As String
       Get
-         Return LenToString(CurrentMachine.dExtArcMinRad, -2)
+         Return LenToString(CurrentMachine.dExtArcMinRad, 2)
       End Get
       Set(value As String)
          Dim dExtArcMinRad As Double = 0
@@ -118,7 +118,7 @@ Public Class MachOptionWindowVM
 
    Public Property IntArcMaxSideAng As String
       Get
-         Return DoubleToString(CurrentMachine.dIntArcMaxSideAng, -2)
+         Return DoubleToString(CurrentMachine.dIntArcMaxSideAng, 2)
       End Get
       Set(value As String)
          Dim dIntArcMaxSideAng As Double = 0
@@ -144,13 +144,24 @@ Public Class MachOptionWindowVM
       End Set
    End Property
 
+   Public ReadOnly Property SawParam_Visibility As Visibility
+      Get
+         ' in assenza dell'uscita H1 nascondo i parametri lama
+         If EgtGetHeadId("H1") = GDB_ID.NULL Then
+            Return Visibility.Hidden
+         Else
+            Return Visibility.Visible
+         End If
+      End Get
+   End Property
+
 #End Region    ' Saw Param
 
 #Region "Machine Param"
 
    Public Property SafeZ As String
       Get
-         Return LenToString(CurrentMachine.dSafeZ, -2)
+         Return LenToString(CurrentMachine.dSafeZ, 2)
       End Get
       Set(value As String)
          Dim dSafeZ As Double = 0
@@ -184,7 +195,7 @@ Public Class MachOptionWindowVM
 
    Public Property ShortCut As String
       Get
-         Return LenToString(CurrentMachine.dShortCut, -2)
+         Return LenToString(CurrentMachine.dShortCut, 2)
       End Get
       Set(value As String)
          Dim dShortCut As Double = 0
@@ -194,6 +205,16 @@ Public Class MachOptionWindowVM
       End Set
    End Property
 
+   Public ReadOnly Property MillingParam_Visibility As Visibility
+      Get
+         If bWaterJet Then
+            Return Visibility.Hidden
+         Else
+            Return Visibility.Visible
+         End If
+      End Get
+   End Property
+
 #End Region    ' Milling Param
 
 #Region "Nesting Param"
@@ -264,7 +285,7 @@ Public Class MachOptionWindowVM
 
    Public Property AdditionalTable As String
       Get
-         Return LenToString(CurrentMachine.dAdditionalTable, -2)
+         Return LenToString(CurrentMachine.dAdditionalTable, 2)
       End Get
       Set(value As String)
          Dim dAdditionalTable As Double = 0
@@ -382,6 +403,12 @@ Public Class MachOptionWindowVM
       End Set
    End Property
 
+   Public ReadOnly Property Materials_Visibility As Visibility
+      Get
+         Return If(CurrentMachine.bWaterJet, Visibility.Collapsed, Visibility.Visible)
+      End Get
+   End Property
+
 #End Region    ' Material
 
    ' Definizione comandi
@@ -469,7 +496,11 @@ Public Class MachOptionWindowVM
    End Property
    Public ReadOnly Property MillingParamMsg As String
       Get
-         Return EgtMsg(MSG_ALARMSPAGEUC + 29)
+         If bWaterJet Then
+            Return EgtMsg(91058)
+         Else
+            Return EgtMsg(MSG_ALARMSPAGEUC + 29)
+         End If
       End Get
    End Property
    Public ReadOnly Property CornerCutsMsg As String
diff --git a/MachinePanel/MachinePanelV.xaml b/MachinePanel/MachinePanelV.xaml
index 81679cb..6ff12dc 100644
--- a/MachinePanel/MachinePanelV.xaml
+++ b/MachinePanel/MachinePanelV.xaml
@@ -22,5 +22,7 @@
    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}">
       <Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
    </Button>
+   <Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
+           Style="{StaticResource ToolBar_Button}" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
 
 </EgtFloating:EgtFloatingPanel>
diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index 8bf8fe4..b54ec70 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -22,6 +22,12 @@ Public Class MyMachinePanelVM
       End Set
    End Property
 
+   Public ReadOnly Property WjDb_Visibility As Visibility
+      Get
+         Return If(CurrentMachine.bWaterJet And CurrentMachine.bFromDBWaterJet, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
 #Region "Messages"
 
    Public ReadOnly Property ToolDBMsg As String
@@ -39,6 +45,11 @@ Public Class MyMachinePanelVM
          Return EgtMsg(MSG_ALARMSPAGEUC + 33)
       End Get
    End Property
+   Public ReadOnly Property WaterjetDbMsg As String
+      Get
+         Return "WJ" 'EgtMsg(MSG_MACHINEPAGEUC + 7)
+      End Get
+   End Property
 
 #End Region    ' Messages
 
@@ -59,6 +70,11 @@ Public Class MyMachinePanelVM
          Return "SetUp"
       End Get
    End Property
+   Public ReadOnly Property WaterjetDbToolTip As String
+      Get
+         Return "Waterjet DB"
+      End Get
+   End Property
 
 #End Region   ' ToolTip
 
@@ -67,6 +83,7 @@ Public Class MyMachinePanelVM
    Private m_cmdMachDb As ICommand
    Private m_cmdSetUp As ICommand
    Private m_cmdMachOptions As ICommand
+   Private m_cmdWaterjetDb As ICommand
 
 #End Region    'FIELDS & PROPERTIES
 
@@ -300,6 +317,33 @@ Public Class MyMachinePanelVM
       EgtSetCurrentContext(OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx())
    End Sub
 
+#Region "WaterjetDbCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property WaterjetDbCommand As ICommand
+      Get
+         If m_cmdWaterjetDb Is Nothing Then
+            m_cmdWaterjetDb = New Command(AddressOf WaterjetDb)
+         End If
+         Return m_cmdWaterjetDb
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub WaterjetDb(ByVal param As Object)
+      Dim WaterjetDbWindow As New WaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
+      WaterjetDbWindow.Height = 546
+      WaterjetDbWindow.Width = 846
+      WaterjetDbWindow.ShowDialog()
+      EgtSetCurrentContext(OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx())
+   End Sub
+
+#End Region    ' SpeedDbCommand
+
 #End Region    ' METHODS
 
 End Class
\ No newline at end of file
diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 8aa635a..fb4d84a 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -195,8 +195,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2310, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2310, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2311, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2311, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 51b87b0..8dcf299 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.10.3")>
-<Assembly: AssemblyFileVersion("2.3.10.3")>
+<Assembly: AssemblyVersion("2.3.11.2")>
+<Assembly: AssemblyFileVersion("2.3.11.2")>
 
diff --git a/MySceneHost/MySceneHostVM.vb b/MySceneHost/MySceneHostVM.vb
index ea5e9af..c485738 100644
--- a/MySceneHost/MySceneHostVM.vb
+++ b/MySceneHost/MySceneHostVM.vb
@@ -285,6 +285,7 @@ Public Class MySceneHostVM
                EgtOutLog( "Slab image not found :" & sOriPath)
             End Try
             EgtSetName(nPhotoId, PHOTO_NAME)
+            EgtChangePhotoCenterAsFlatScan( nPhotoId)
          End If
          ' Elimino gli altri gruppi di lavorazioni 
          For Each nMGrpId As Integer In vMchGrps
@@ -743,6 +744,7 @@ Public Class MySceneHostVM
          Case OptionPanelVM.Tabs.NESTING
             OmagOFFICEMap.refNestingTabVM.OnMouseMoveScene(sender, e)
          Case OptionPanelVM.Tabs.MACHINING
+            OmagOFFICEMap.refSplitModeVM.OnMyMouseMoveScene(sender, e)
          Case OptionPanelVM.Tabs.SIMUL
       End Select
    End Sub
@@ -755,6 +757,7 @@ Public Class MySceneHostVM
          Case OptionPanelVM.Tabs.NESTING
             OmagOFFICEMap.refNestingTabVM.OnMouseUpScene(sender, e)
          Case OptionPanelVM.Tabs.MACHINING
+            OmagOFFICEMap.refSplitModeVM.OnMyMouseUpScene(sender, e)
          Case OptionPanelVM.Tabs.SIMUL
       End Select
    End Sub
diff --git a/OptionPanel/MachiningTab/MachiningTabVM.vb b/OptionPanel/MachiningTab/MachiningTabVM.vb
index 26359e7..d579b28 100644
--- a/OptionPanel/MachiningTab/MachiningTabVM.vb
+++ b/OptionPanel/MachiningTab/MachiningTabVM.vb
@@ -322,6 +322,8 @@ Public Class MachiningTabVM
    Friend Sub OnMouseDownScene(sender As Object, e As Windows.Forms.MouseEventArgs)
       If m_MachiningMode = MachiningModeOpt.MOVERAWPART Then
          OmagOFFICEMap.refMoveRawModeVM.OnMouseDownScene(sender, e)
+      ElseIf m_MachiningMode = MachiningModeOpt.SPLIT Then
+         OmagOFFICEMap.refSplitModeVM.OnMouseDownScene(sender, e)
       End If
    End Sub
 
diff --git a/OptionPanel/MachiningTab/SplitModeV.xaml b/OptionPanel/MachiningTab/SplitModeV.xaml
index 7ecc944..4450514 100644
--- a/OptionPanel/MachiningTab/SplitModeV.xaml
+++ b/OptionPanel/MachiningTab/SplitModeV.xaml
@@ -71,14 +71,17 @@
                <Button Content="{Binding CutMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding CutCommand}"
+                       Visibility="{Binding CutBtnVisibility}"
                        Margin="0,0,2.5,0"/>
                <Button Content="{Binding CutStartMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding CutStartCommand}"
+                       Visibility="{Binding CutStartBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>
                <Button Content="{Binding CutEndMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding CutEndCommand}"
+                       Visibility="{Binding CutEndBtnVisibility}"
                        Margin="2.5,0,0,0"/>
                
             </UniformGrid>
@@ -94,10 +97,12 @@
                <Button Content="{Binding AllExtendMsg}" Grid.Column="1"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding AllExtendCommand}"
+                       Visibility="{Binding AllExtendBtnVisibility}"
                        Margin="0,0,2.5,0"/>
                <Button Content="{Binding AllReduceMsg}" Grid.Column="2"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding AllReduceCommand}"
+                       Visibility="{Binding AllReduceBtnVisibility}"
                        Margin="2.5,0,0,0"/>
 
             </Grid>
@@ -115,14 +120,17 @@
                <Button Content="{Binding OutCenStartMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding OutCenStartCommand}"
+                       Visibility="{Binding OutCenStartBtnVisibility}"
                        Margin="0,0,2.5,0" Padding="0"/>
                <Button Content="{Binding AllOutStartMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding AllOutStartCommand}"
+                       Visibility="{Binding AllOutStartBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>
                <Button Content="{Binding AllCenStartMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding AllCenStartCommand}"
+                       Visibility="{Binding AllCenStartBtnVisibility}"
                        Margin="2.5,0,0,0"/>
                
             </UniformGrid>
@@ -132,14 +140,17 @@
                <Button Content="{Binding OutCenEndMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding OutCenEndCommand}"
+                       Visibility="{Binding OutCenEndBtnVisibility}"
                        Margin="0,0,2.5,0" Padding="0"/>
                <Button Content="{Binding AllOutEndMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding AllOutEndCommand}"
+                       Visibility="{Binding AllOutEndBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>
                <Button Content="{Binding AllCenEndMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding AllCenEndCommand}"
+                       Visibility="{Binding AllCenEndBtnVisibility}"
                        Margin="2.5,0,0,0"/>
                
             </UniformGrid>
@@ -159,6 +170,7 @@
                <Button Content="{Binding PauseMsg}" Grid.Column="2"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding PauseCommand}"
+                       Visibility="{Binding PauseBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>
 
             </UniformGrid>
@@ -174,6 +186,7 @@
                     <Button Content="{Binding InvertMsg}" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding InvertCommand}"
+                            Visibility="{Binding InvertBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>
 
             </UniformGrid>
diff --git a/OptionPanel/MachiningTab/SplitModeVM.vb b/OptionPanel/MachiningTab/SplitModeVM.vb
index 40d069b..2160540 100644
--- a/OptionPanel/MachiningTab/SplitModeVM.vb
+++ b/OptionPanel/MachiningTab/SplitModeVM.vb
@@ -16,6 +16,25 @@ Public Class SplitModeVM
    Private m_CurrLastInd As Integer = -1
    Private m_SelectedItemsList As New ObservableCollection(Of NameIdLsBxItem)
 
+   ' numero di lavorazioni di tipo lama
+   Private m_nCountSawing As Integer = 0
+   ' numero di lavprazioni di tipo waterjet
+   Private m_nCountWaterjetting As Integer = 0
+   ' altri tipi di lavorazioni (Foro/Fresa)
+   Private m_nCountOtherMachining As Integer = 0
+   ' verifico che le lavorazioni selezionate siano omogenee (con lo stesso utensile)
+   Private m_bAreHomogeneous As Boolean = False
+
+   ' Flag di pagina attiva
+   Private m_bActive As Boolean = False
+   ' Drag
+   Private m_nDragInd As Integer = -1
+   Private m_nDragType As Integer = 0           '0=niente, 1=attacco, 2=uscita
+   Private m_ptDragPrev As Point3d
+   Private m_bDragging As Boolean = False
+   ' Selected cut
+   Private m_nSelected As Integer = GDB_ID.NULL
+
    Private m_ItemList As New ObservableCollection(Of NameIdLsBxItem)
    Public ReadOnly Property ItemList As ObservableCollection(Of NameIdLsBxItem)
       Get
@@ -45,6 +64,149 @@ Public Class SplitModeVM
       End Set
    End Property
 
+   Private m_CutBtnVisibility As Visibility
+   Public Property CutBtnVisibility As Visibility
+      Get
+         Return m_CutBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_CutBtnVisibility = value
+         NotifyPropertyChanged(NameOf(CutBtnVisibility))
+      End Set
+   End Property
+
+   Private m_CutStartBtnVisibility As Visibility
+   Public Property CutStartBtnVisibility As Visibility
+      Get
+         Return m_CutStartBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_CutStartBtnVisibility = value
+         NotifyPropertyChanged(NameOf(CutStartBtnVisibility))
+      End Set
+   End Property
+
+   Private m_CutEndBtnVisibility As Visibility
+   Public Property CutEndBtnVisibility As Visibility
+      Get
+         Return m_CutEndBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_CutEndBtnVisibility = value
+         NotifyPropertyChanged(NameOf(CutEndBtnVisibility))
+      End Set
+   End Property
+
+   Private m_OutCenStartBtnVisibility As Visibility
+   Public Property OutCenStartBtnVisibility As Visibility
+      Get
+         Return m_OutCenStartBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_OutCenStartBtnVisibility = value
+         NotifyPropertyChanged(NameOf(OutCenStartBtnVisibility))
+      End Set
+   End Property
+
+   Private m_OutCenEndBtnVisibility As Visibility
+   Public Property OutCenEndBtnVisibility As Visibility
+      Get
+         Return m_OutCenEndBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_OutCenEndBtnVisibility = value
+         NotifyPropertyChanged(NameOf(OutCenEndBtnVisibility))
+      End Set
+   End Property
+
+   Private m_InvertBtnVisibility As Visibility
+   Public Property InvertBtnVisibility As Visibility
+      Get
+         Return m_InvertBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_InvertBtnVisibility = value
+         NotifyPropertyChanged(NameOf(InvertBtnVisibility))
+      End Set
+   End Property
+
+   Private m_PauseBtnVisibility As Visibility
+   Public Property PauseBtnVisibility As Visibility
+      Get
+         Return m_PauseBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_PauseBtnVisibility = value
+         NotifyPropertyChanged(NameOf(PauseBtnVisibility))
+      End Set
+   End Property
+
+   Private m_AllOutStartBtnVisibility As Visibility
+   Public Property AllOutStartBtnVisibility As Visibility
+      Get
+         Return m_AllOutStartBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_AllOutStartBtnVisibility = value
+         NotifyPropertyChanged(NameOf(AllOutStartBtnVisibility))
+      End Set
+   End Property
+
+   Private m_AllCenStartBtnVisibility As Visibility
+   Public Property AllCenStartBtnVisibility As Visibility
+      Get
+         Return m_AllCenStartBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_AllCenStartBtnVisibility = value
+         NotifyPropertyChanged(NameOf(AllCenStartBtnVisibility))
+      End Set
+   End Property
+
+   Private m_AllOutEndBtnVisibility As Visibility
+   Public Property AllOutEndBtnVisibility As Visibility
+      Get
+         Return m_AllOutEndBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_AllOutEndBtnVisibility = value
+         NotifyPropertyChanged(NameOf(AllOutEndBtnVisibility))
+      End Set
+   End Property
+
+   Private m_AllCenEndBtnVisibility As Visibility
+   Public Property AllCenEndBtnVisibility As Visibility
+      Get
+         Return m_AllCenEndBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_AllCenEndBtnVisibility = value
+         NotifyPropertyChanged(NameOf(AllCenEndBtnVisibility))
+      End Set
+   End Property
+
+   Private m_AllExtendBtnVisibility As Visibility
+   Public Property AllExtendBtnVisibility As Visibility
+      Get
+         Return m_AllExtendBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_AllExtendBtnVisibility = value
+         NotifyPropertyChanged(NameOf(AllExtendBtnVisibility))
+      End Set
+   End Property
+
+   Private m_AllReduceBtnVisibility As Visibility
+   Public Property AllReduceBtnVisibility As Visibility
+      Get
+         Return m_AllReduceBtnVisibility
+      End Get
+      Set(value As Visibility)
+         m_AllReduceBtnVisibility = value
+         NotifyPropertyChanged(NameOf(AllReduceBtnVisibility))
+      End Set
+   End Property
+
 #Region "Messages"
 
    Public ReadOnly Property OnOffMsg As String
@@ -193,6 +355,10 @@ Public Class SplitModeVM
 #Region "METHODS"
 
    Friend Function InitSplitRaw() As Boolean
+      m_bActive = True
+      'm_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_nDragInd = -1
+      m_nDragType = 0
       ' Nascondo eventuali pezzi in parcheggio
       EstCalc.HideParkedParts()
       ' Nascondo eventuale contorno da foto
@@ -207,7 +373,7 @@ Public Class SplitModeVM
       If Not OmagOFFICEMap.refMachiningTabVM.IsShow Then
          If CurrentMachine.WaterJettingActive Then ResetAllMachinings()
          If SortAllMachinings() Then EstCalc.SetOrderMachiningFlag()
-         If CurrentMachine.WaterJettingActive Then         
+         If CurrentMachine.WaterJettingActive Then
             Dim bModif As Boolean = TestAllMachiningsForStrict()
             If bModif Then OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(90321), 3, MSG_TYPE.WARNING) 'Ridotte alcune lavorazioni per evitare interferenze
          End If
@@ -225,12 +391,18 @@ Public Class SplitModeVM
       ShowOnePhaseMachiningPreview(m_nCurrPhase)
       ' Preparo la lista delle lavorazioni
       CalculateSplitMachList(m_nCurrPhase, m_MachiningList)
+      ' azzero i contatori delle lavorazioni
+      m_nCountSawing = 0
+      m_nCountWaterjetting = 0
+      m_nCountOtherMachining = 0
       ' Aggiorno visualizzazione delle lavorazioni
       For nI As Integer = 0 To m_MachiningList.Count() - 1
          ' sistemo colore
          ColorMachining(m_MachiningList(nI))
          ' assegno numerazione
          NumberDirectionMachining(nI)
+         ' conto il numero di tipi di lavorazioni
+         CountMachiningType(m_MachiningList(nI), m_nCountSawing, m_nCountWaterjetting, m_nCountOtherMachining)
       Next
       ' Preparo la lista degli Item
       ShowMachiningList()
@@ -249,6 +421,7 @@ Public Class SplitModeVM
    End Function
 
    Friend Function ExitSplitRaw(Optional bTrueExit As Boolean = True) As Boolean
+      m_bActive = False
       ' Rimuovo evidenziazione e numeri
       RemoveMarkAndNumbers()
       ' Ripristino colori lavorazioni
@@ -394,8 +567,14 @@ Public Class SplitModeVM
       HideAllMachinings()
       ' Preparo la lista delle lavorazioni e le disabilito
       CalculateSplitMachList(m_nCurrPhase, m_MachiningList)
+      ' azzero i contatori delle lavorazioni
+      m_nCountSawing = 0
+      m_nCountWaterjetting = 0
+      m_nCountOtherMachining = 0
       For nI As Integer = 0 To m_MachiningList.Count() - 1
          m_MachiningList(nI).m_bEnabled = False
+         ' conto il numero di tipi di lavorazioni
+         CountMachiningType(m_MachiningList(nI), m_nCountSawing, m_nCountWaterjetting, m_nCountOtherMachining)
       Next
       ' Aggiorno visualizzazione delle lavorazioni
       EgtEmptyGroup(m_nNbrGrpId)
@@ -421,24 +600,28 @@ Public Class SplitModeVM
             Dim sText As String = String.Empty
             If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL Then
                sText = EgtMsg(90791) & " " & i.ToString()
-               If Mach.m_sLay = NAME_ONPATH Then AddTopText( sText)
+               If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
             Else
                sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
             End If
             If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
-         ElseIf Mach.m_nType = MCH_OY.DRILLING Then  ' Foratura
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.SAWING))
+         ElseIf Mach.m_nType = MCH_OY.DRILLING Then       ' Foratura
             Dim sText As String = EgtMsg(90792) & " " & i.ToString()
             If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
-         ElseIf Mach.m_nType = MCH_OY.MILLING Then   ' Fresatura
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.DRILLING))
+         ElseIf Mach.m_nType = MCH_OY.MILLING Then        ' Fresatura
             Dim sText As String = EgtMsg(90793) & " " & i.ToString()
-            If Mach.m_sLay = NAME_ONPATH Then AddTopText( sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
+            If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.MILLING))
+         ElseIf Mach.m_nType = MCH_OY.POCKETING Then      ' Svuotatura
+            Dim sText As String = EgtMsg(90796) & " " & i.ToString()
+            If Mach.m_bPause Then AddPauseText(sText)
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.POCKETING))
          ElseIf Mach.m_nType = MCH_OY.WATERJETTING Then   ' Waterjet
             Dim sText As String = EgtMsg(90797) & " " & i.ToString()
             If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.WATERJETTING))
          End If
       Next
    End Sub
@@ -478,6 +661,87 @@ Public Class SplitModeVM
                                                       Not OmagOFFICEMap.refMachiningTabVM.ByHand)
       ' Altri bottoni
       SplitModeIsEnabled = Not OmagOFFICEMap.refMachiningTabVM.IsShow
+
+      ' nascondo i comandi che non devono essere visualizzati in funzione delle lavorazioni attive
+      If m_nCountSawing = 0 And (m_nCountWaterjetting > 0 Or m_nCountOtherMachining > 0) Then
+         VisibilityButtonFromMachining(MCH_OY.WATERJETTING)
+      Else
+         VisibilityButtonFromMachining(MCH_OY.SAWING)
+      End If
+
+   End Sub
+
+   Private Sub VerifyHomogenousMachining(ItemList As List(Of NameIdLsBxItem))
+      If IsNothing(ItemList) OrElse ItemList.Count = 0 Then
+         OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+         Return
+      End If
+      Dim nSawing As Integer = 0
+      Dim nWaterjetting As Integer = 0
+      Dim nOtherMachining As Integer = 0
+      ' conto il numero di tipi di lavprazioni
+      For Each Item As NameIdLsBxItem In ItemList
+         If Item.Type = MCH_OY.SAWING Then
+            nSawing += 1
+         ElseIf Item.Type = MCH_OY.WATERJETTING Then
+            nWaterjetting += 1
+         Else
+            nOtherMachining += 1
+         End If
+      Next
+      ' verifico se le lavorazioni sono omeogenee
+      If nSawing > 0 And (nWaterjetting > 0 Or nOtherMachining > 0) Then
+         m_bAreHomogeneous = False
+         VisibilityButtonFromMachining(MCH_OY.SAWING)
+      ElseIf nSawing = 0 And nOtherMachining > 0 And nWaterjetting > 0 Then
+         m_bAreHomogeneous = False
+         VisibilityButtonFromMachining(MCH_OY.WATERJETTING)
+      Else
+         VisibilityButtonFromMachining(ItemList(0).Type)
+         m_bAreHomogeneous = True
+      End If
+      ' eventualmente stampo messaggio
+      If Not m_bAreHomogeneous Then
+         OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+         OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Lavorazioni non omogenee", MSG_TYPE.WARNING)
+      Else
+         OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+      End If
+   End Sub
+
+   Private Sub VisibilityButtonFromMachining(ByVal Type As Integer)
+      If Type <> MCH_OY.SAWING Then
+         CutBtnVisibility = Visibility.Hidden
+         CutStartBtnVisibility = Visibility.Hidden
+         CutEndBtnVisibility = Visibility.Hidden
+
+         OutCenStartBtnVisibility = Visibility.Hidden
+         OutCenEndBtnVisibility = Visibility.Hidden
+         InvertBtnVisibility = Visibility.Hidden
+         PauseBtnVisibility = Visibility.Hidden
+         AllOutStartBtnVisibility = Visibility.Hidden
+         AllCenStartBtnVisibility = Visibility.Hidden
+         AllOutEndBtnVisibility = Visibility.Hidden
+         AllCenEndBtnVisibility = Visibility.Hidden
+         AllExtendBtnVisibility = Visibility.Hidden
+         AllReduceBtnVisibility = Visibility.Hidden
+      Else
+         CutBtnVisibility = Visibility.Visible
+         CutStartBtnVisibility = Visibility.Visible
+         CutEndBtnVisibility = Visibility.Visible
+
+         OutCenStartBtnVisibility = Visibility.Visible
+         OutCenEndBtnVisibility = Visibility.Visible
+         InvertBtnVisibility = Visibility.Visible
+         PauseBtnVisibility = Visibility.Visible
+         AllOutStartBtnVisibility = Visibility.Visible
+         AllCenStartBtnVisibility = Visibility.Visible
+         AllOutEndBtnVisibility = Visibility.Visible
+         AllCenEndBtnVisibility = Visibility.Visible
+         AllExtendBtnVisibility = Visibility.Visible
+         AllReduceBtnVisibility = Visibility.Visible
+      End If
+
    End Sub
 
    Private Function ModifyOtherLeadIn(nI As Integer, nLiOthType As Integer) As Boolean
@@ -805,7 +1069,16 @@ Public Class SplitModeVM
       ' Imposto flag di modifica
       m_bModified = True
       ' Abilitazione bottone Next
-      EnableButtons()
+      ' EnableButtons()
+      ' recupero l'elenco degli elementi selezionati
+      Dim ItemList As New List(Of NameIdLsBxItem)
+      For Each Item As NameIdLsBxItem In m_SelectedItemsList ' MachiningLsBx.SelectedItems
+         ItemList.Add(Item)
+      Next
+      'For Each Item As NameIdLsBxItem In m_ItemList
+      '   If Item.bIsActive Then ItemList.Add(Item)
+      'Next
+      VerifyHomogenousMachining(ItemList)
    End Sub
 
 #End Region ' OnOffCommand
@@ -1445,13 +1718,22 @@ Public Class SplitModeVM
             If Not ModifStartWindow.ShowDialog() Then Return
             ' Modifica della lavorazione
             Dim dUsal As Double = ModifStartWindowVM.GetVal()
-            EgtSetCurrMachining(nOperId)
-            Dim dAddLen As Double = 0
-            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
-            If dAddLen - dOrigUsal < -10 * EPS_SMALL Then Return
-            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
-            EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
-            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+            Dim bRepeat As Boolean = False
+            Do
+               EgtSetCurrMachining(nOperId)
+               Dim dAddLen As Double = 0
+               EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
+               If dAddLen - dOrigUsal < -10 * EPS_SMALL Then Return
+               EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
+               EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
+               UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+               bRepeat = Not UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+               If bRepeat Then
+                  EgtSetMachiningParam(MCH_MP.STARTADDLEN, dOrigUsal)
+                  EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
+                  dUsal = dOrigUsal
+               End If
+            Loop Until Not bRepeat
             ' verifico interferenza
             EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
             ColorMachining(m_MachiningList(nI))
@@ -1540,14 +1822,25 @@ Public Class SplitModeVM
             ModifStartWindowVM.SetVal(dOrigUeal)
             If Not ModifStartWindow.ShowDialog() Then Return
             ' Modifica della lavorazione
-            Dim dUsal As Double = ModifStartWindowVM.GetVal()
-            EgtSetCurrMachining(nOperId)
-            Dim dAddLen As Double = 0
-            EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
-            If dAddLen - dOrigUeal < -10 * EPS_SMALL Then Return
-            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUsal - dOrigUeal)
-            EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUsal)
-            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+            Dim dUeal As Double = ModifStartWindowVM.GetVal()
+            Dim bRepeat As Boolean = False
+            Do
+               EgtSetCurrMachining(nOperId)
+               Dim dAddLen As Double = 0
+               EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+               If dAddLen - dOrigUeal < -10 * EPS_SMALL Then
+                  Return
+               End If
+               EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
+               EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
+               UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+               bRepeat = Not UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+               If bRepeat Then
+                  EgtSetMachiningParam(MCH_MP.ENDADDLEN, dOrigUeal)
+                  EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
+                  dUeal = dOrigUeal
+               End If
+            Loop Until Not bRepeat
             ' verifico interferenza
             EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
             ColorMachining(m_MachiningList(nI))
@@ -1690,6 +1983,200 @@ Public Class SplitModeVM
 
 #End Region       ' COMMANDS
 
+#Region "EVENTS"
+
+   Friend Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
+      If Not m_bActive OrElse OmagOFFICEMap.refMachiningTabVM.IsShow Then Return
+      ' Si può selezionare solo con il tasto sinistro e se stato NULL
+      If e.Button <> Windows.Forms.MouseButtons.Left Or
+         Not OmagOFFICEMap.refSceneHostVM.MainScene.IsStatusNull() Then
+         Return
+      End If
+      ' Reset drag
+      m_nDragInd = -1
+      m_nDragType = 0
+      ' Reset selection interface
+      m_nSelected = GDB_ID.NULL
+      ' Verifico se selezionato estremo di taglio con lama
+      EgtSetObjFilterForSelWin(False, True, False, False, False)
+      Dim nSel As Integer
+      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
+      Dim nId As Integer = EgtGetFirstObjInSelWin()
+      While nId <> GDB_ID.NULL
+         ' Verifico sia un attacco o uscita di taglio con lama
+         Dim nType As Integer = 0
+         Dim sName As String = ""
+         EgtGetName(nId, sName)
+         If String.Compare(sName, NAME_PV_PRECUT) = 0 Then
+            nType = 1
+         ElseIf String.Compare(sName, NAME_PV_POSTCUT) = 0 Then
+            nType = 2
+         ElseIf String.Compare(sName, NAME_PV_CUT) = 0 Then
+            nType = 3
+         End If
+         If nType = 1 Or nType = 2 Then
+            Dim nPvId As Integer = EgtGetParent(EgtGetParent(nId))
+            Dim nMchId As Integer = GDB_ID.NULL
+            If EgtGetInfo(nPvId, "MId", nMchId) Then
+               For nInd As Integer = 0 To m_MachiningList.Count() - 1
+                  If m_MachiningList(nInd).m_nId = nMchId Then
+                     m_nDragInd = nInd
+                     m_nDragType = nType
+                  End If
+                  For nJ As Integer = 0 To m_MachiningList(nInd).m_vOthId.Count() - 1
+                     If m_MachiningList(nInd).m_vOthId(nJ) = nMchId Then
+                        m_nDragInd = nInd
+                        m_nDragType = nType
+                        Exit For
+                     End If
+                  Next
+                  If m_nDragInd >= 0 Then
+                     ' Assegno l'id dell'elemento selezionato
+                     m_nSelected = m_nDragInd
+                     Exit For
+                  End If
+               Next
+            End If
+            If m_nDragInd >= 0 Then
+               ' Assegno l'id dell'elemento selezionato
+               m_nSelected = m_nDragInd
+               Exit While
+            End If
+         ElseIf nType = 3 Then
+            Dim nPvId As Integer = EgtGetParent(EgtGetParent(nId))
+            Dim nMchId As Integer = GDB_ID.NULL
+            If EgtGetInfo(nPvId, "MId", nMchId) Then
+               For nInd As Integer = 0 To m_MachiningList.Count() - 1
+                  If m_MachiningList(nInd).m_nId = nMchId Then
+                     m_nSelected = nInd
+                  End If
+                  For nJ As Integer = 0 To m_MachiningList(nInd).m_vOthId.Count() - 1
+                     If m_MachiningList(nInd).m_vOthId(nJ) = nMchId Then
+                        m_nSelected = nInd
+                        Exit For
+                     End If
+                  Next
+                  If m_nSelected >= 0 Then Exit For
+               Next
+            End If
+            If m_nSelected >= 0 Then Exit While
+         End If
+         nId = EgtGetNextObjInSelWin()
+      End While
+      ' Sistemazioni per drag
+      If m_nSelected >= 0 AndAlso EgtUnProjectPoint(e.Location, m_ptDragPrev) Then
+         Dim nItemIndex = 0
+         For Each Item In ItemList
+            Item.IsSelected = (nItemIndex = m_nSelected)
+            nItemIndex += 1
+         Next
+      Else
+         m_nDragInd = -1
+         m_nDragType = 0
+         m_nSelected = GDB_ID.NULL
+      End If
+   End Sub
+
+   Friend Sub OnMyMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
+      If Not m_bActive OrElse OmagOFFICEMap.refMachiningTabVM.IsShow Then Return
+      ' Se drag non abilitato o in corso
+      If m_nDragInd = -1L Or m_bDragging Then Return
+      m_bDragging = True
+      Dim nOperId As Integer = m_MachiningList(m_nDragInd).m_nId
+      ' Ricavo il punto corrente in coordinate mondo
+      Dim ptCurr As Point3d
+      EgtUnProjectPoint(e.Location, ptCurr)
+      ' Ricavo il vettore di movimento e la variazione di lunghezza
+      Dim vtMove As Vector3d = ptCurr - m_ptDragPrev
+      Dim dDelta = vtMove * m_MachiningList(m_nDragInd).m_vtDir
+      If m_nDragType = 1 Then
+         Dim dOrigUsal As Double = 0
+         Dim dUsal As Double
+         ' ----------------------- REPEAT -----------------------
+         Do
+            dDelta = -dDelta
+            ' Leggo il valore salvato nella geometria
+            EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
+            dUsal = dOrigUsal + dDelta
+            ' Se c'è limite alla lunghezza libera
+            If m_MachiningList(m_nDragInd).m_dStartFreeLen < FREELEN_INF Then
+               ' Recupero sicurezza in corner interno
+               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, CurrentMachine.sMachIniFile), 10 * EPS_SMALL)
+               ' Recupero lunghezza baffo del taglio
+               Dim nPvId As Integer = GDB_ID.NULL
+               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+               Dim dDT As Double = 0
+               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+               dUsal = Math.Min(dUsal, m_MachiningList(m_nDragInd).m_dStartFreeLen - dDT - dCornerSafety)
+            End If
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            Dim dAddLen As Double = 0
+            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
+            If dAddLen - dOrigUsal < -10 * EPS_SMALL Then
+               m_bDragging = False
+               Return
+            End If
+            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
+         Loop Until UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
+         ' ----------------------- REPEAT (solo se il segmento scompare) -----------------------
+      Else
+         Dim dOrigUeal As Double = 0
+         Dim dUeal As Double
+         dDelta = -dDelta
+         Do
+            dDelta = -dDelta
+            ' Leggo il valore salvato nella geometria
+            EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
+            dUeal = dOrigUeal + dDelta
+            ' Se c'è limite alla lunghezza libera
+            If m_MachiningList(m_nDragInd).m_dEndFreeLen < FREELEN_INF Then
+            ' Recupero sicurezza in corner interno
+            Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, CurrentMachine.sMachIniFile), 10 * EPS_SMALL)
+            ' Recupero lunghezza baffo del taglio
+            Dim nPvId As Integer = GDB_ID.NULL
+            EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+            Dim dDT As Double = 0
+            EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+            dUeal = Math.Min(dUeal, m_MachiningList(m_nDragInd).m_dEndFreeLen - dDT - dCornerSafety)
+         End If
+         ' Modifica della lavorazione
+         EgtSetCurrMachining(nOperId)
+         Dim dAddLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+            If dAddLen - dOrigUeal < -10 * EPS_SMALL Then
+               m_bDragging = False
+               Return
+            End If
+            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
+         Loop Until UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
+      End If
+      ' verifico interferenza
+      EgtVerifyMachining(m_MachiningList(m_nDragInd).m_nId, m_MachiningList(m_nDragInd).m_nInterf)
+      ColorMachining(m_MachiningList(m_nDragInd))
+      ColorNumberArrow(m_nDragInd)
+      ' Aggiorno visualizzazione
+      EgtDraw()
+      m_bModified = True
+      ' Aggiorno punto e stato di drag
+      m_ptDragPrev = ptCurr
+      m_bDragging = False
+   End Sub
+
+   Friend Sub OnMyMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Verifico di essere il gestore attivo e non in modalità sola visualizzazione
+      If Not m_bActive OrElse OmagOFFICEMap.refMachiningTabVM.IsShow Then Return
+      ' Se drag in corso
+      If m_nDragInd >= 0 Then
+         m_nDragInd = -1
+      End If
+   End Sub
+
+#End Region    ' EVENTS
 
    '-----------------------------------------------------------------------------------------------
    Public Class NameIdLsBxItem
@@ -1698,6 +2185,7 @@ Public Class SplitModeVM
       Private m_nInd As Integer
       Private m_sName As String
       Private m_bIsActive As Boolean
+      Private m_nType As Integer
 
       Public Property Ind As Integer
          Get
@@ -1740,16 +2228,31 @@ Public Class SplitModeVM
          Set(value As Boolean)
             If Not IsNothing(value) Then
                m_IsSelected = value
-               If value Then
+               If value AndAlso Not OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Contains(Me) Then
                   OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Add(Me)
                Else
                   OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Remove(Me)
                End If
+               ' se non è stato aggiunto nessun nuovo elemento alla lista dei selezionati allora esco
+               If OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count = 0 Then
+                  EgtDraw()
+                  NotifyPropertyChanged("IsSelected")
+                  Return
+               End If
+               ' se ho un solo elemento allora so che è coerrente con se stesso come lavorazione
+               If OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count = 1 Then
+                  OmagOFFICEMap.refSplitModeVM.m_bAreHomogeneous = True
+               End If
                ' creo lista ordinata dei selezionati
                Dim ItemList As New List(Of NameIdLsBxItem)
                For Each Item In OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList
                   ItemList.Add(Item)
                Next
+
+               ' ------------------------ verifico che le lavorazioni siano dello stesso tipo ------------------------
+               OmagOFFICEMap.refSplitModeVM.VerifyHomogenousMachining(ItemList)
+               ' -----------------------------------------------------------------------------------------------------
+
                ItemList.Sort(Function(x, y) Comparer(Of Integer).Default.Compare(OmagOFFICEMap.refSplitModeVM.m_ItemList.IndexOf(x),
                                                                               OmagOFFICEMap.refSplitModeVM.m_ItemList.IndexOf(y)))
                If Not My.Computer.Keyboard.ShiftKeyDown And (My.Computer.Keyboard.CtrlKeyDown And value) Then
@@ -1795,10 +2298,20 @@ Public Class SplitModeVM
          End Set
       End Property
 
-      Sub New(Name As String, Ind As Integer, bIsActive As Boolean)
+      Public Property Type As Integer
+         Get
+            Return m_nType
+         End Get
+         Set(value As Integer)
+            m_nType = value
+         End Set
+      End Property
+
+      Sub New(Name As String, Ind As Integer, bIsActive As Boolean, nType As Integer)
          Me.m_sName = Name
          Me.m_nInd = Ind
          Me.m_bIsActive = bIsActive
+         Me.m_nType = nType
       End Sub
 
    End Class
diff --git a/OptionPanel/RawPartTab/RawPartTabVM.vb b/OptionPanel/RawPartTab/RawPartTabVM.vb
index 25a8be9..f4046ce 100644
--- a/OptionPanel/RawPartTab/RawPartTabVM.vb
+++ b/OptionPanel/RawPartTab/RawPartTabVM.vb
@@ -233,7 +233,7 @@ Public Class RawPartTabVM
          Else
             Return LenToString(m_dLength, 2)
          End If
-         'Return LenToString(m_dLength, -2)
+         'Return LenToString(m_dLength, 2)
       End Get
       Set(value As String)
          Dim dLength As Double = 0
@@ -1407,7 +1407,7 @@ Public Class RawPartTabVM
       If EstCalc.GetRawId() = GDB_ID.NULL Then
          RecalcRawPart(True)
          Return
-         ' se da cancellare
+      ' se da cancellare
       ElseIf m_dHeight < EPS_SMALL Then
          ' Se ci sono pezzi
          If EgtGetFirstPartInRawPart(EstCalc.GetRawId()) <> GDB_ID.NULL Then
@@ -1428,7 +1428,7 @@ Public Class RawPartTabVM
          End If
          ' Elimino il grezzo
          EgtRemoveRawPart(EstCalc.GetRawId())
-         ' altrimenti da aggiornare
+      ' altrimenti da aggiornare
       Else
          ' Salvo vecchia altezza
          Dim dOldHeight As Double = EstCalc.GetRawHeight()
diff --git a/OptionPanel/SimulTab/MachineAxis.vb b/OptionPanel/SimulTab/MachineAxis.vb
index 656f400..bb09ade 100644
--- a/OptionPanel/SimulTab/MachineAxis.vb
+++ b/OptionPanel/SimulTab/MachineAxis.vb
@@ -101,9 +101,9 @@ Public Class MachineAxis
       EgtSetAxisPos(m_Name, dVal)
       EgtGetAxisPos(m_Name, dVal)
       If m_Linear Then
-         Value = LenToString(dVal, -3)
+         Value = LenToString(dVal, 3)
       Else
-         Value = DoubleToString(dVal, -3)
+         Value = DoubleToString(dVal, 3)
       End If
       EgtDraw()
    End Sub
diff --git a/SideEntityControl/SideEntityControlVM.vb b/SideEntityControl/SideEntityControlVM.vb
index 719599e..70c3d13 100644
--- a/SideEntityControl/SideEntityControlVM.vb
+++ b/SideEntityControl/SideEntityControlVM.vb
@@ -116,7 +116,7 @@ Public Class SideEntityControlVM
          If m_Mode = ModeOpt.SIDEANGLE Then
             Return DoubleToString(m_Parameter1, 2)
          Else
-            Return LenToString(m_Parameter1, -2)
+            Return LenToString(m_Parameter1, 2)
          End If
       End Get
       Set(value As String)
@@ -178,7 +178,7 @@ Public Class SideEntityControlVM
          If m_Mode = ModeOpt.SIDEANGLE Then
             Return LenToString(m_Parameter2, 2)
          Else
-            Return LenToString(m_Parameter2, -2)
+            Return LenToString(m_Parameter2, 2)
          End If
       End Get
       Set(value As String)
@@ -307,7 +307,7 @@ Public Class SideEntityControlVM
    Private m_Parameter3 As Double
    Public Property Parameter3 As String
       Get
-         Return LenToString(m_Parameter3, -2)
+         Return LenToString(m_Parameter3, 2)
       End Get
       Set(value As String)
          If m_Mode <> ModeOpt.SIDEANGLE Then
@@ -344,7 +344,7 @@ Public Class SideEntityControlVM
    Private m_Parameter4 As Double
    Public Property Parameter4 As String
       Get
-         Return LenToString(m_Parameter4, -2)
+         Return LenToString(m_Parameter4, 2)
       End Get
       Set(value As String)
          If m_Mode <> ModeOpt.SIDEANGLE Then
@@ -1027,6 +1027,8 @@ Public Class SideEntityControlVM
          End If
       Next
 
+      If vJoint.Count < 1 Then Return
+
       If vJoint(0) And vJoint(vJoint.Count - 1) Then
          bJointStart = True
       End If
diff --git a/UnderDrillControl/UnderDrillControlVM.vb b/UnderDrillControl/UnderDrillControlVM.vb
index 74a81b4..ea895e1 100644
--- a/UnderDrillControl/UnderDrillControlVM.vb
+++ b/UnderDrillControl/UnderDrillControlVM.vb
@@ -7,7 +7,7 @@ Public Class UnderDrillControlVM
    Private m_dDrillDepth As Double
    Public Property dDrillDepth As String
       Get
-         Return LenToString(m_dDrillDepth, -2)
+         Return LenToString(m_dDrillDepth, 2)
       End Get
       Set(value As String)
          StringToLen(value, m_dDrillDepth)