diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb
index 9045bb0..73f919f 100644
--- a/Constants/ConstMachIni.vb
+++ b/Constants/ConstMachIni.vb
@@ -232,6 +232,7 @@
    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"
    ' DrillMillC90
    ' CutLongDxSx
    ' AngRotMultiCut
diff --git a/Machine/AlarmsPageUC.xaml b/Machine/AlarmsPageUC.xaml
index 9ae8ba4..3488b44 100644
--- a/Machine/AlarmsPageUC.xaml
+++ b/Machine/AlarmsPageUC.xaml
@@ -184,6 +184,31 @@
 
                </GroupBox>
 
+               <!--Parametri rettifica tagli sottosquadra: 1 Parametro -->
+               <GroupBox Name="RectificationWJParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" >
+                   <Grid Grid.Column="3" Grid.Row="2">
+                       <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="2*"/>
+                       </Grid.ColumnDefinitions>
+                       <Grid.RowDefinitions>
+                           <RowDefinition Height="*"/>
+                       </Grid.RowDefinitions>
+
+                       <TextBlock Name="EnableRectificationTxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+                       <CheckBox Name="EnableRectificationChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                                 HorizontalAlignment="Right" Margin="0,0,10,0"/>
+
+                       <!--<TextBlock Name="OffsetRectificationTxBl" Grid.Row="1" Grid.Column="0" 
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                       <EgtWPFLib:EgtTextBox Name="OffsetRectificationTxBx" Grid.Row="1" Grid.Column="1" Margin="10,0,10,0"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>-->
+
+                   </Grid>
+
+               </GroupBox>
+
                <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
                <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="4" 
                               Style="{DynamicResource OmagCut_GroupBox}">
diff --git a/Machine/AlarmsPageUC.xaml.vb b/Machine/AlarmsPageUC.xaml.vb
index 94a1d16..9211b5a 100644
--- a/Machine/AlarmsPageUC.xaml.vb
+++ b/Machine/AlarmsPageUC.xaml.vb
@@ -97,7 +97,10 @@ Public Class AlarmsPageUC
       HolesOffsetWJTxBl.Text = "Offset"
       MinRadiusWJTxBl.Text = "Min Radius"
       OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
-      '--  FINE  -- nuovi parametri per preforo lavello
+      '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
+      REctificationWJParamGpBx.Header = "Rectification"
+      EnableRectificationTxBl.Text = "Enable (on subsquare angle)"
+      '--  FINE  -- nuovi parametro Rettifica tagli sottosquadra WJ
       NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31)            ' Nesting
       AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato
       GhigliottinaTxBl.Text = EgtMsg(91066)                              ' Ghigliottina
@@ -175,6 +178,7 @@ Public Class AlarmsPageUC
          ' Se non previsti tagli waterjet, disabilito relativo box
          If Not m_CurrentMachine.bWaterJetting Then
             WjsParamGpBx.Visibility = Visibility.Hidden
+            RectificationWJParamGpBx.Visibility = Visibility.Hidden
          End If
 
          ' Abilitazione box per contorni grezzo da foto
@@ -354,7 +358,9 @@ Public Class AlarmsPageUC
       MinRadiusWJTxBx.Text = LenToString(dVal, 2)
       OneHoleInCornerWJChBx.IsChecked =
          (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
-
+      ' leggo se attiva la rettifica degli angoli per WaterJet
+      EnableRectificationChBx.IsChecked =
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, 0, m_MainWindow.GetMachIniFile()) <> 0)
       ' Leggo accorciamento angoli con fresa
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
       ShortTxBx.Text = LenToString(dVal, 2)
@@ -970,9 +976,18 @@ Public Class AlarmsPageUC
          WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
       End If
    End Sub
-
    ' --   FINE   -- nuovi parametri per prefori WaterJet
 
+   ' -- INIZIO -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+   Private Sub EnableRectificationChBx_Click(sender As Object, e As EventArgs) Handles EnableRectificationChBx.Click
+      If EnableRectificationChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "1", m_MainWindow.GetMachIniFile)
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "0", m_MainWindow.GetMachIniFile)
+      End If
+   End Sub
+   ' --   FINE   -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+
    Private Sub TmEnableChBx_Click(sender As Object, e As RoutedEventArgs) Handles TmEnableChBx.Click
       If TmEnableChBx.IsChecked() Then
          WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "1", m_MainWindow.GetMachIniFile())