From f9cbda2217cda6f1d2844c8e8a39a766214d7616 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 7 Dec 2019 17:30:29 +0000
Subject: [PATCH] EgtCAM5 : - aggiunta gestione parametri Oscillazione
 Fresatura in DB lavorazioni e in lavorazioni applicate.

---
 MachiningDbWindow/MachiningDbV.xaml           |  60 ++++----
 MachiningDbWindow/MachiningDbVM.vb            |  16 +--
 MachiningDbWindow/MachiningTreeView.vb        | 118 ++++++++-------
 .../MachiningParameterExpanderV.xaml          |  32 ++---
 .../MachiningParameterExpanderVM.vb           | 134 +++++++++++-------
 Utility/TMDbParamVisibility.vb                |  88 ++++++------
 6 files changed, 250 insertions(+), 198 deletions(-)

diff --git a/MachiningDbWindow/MachiningDbV.xaml b/MachiningDbWindow/MachiningDbV.xaml
index a0292cc..e7ff644 100644
--- a/MachiningDbWindow/MachiningDbV.xaml
+++ b/MachiningDbWindow/MachiningDbV.xaml
@@ -76,10 +76,10 @@
       <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
       <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
       <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-      <sys:Int32 x:Key="OscillEnable">58</sys:Int32>
-      <sys:Int32 x:Key="OscillHeight">59</sys:Int32>
-      <sys:Int32 x:Key="OscillRampL">60</sys:Int32>
-      <sys:Int32 x:Key="OscillHorizL">61</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
 
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
@@ -1529,7 +1529,7 @@
 
                <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillEnable}}">
+                                      ConverterParameter={StaticResource OscEnable}}">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
@@ -1539,17 +1539,17 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
 
-                  <TextBlock Text="{Binding OscillEnableTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                  <TextBlock Text="{Binding OscEnableTxBl}" Style="{StaticResource MachiningsTextBlock}"
                           Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillEnable}}"/>
-                  <CheckBox Name="OscillEnableChBx" Grid.Column="1" Height="20" Width="20" Margin="10,5,0,0"
-                                      IsChecked="{Binding Path=SelectedItem.OscillEnable,
+                                      ConverterParameter={StaticResource OscEnable}}"/>
+                  <CheckBox Name="OscEnableChBx" Grid.Column="1" Height="20" Width="20" Margin="10,5,0,0"
+                                      IsChecked="{Binding Path=SelectedItem.OscEnable,
                                             ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                       Visibility="{Binding Path=SelectedItem.Type,
                                                   ElementName=MachiningsTreeView,
                                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                                  ConverterParameter={StaticResource OscillEnable}}"/>
+                                                  ConverterParameter={StaticResource OscEnable}}"/>
                   <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                   Content="{Binding ElementName=InvertTxBx,
                            Path=(Validation.Errors).CurrentItem,
@@ -1559,7 +1559,7 @@
 
                <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillHeight}}">
+                                      ConverterParameter={StaticResource OscHeight}}">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
@@ -1569,19 +1569,19 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
 
-                  <TextBlock Text="{Binding OscillHeightTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                  <TextBlock Text="{Binding OscHeightTxBl}" Style="{StaticResource MachiningsTextBlock}"
                           Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillHeight}}"/>
-                  <EgtWPFLib5:EgtTextBox Name="OscillHeightTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
-                                      Text="{Binding Path=SelectedItem.OscillHeight,
+                                      ConverterParameter={StaticResource OscHeight}}"/>
+                  <EgtWPFLib5:EgtTextBox Name="OscHeightTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OscHeight,
                                             ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                       Visibility="{Binding Path=SelectedItem.Type,
                                                   ElementName=MachiningsTreeView,
                                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                                  ConverterParameter={StaticResource OscillHeight}}"/>
+                                                  ConverterParameter={StaticResource OscHeight}}"/>
                   <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-                  Content="{Binding ElementName=OscillHeightTxBx,
+                  Content="{Binding ElementName=OscHeightTxBx,
                            Path=(Validation.Errors).CurrentItem,
                            UpdateSourceTrigger=PropertyChanged}"/>-->
 
@@ -1589,7 +1589,7 @@
 
                <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillRampL}}">
+                                      ConverterParameter={StaticResource OscRampLen}}">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
@@ -1599,19 +1599,19 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
 
-                  <TextBlock Text="{Binding OscillRampLTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                  <TextBlock Text="{Binding OscRampLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
                           Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillRampL}}"/>
-                  <EgtWPFLib5:EgtTextBox Name="OscillRampLTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
-                                      Text="{Binding Path=SelectedItem.OscillRampL,
+                                      ConverterParameter={StaticResource OscRampLen}}"/>
+                  <EgtWPFLib5:EgtTextBox Name="OscRampLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OscRampLen,
                                             ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                       Visibility="{Binding Path=SelectedItem.Type,
                                                   ElementName=MachiningsTreeView,
                                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                                  ConverterParameter={StaticResource OscillRampL}}"/>
+                                                  ConverterParameter={StaticResource OscRampLen}}"/>
                   <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-                  Content="{Binding ElementName=OscillRampLTxBx,
+                  Content="{Binding ElementName=OscRampLenTxBx,
                            Path=(Validation.Errors).CurrentItem,
                            UpdateSourceTrigger=PropertyChanged}"/>-->
 
@@ -1619,7 +1619,7 @@
 
                <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillHorizL}}">
+                                      ConverterParameter={StaticResource OscFlatLen}}">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
@@ -1629,17 +1629,17 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
 
-                  <TextBlock Text="{Binding OscillHorizLTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                  <TextBlock Text="{Binding OscFlatLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
                           Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                       Converter={StaticResource MachiningParamVisibilityConverter},
-                                      ConverterParameter={StaticResource OscillHorizL}}"/>
-                  <EgtWPFLib5:EgtTextBox Name="OscillHorizLTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
-                                      Text="{Binding Path=SelectedItem.OscillHorizL,
+                                      ConverterParameter={StaticResource OscFlatLen}}"/>
+                  <EgtWPFLib5:EgtTextBox Name="OscFlatLenLTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OscFlatLen,
                                             ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                       Visibility="{Binding Path=SelectedItem.Type,
                                                   ElementName=MachiningsTreeView,
                                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                                  ConverterParameter={StaticResource OscillHorizL}}"/>
+                                                  ConverterParameter={StaticResource OscFlatLen}}"/>
                   <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                   Content="{Binding ElementName=LiElevTxBx,
                            Path=(Validation.Errors).CurrentItem,
diff --git a/MachiningDbWindow/MachiningDbVM.vb b/MachiningDbWindow/MachiningDbVM.vb
index f31a2a8..c3ee804 100644
--- a/MachiningDbWindow/MachiningDbVM.vb
+++ b/MachiningDbWindow/MachiningDbVM.vb
@@ -381,27 +381,27 @@ Public Class MachiningDbVM
       End Get
    End Property
 
-   Public ReadOnly Property OscillEnableTxBl As String
+   Public ReadOnly Property OscEnableTxBl As String
       Get
-         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+         Return EgtMsg( 6378)             ' Oscillazione
       End Get
    End Property
 
-   Public ReadOnly Property OscillHeightTxBl As String
+   Public ReadOnly Property OscHeightTxBl As String
       Get
-         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+         Return EgtMsg( 6379)             ' Ampiezza di oscillazione
       End Get
    End Property
 
-   Public ReadOnly Property OscillRampLTxBl As String
+   Public ReadOnly Property OscRampLenTxBl As String
       Get
-         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+         Return EgtMsg( 6380)              ' Lunghezza rampa di oscillazione
       End Get
    End Property
 
-   Public ReadOnly Property OscillHorizLTxBl As String
+   Public ReadOnly Property OscFlatLenTxBl As String
       Get
-         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+         Return EgtMsg( 6381)              ' Lunghezza cresta di oscillazione
       End Get
    End Property
 
diff --git a/MachiningDbWindow/MachiningTreeView.vb b/MachiningDbWindow/MachiningTreeView.vb
index acb9e9e..9429eb4 100644
--- a/MachiningDbWindow/MachiningTreeView.vb
+++ b/MachiningDbWindow/MachiningTreeView.vb
@@ -194,23 +194,23 @@ Public Class MachiningTreeViewItem
       End Set
    End Property
 
-   Private m_IsModifiedOscillEnable As Boolean = False
-   Private m_OscillEnable As Boolean
+   Private m_IsModifiedOscEnable As Boolean = False
+   Private m_OscEnable As Boolean
    ''' <summary>
    ''' Property that read and write to the Machining's database the Invert
    ''' </summary>
-   Public Property OscillEnable As Boolean
+   Public Property OscEnable As Boolean
       Get
-         Return m_OscillEnable
+         Return m_OscEnable
       End Get
       Set(value As Boolean)
-         If value <> m_OscillEnable Then
-            m_OscillEnable = value
-            Dim DbOscillEnable As Boolean = False
-            EgtMdbGetCurrMachiningParam(MCH_MP.TOOLINVERT, DbOscillEnable)
-            m_IsModifiedOscillEnable = If(value <> DbOscillEnable, True, False)
+         If value <> m_OscEnable Then
+            m_OscEnable = value
+            Dim DbOscEnable As Boolean = False
+            EgtMdbGetCurrMachiningParam(MCH_MP.OSCENABLE, DbOscEnable)
+            m_IsModifiedOscEnable = If(value <> DbOscEnable, True, False)
             m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
-            NotifyPropertyChanged("OscillEnable")
+            NotifyPropertyChanged("OscEnable")
          End If
       End Set
    End Property
@@ -1567,71 +1567,71 @@ Public Class MachiningTreeViewItem
       End Set
    End Property
 
-   Private m_IsModifiedOscillHeight As Boolean = False
-   Private m_OscillHeight As String
+   Private m_IsModifiedOscHeight As Boolean = False
+   Private m_OscHeight As String
    ''' <summary>
-   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' Property that read and write to the Machining's database the Oscillation Height
    ''' </summary>
-   Public Property OscillHeight As String
+   Public Property OscHeight As String
       Get
-         Return m_OscillHeight
+         Return m_OscHeight
       End Get
       Set(value As String)
-         If value <> m_OscillHeight Then
-            m_OscillHeight = value
-            Dim DbOscillHeight As Double = 0
+         If value <> m_OscHeight Then
+            m_OscHeight = value
+            Dim DbOscHeight As Double = 0
             Dim dValue As Double = 0
-            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, DbOscillHeight)
+            EgtMdbGetCurrMachiningParam(MCH_MP.OSCHEIGHT, DbOscHeight)
             StringToLen(value, dValue)
-            m_IsModifiedVertFeed = Math.Abs(dValue - DbOscillHeight) > 10 * EPS_SMALL
+            m_IsModifiedOscHeight = Math.Abs(dValue - DbOscHeight) > 10 * EPS_SMALL
             m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
-            NotifyPropertyChanged("OscillHeight")
+            NotifyPropertyChanged("OscHeight")
          End If
       End Set
    End Property
 
-   Private m_IsModifiedOscillRampL As Boolean = False
-   Private m_OscillRampL As String
+   Private m_IsModifiedOscRampLen As Boolean = False
+   Private m_OscRampLen As String
    ''' <summary>
-   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' Property that read and write to the Machining's database the Oscillation Ramp Length
    ''' </summary>
-   Public Property OscillRampL As String
+   Public Property OscRampLen As String
       Get
-         Return m_OscillRampL
+         Return m_OscRampLen
       End Get
       Set(value As String)
-         If value <> m_OscillRampL Then
-            m_OscillRampL = value
-            Dim DbOscillRampL As Double = 0
+         If value <> m_OscRampLen Then
+            m_OscRampLen = value
+            Dim DbOscRampLen As Double = 0
             Dim dValue As Double = 0
-            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, DbOscillRampL)
+            EgtMdbGetCurrMachiningParam(MCH_MP.OSCRAMPLEN, DbOscRampLen)
             StringToLen(value, dValue)
-            m_IsModifiedVertFeed = Math.Abs(dValue - DbOscillRampL) > 10 * EPS_SMALL
+            m_IsModifiedOscRampLen = Math.Abs(dValue - DbOscRampLen) > 10 * EPS_SMALL
             m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
-            NotifyPropertyChanged("OscillRampL")
+            NotifyPropertyChanged("OscRampLen")
          End If
       End Set
    End Property
 
-   Private m_IsModifiedOscillHorizL As Boolean = False
-   Private m_OscillHorizL As String
+   Private m_IsModifiedOscFlatLen As Boolean = False
+   Private m_OscFlatLen As String
    ''' <summary>
-   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' Property that read and write to the Machining's database the Oscillation Flat Lenght
    ''' </summary>
-   Public Property OscillHorizL As String
+   Public Property OscFlatLen As String
       Get
-         Return m_OscillHorizL
+         Return m_OscFlatLen
       End Get
       Set(value As String)
-         If value <> m_OscillHorizL Then
-            m_OscillHorizL = value
-            Dim DbOscillHorizL As Double = 0
+         If value <> m_OscFlatLen Then
+            m_OscFlatLen = value
+            Dim DbOscFlatLen As Double = 0
             Dim dValue As Double = 0
-            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, DbOscillHorizL)
+            EgtMdbGetCurrMachiningParam(MCH_MP.OSCFLATLEN, DbOscFlatLen)
             StringToLen(value, dValue)
-            m_IsModifiedVertFeed = Math.Abs(dValue - DbOscillHorizL) > 10 * EPS_SMALL
+            m_IsModifiedOscFlatLen = Math.Abs(dValue - DbOscFlatLen) > 10 * EPS_SMALL
             m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
-            NotifyPropertyChanged("OscillHorizL")
+            NotifyPropertyChanged("OscFlatLen")
          End If
       End Set
    End Property
@@ -1901,6 +1901,7 @@ Public Class MachiningTreeViewItem
       EgtMdbGetCurrMachiningParam(MCH_MP.INVERT, Invert)
       EgtMdbGetCurrMachiningParam(MCH_MP.LEAVETAB, LeaveTab)
       EgtMdbGetCurrMachiningParam(MCH_MP.TOOLINVERT, InvertToolDir)
+      EgtMdbGetCurrMachiningParam(MCH_MP.OSCENABLE, OscEnable)
       EgtMdbGetCurrMachiningParam(MCH_MP.WORKSIDE, nValue)
       SelectedWorkSide = If(IsNothing(WorkSideList), nValue, IdNameStruct.IndFromId(nValue, WorkSideList))
       EgtMdbGetCurrMachiningParam(MCH_MP.HEADSIDE, nValue)
@@ -1991,6 +1992,12 @@ Public Class MachiningTreeViewItem
       SideStep = LenToString(dValue, 4)
       EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, dValue)
       VertFeed = LenToString(dValue, 4)
+      EgtMdbGetCurrMachiningParam(MCH_MP.OSCHEIGHT, dValue)
+      OscHeight = LenToString(dValue, 4)
+      EgtMdbGetCurrMachiningParam(MCH_MP.OSCRAMPLEN, dValue)
+      OscRampLen = LenToString(dValue, 4)
+      EgtMdbGetCurrMachiningParam(MCH_MP.OSCFLATLEN, dValue)
+      OscFlatLen = LenToString(dValue, 4)
       EgtMdbGetCurrMachiningParam(MCH_MP.DEPTH_STR, DepthStr)
       EgtMdbGetCurrMachiningParam(MCH_MP.UUID, m_Uuid)
       EgtMdbGetCurrMachiningParam(MCH_MP.USERNOTES, UserNotes)
@@ -2042,6 +2049,7 @@ Public Class MachiningTreeViewItem
       EgtMdbSetCurrMachiningParam(MCH_MP.INVERT, Invert)
       EgtMdbSetCurrMachiningParam(MCH_MP.LEAVETAB, LeaveTab)
       EgtMdbSetCurrMachiningParam(MCH_MP.TOOLINVERT, InvertToolDir)
+      EgtMdbSetCurrMachiningParam(MCH_MP.OSCENABLE, OscEnable)
       EgtMdbSetCurrMachiningParam(MCH_MP.TYPE, Type)
       nValue = If(IsNothing(WorkSideList), m_SelectedWorkSide, IdNameStruct.IdFromInd(m_SelectedWorkSide, WorkSideList))
       EgtMdbSetCurrMachiningParam(MCH_MP.WORKSIDE, nValue)
@@ -2128,6 +2136,12 @@ Public Class MachiningTreeViewItem
       EgtMdbSetCurrMachiningParam(MCH_MP.SIDESTEP, dValue)
       StringToLen(VertFeed, dValue)
       EgtMdbSetCurrMachiningParam(MCH_MP.VERTFEED, dValue)
+      StringToLen(OscHeight, dValue)
+      EgtMdbSetCurrMachiningParam(MCH_MP.OSCHEIGHT, dValue)
+      StringToLen(OscRampLen, dValue)
+      EgtMdbSetCurrMachiningParam(MCH_MP.OSCRAMPLEN, dValue)
+      StringToLen(OscFlatLen, dValue)
+      EgtMdbSetCurrMachiningParam(MCH_MP.OSCFLATLEN, dValue)
       EgtMdbSetCurrMachiningParam(MCH_MP.DEPTH_STR, DepthStr)
       EgtMdbSetCurrMachiningParam(MCH_MP.USERNOTES, UserNotes)
       EgtMdbSetCurrMachiningParam(MCH_MP.INITANGS, InitAngs)
@@ -2196,7 +2210,7 @@ Public Class MachiningTreeViewItem
          Return m_IsModifiedInvert OrElse
                 m_IsModifiedLeaveTab OrElse
                 m_IsModifiedToolInvert OrElse
-                m_IsModifiedOscillEnable OrElse
+                m_IsModifiedOscEnable OrElse
                 m_IsModifiedSelectedWorkSide OrElse
                 m_IsModifiedSelectedHeadSide OrElse
                 m_IsModifiedSelectedLeadInType OrElse
@@ -2241,10 +2255,10 @@ Public Class MachiningTreeViewItem
                 m_IsModifiedStepIntArc OrElse
                 m_IsModifiedSideStep OrElse
                 m_IsModifiedVertFeed OrElse
-                m_IsModifiedOscillHeight OrElse
-                m_IsModifiedOscillRampL OrElse
-                m_IsModifiedOscillHorizL OrElse
-                m_IsModifiedOscillHeight OrElse
+                m_IsModifiedOscHeight OrElse
+                m_IsModifiedOscRampLen OrElse
+                m_IsModifiedOscFlatLen OrElse
+                m_IsModifiedOscHeight OrElse
                 m_IsModifiedName OrElse
                 m_IsModifiedSelectedTool OrElse
                 m_IsModifiedDepthStr OrElse
@@ -2259,7 +2273,7 @@ Public Class MachiningTreeViewItem
       m_IsModifiedInvert = False
       m_IsModifiedLeaveTab = False
       m_IsModifiedToolInvert = False
-      m_IsModifiedOscillEnable = False
+      m_IsModifiedOscEnable = False
       m_IsModifiedSelectedWorkSide = False
       m_IsModifiedSelectedHeadSide = False
       m_IsModifiedSelectedLeadInType = False
@@ -2304,9 +2318,9 @@ Public Class MachiningTreeViewItem
       m_IsModifiedStepIntArc = False
       m_IsModifiedSideStep = False
       m_IsModifiedVertFeed = False
-      m_IsModifiedOscillHeight = False
-      m_IsModifiedOscillRampL = False
-      m_IsModifiedOscillHorizL = False
+      m_IsModifiedOscHeight = False
+      m_IsModifiedOscRampLen = False
+      m_IsModifiedOscFlatLen = False
       m_IsModifiedName = False
       m_IsModifiedSelectedTool = False
       m_IsModifiedDepthStr = False
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 2491f43..3e523a4 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -67,10 +67,10 @@
       <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
       <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
       <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
-      <sys:Int32 x:Key="OscillEnable">58</sys:Int32>
-      <sys:Int32 x:Key="OscillHeight">59</sys:Int32>
-      <sys:Int32 x:Key="OscillRampL">60</sys:Int32>
-      <sys:Int32 x:Key="OscillHorizL">61</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -454,32 +454,32 @@
          </Expander>
          <Expander Visibility="{Binding Type,
                                         Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource OscillEnable}}"
+                                        ConverterParameter={StaticResource OscEnable}}"
                Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
                <UniformGrid Columns="2">
-                  <TextBlock Text="{Binding OscillEnableMsg}"/>
-                  <CheckBox HorizontalAlignment="Center" IsChecked="{Binding OscillEnable}" />
+                  <TextBlock Text="{Binding OscEnableMsg}"/>
+                  <CheckBox HorizontalAlignment="Center" IsChecked="{Binding OscEnable}" />
                </UniformGrid>
             </Expander.Header>
             <StackPanel>
                <UniformGrid Columns="2" Visibility="{Binding Type,
                                                              Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource OscillHeight}}">
-                  <TextBlock Text="{Binding OscillHeightMsg}"/>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding OscillHeight, UpdateSourceTrigger=PropertyChanged}"/>
+                                                             ConverterParameter={StaticResource OscHeight}}">
+                  <TextBlock Text="{Binding OscHeightMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OscHeight, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
                <UniformGrid Columns="2" Visibility="{Binding Type,
                                                              Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource OscillRampL}}">
-                  <TextBlock Text="{Binding OscillRampLMsg}"/>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding OscillRampL, UpdateSourceTrigger=PropertyChanged}"/>
+                                                             ConverterParameter={StaticResource OscRampLen}}">
+                  <TextBlock Text="{Binding OscRampLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OscRampLen, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
                <UniformGrid Columns="2" Visibility="{Binding Type,
                                                              Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource OscillHorizL}}">
-                  <TextBlock Text="{Binding OscillHorizLMsg}"/>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding OscillHorizL, UpdateSourceTrigger=PropertyChanged}"/>
+                                                             ConverterParameter={StaticResource OscFlatLen}}">
+                  <TextBlock Text="{Binding OscFlatLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OscFlatLen, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
             </StackPanel>
          </Expander>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index b1fd16e..27442e5 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -74,21 +74,21 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
 
-   Private m_IsModifiedOscillEnable As Boolean = False
-   Private m_OscillEnable As Boolean
+   Private m_IsModifiedOscEnable As Boolean = False
+   Private m_OscEnable As Boolean
    ''' <summary>
-   ''' Property that read and write to the Machining's database the Invert
+   ''' Property that read and write to the Machining's database the Oscillation Enable
    ''' </summary>
-   Public Property OscillEnable As Boolean
+   Public Property OscEnable As Boolean
       Get
-         Return m_OscillEnable
+         Return m_OscEnable
       End Get
       Set(value As Boolean)
-         If value <> m_OscillEnable Then
-            m_OscillEnable = value
-            Dim OrigOscillEnable As Boolean = False
-            EgtGetMachiningParam(MCH_MP.TOOLINVERT, OrigOscillEnable)
-            m_IsModifiedOscillEnable = If(value <> OrigOscillEnable, True, False)
+         If value <> m_OscEnable Then
+            m_OscEnable = value
+            Dim OrigOscEnable As Boolean = False
+            EgtGetMachiningParam(MCH_MP.OSCENABLE, OrigOscEnable)
+            m_IsModifiedOscEnable = If(value <> OrigOscEnable, True, False)
             NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
          End If
       End Set
@@ -1391,67 +1391,67 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
 
-   Private m_IsModifiedOscillHeight As Boolean = False
-   Private m_OscillHeight As String
+   Private m_IsModifiedOscHeight As Boolean = False
+   Private m_OscHeight As String
    ''' <summary>
-   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' Property that read and write to the Machining's database the Oscillation Height
    ''' </summary>
-   Public Property OscillHeight As String
+   Public Property OscHeight As String
       Get
-         Return m_OscillHeight
+         Return m_OscHeight
       End Get
       Set(value As String)
-         If value <> m_OscillHeight Then
-            m_OscillHeight = value
-            Dim OrigOscillHeight As Double = 0
+         If value <> m_OscHeight Then
+            m_OscHeight = value
+            Dim OrigOscHeight As Double = 0
             Dim dValue As Double = 0
-            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, OrigOscillHeight)
+            EgtMdbGetCurrMachiningParam(MCH_MP.OSCHEIGHT, OrigOscHeight)
             StringToLen(value, dValue)
-            m_IsModifiedVertFeed = Math.Abs(dValue - OrigOscillHeight) > 10 * EPS_SMALL
+            m_IsModifiedOscHeight = Math.Abs(dValue - OrigOscHeight) > 10 * EPS_SMALL
             NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
          End If
       End Set
    End Property
 
-   Private m_IsModifiedOscillRampL As Boolean = False
-   Private m_OscillRampL As String
+   Private m_IsModifiedOscRampLen As Boolean = False
+   Private m_OscRampLen As String
    ''' <summary>
-   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' Property that read and write to the Machining's database the Oscillation Ramp Length
    ''' </summary>
-   Public Property OscillRampL As String
+   Public Property OscRampLen As String
       Get
-         Return m_OscillRampL
+         Return m_OscRampLen
       End Get
       Set(value As String)
-         If value <> m_OscillRampL Then
-            m_OscillRampL = value
-            Dim OrigOscillRampL As Double = 0
+         If value <> m_OscRampLen Then
+            m_OscRampLen = value
+            Dim OrigOscRampLen As Double = 0
             Dim dValue As Double = 0
-            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, OrigOscillRampL)
+            EgtMdbGetCurrMachiningParam(MCH_MP.OSCRAMPLEN, OrigOscRampLen)
             StringToLen(value, dValue)
-            m_IsModifiedVertFeed = Math.Abs(dValue - OrigOscillRampL) > 10 * EPS_SMALL
+            m_IsModifiedOscRampLen = Math.Abs(dValue - OrigOscRampLen) > 10 * EPS_SMALL
             NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
          End If
       End Set
    End Property
 
-   Private m_IsModifiedOscillHorizL As Boolean = False
-   Private m_OscillHorizL As String
+   Private m_IsModifiedOscFlatLen As Boolean = False
+   Private m_OscFlatLen As String
    ''' <summary>
-   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' Property that read and write to the Machining's database the Oscillation Flat Length
    ''' </summary>
-   Public Property OscillHorizL As String
+   Public Property OscFlatLen As String
       Get
-         Return m_OscillHorizL
+         Return m_OscFlatLen
       End Get
       Set(value As String)
-         If value <> m_OscillHorizL Then
-            m_OscillHorizL = value
-            Dim OrigOscillHorizL As Double = 0
+         If value <> m_OscFlatLen Then
+            m_OscFlatLen = value
+            Dim OrigOscFlatLen As Double = 0
             Dim dValue As Double = 0
-            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, OrigOscillHorizL)
+            EgtMdbGetCurrMachiningParam(MCH_MP.OSCFLATLEN, OrigOscFlatLen)
             StringToLen(value, dValue)
-            m_IsModifiedVertFeed = Math.Abs(dValue - OrigOscillHorizL) > 10 * EPS_SMALL
+            m_IsModifiedOscFlatLen = Math.Abs(dValue - OrigOscFlatLen) > 10 * EPS_SMALL
             NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
          End If
       End Set
@@ -1934,27 +1934,27 @@ Public Class MachiningParameterExpanderVM
       End Get
    End Property
 
-   Public ReadOnly Property OscillEnableMsg As String
+   Public ReadOnly Property OscEnableMsg As String
       Get
-         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+         Return EgtMsg( 6378)            ' Oscillazione
       End Get
    End Property
 
-   Public ReadOnly Property OscillHeightMsg As String
+   Public ReadOnly Property OscHeightMsg As String
       Get
-         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+         Return EgtMsg( 6379)            ' Ampiezza di oscillazione
       End Get
    End Property
 
-   Public ReadOnly Property OscillRampLMsg As String
+   Public ReadOnly Property OscRampLenMsg As String
       Get
-         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+         Return EgtMsg( 6380)             ' Lunghezza rampa di oscillazione
       End Get
    End Property
 
-   Public ReadOnly Property OscillHorizLMsg As String
+   Public ReadOnly Property OscFlatLenMsg As String
       Get
-         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+         Return EgtMsg( 6381)             ' Lunghezza cresta di oscillazione
       End Get
    End Property
 
@@ -1976,6 +1976,9 @@ Public Class MachiningParameterExpanderVM
       EgtGetMachiningParam(MCH_MP.TOOLINVERT, m_ToolInvert)
       NotifyPropertyChanged("ToolInvert")
       m_IsModifiedToolInvert = False
+      EgtGetMachiningParam(MCH_MP.OSCENABLE, m_OscEnable)
+      NotifyPropertyChanged("OscEnable")
+      m_IsModifiedOscEnable = False
       NotifyPropertyChanged("WorkSideList")
       EgtGetMachiningParam(MCH_MP.WORKSIDE, nValue)
       m_SelectedWorkSide = If(IsNothing(WorkSideList), nValue, IdNameStruct.IndFromId(nValue, WorkSideList))
@@ -2164,6 +2167,18 @@ Public Class MachiningParameterExpanderVM
       m_VertFeed = LenToString(dValue, 4)
       NotifyPropertyChanged("VertFeed")
       m_IsModifiedVertFeed = False
+      EgtGetMachiningParam(MCH_MP.OSCHEIGHT, dValue)
+      m_OscHeight = LenToString(dValue, 4)
+      NotifyPropertyChanged("OscHeight")
+      m_IsModifiedOscHeight = False
+      EgtGetMachiningParam(MCH_MP.OSCRAMPLEN, dValue)
+      m_OscRampLen = LenToString(dValue, 4)
+      NotifyPropertyChanged("OscRampLen")
+      m_IsModifiedOscRampLen = False
+      EgtGetMachiningParam(MCH_MP.OSCFLATLEN, dValue)
+      m_OscFlatLen = LenToString(dValue, 4)
+      NotifyPropertyChanged("OscFlatLen")
+      m_IsModifiedOscFlatLen = False
       EgtGetMachiningParam(MCH_MP.TOOL, m_Tool)
       NotifyPropertyChanged("ToolExpanderHeader")
       EgtGetMachiningParam(MCH_MP.DEPTH_STR, m_DepthStr)
@@ -2199,6 +2214,11 @@ Public Class MachiningParameterExpanderVM
             m_IsModifiedToolInvert = False
          End If
       End If
+      If m_IsModifiedOscEnable Then
+         If EgtSetMachiningParam(MCH_MP.OSCENABLE, m_OscEnable) Then
+            m_IsModifiedOscEnable = False
+         End If
+      End If
       If m_IsModifiedSelectedWorkSide Then
          nValue = If(IsNothing(WorkSideList), m_SelectedWorkSide, IdNameStruct.IdFromInd(m_SelectedWorkSide, WorkSideList))
          If EgtSetMachiningParam(MCH_MP.WORKSIDE, nValue) Then
@@ -2464,6 +2484,24 @@ Public Class MachiningParameterExpanderVM
             m_IsModifiedVertFeed = False
          End If
       End If
+      If m_IsModifiedOscHeight Then
+         StringToLen(m_OscHeight, dValue)
+         If EgtSetMachiningParam(MCH_MP.OSCHEIGHT, dValue) Then
+            m_IsModifiedOscHeight = False
+         End If
+      End If
+      If m_IsModifiedOscRampLen Then
+         StringToLen(m_OscRampLen, dValue)
+         If EgtSetMachiningParam(MCH_MP.OSCRAMPLEN, dValue) Then
+            m_IsModifiedOscRampLen = False
+         End If
+      End If
+      If m_IsModifiedOscFlatLen Then
+         StringToLen(m_OscFlatLen, dValue)
+         If EgtSetMachiningParam(MCH_MP.OSCFLATLEN, dValue) Then
+            m_IsModifiedOscFlatLen = False
+         End If
+      End If
       If m_IsModifiedDepthStr Then
          If EgtSetMachiningParam(MCH_MP.DEPTH_STR, m_DepthStr) Then
             m_IsModifiedDepthStr = False
diff --git a/Utility/TMDbParamVisibility.vb b/Utility/TMDbParamVisibility.vb
index 5781bb1..c07d88f 100644
--- a/Utility/TMDbParamVisibility.vb
+++ b/Utility/TMDbParamVisibility.vb
@@ -371,10 +371,10 @@
       Milling(55) = Visibility.Visible                              ' Expander LeadIn
       Milling(56) = Visibility.Visible                              ' Expander LeadOut
       Milling(57) = Visibility.Collapsed                            ' ApproxGen
-      Milling(58) = Visibility.Visible                              ' OscillEnable
-      Milling(59) = Visibility.Visible                              ' OscillHeight
-      Milling(60) = Visibility.Visible                              ' OscillRampL
-      Milling(61) = Visibility.Visible                              ' OscillHorizL
+      Milling(58) = Visibility.Visible                              ' OscEnable
+      Milling(59) = Visibility.Visible                              ' OscHeight
+      Milling(60) = Visibility.Visible                              ' OscRampLen
+      Milling(61) = Visibility.Visible                              ' OscFlatLen
 
       ' Parametri Drilling
       Drilling(0) = Visibility.Visible                              ' Invert
@@ -435,10 +435,10 @@
       Drilling(55) = Visibility.Collapsed                           ' Expander LeadIn
       Drilling(56) = Visibility.Collapsed                           ' Expander LeadOut
       Drilling(57) = Visibility.Collapsed                           ' ApproxGen
-      Drilling(58) = Visibility.Collapsed                           ' OscillEnable
-      Drilling(59) = Visibility.Collapsed                           ' OscillHeight
-      Drilling(60) = Visibility.Collapsed                           ' OscillRampL
-      Drilling(61) = Visibility.Collapsed                           ' OscillHorizL
+      Drilling(58) = Visibility.Collapsed                           ' OscEnable
+      Drilling(59) = Visibility.Collapsed                           ' OscHeight
+      Drilling(60) = Visibility.Collapsed                           ' OscRampLen
+      Drilling(61) = Visibility.Collapsed                           ' OscFlatLen
 
       ' Parametri Sawing
       Sawing(0) = Visibility.Visible                                ' Invert
@@ -499,10 +499,10 @@
       Sawing(55) = Visibility.Visible                               ' Expander LeadIn
       Sawing(56) = Visibility.Visible                               ' Expander LeadOut
       Sawing(57) = Visibility.Collapsed                             ' ApproxGen
-      Sawing(58) = Visibility.Collapsed                             ' OscillEnable
-      Sawing(59) = Visibility.Collapsed                             ' OscillHeight
-      Sawing(60) = Visibility.Collapsed                             ' OscillRampL
-      Sawing(61) = Visibility.Collapsed                             ' OscillHorizL
+      Sawing(58) = Visibility.Collapsed                             ' OscEnable
+      Sawing(59) = Visibility.Collapsed                             ' OscHeight
+      Sawing(60) = Visibility.Collapsed                             ' OscRampLen
+      Sawing(61) = Visibility.Collapsed                             ' OscFlatLen
 
       ' Parametri Pocketing
       Pocketing(0) = Visibility.Visible                             ' Invert
@@ -563,10 +563,10 @@
       Pocketing(55) = Visibility.Visible                            ' Expander LeadIn
       Pocketing(56) = Visibility.Visible                            ' Expander LeadOut
       Pocketing(57) = Visibility.Collapsed                          ' ApproxGen
-      Pocketing(58) = Visibility.Collapsed                          ' OscillEnable
-      Pocketing(59) = Visibility.Collapsed                          ' OscillHeight
-      Pocketing(60) = Visibility.Collapsed                          ' OscillRampL
-      Pocketing(61) = Visibility.Collapsed                          ' OscillHorizL
+      Pocketing(58) = Visibility.Collapsed                          ' OscEnable
+      Pocketing(59) = Visibility.Collapsed                          ' OscHeight
+      Pocketing(60) = Visibility.Collapsed                          ' OscRampLen
+      Pocketing(61) = Visibility.Collapsed                          ' OscFlatLen
 
       ' Parametri Mortising
       Mortising(0) = Visibility.Visible                             ' Invert
@@ -627,10 +627,10 @@
       Mortising(55) = Visibility.Visible                            ' Expander LeadIn
       Mortising(56) = Visibility.Visible                            ' Expander LeadOut
       Mortising(57) = Visibility.Collapsed                          ' ApproxGen
-      Mortising(58) = Visibility.Collapsed                          ' OscillEnable
-      Mortising(59) = Visibility.Collapsed                          ' OscillHeight
-      Mortising(60) = Visibility.Collapsed                          ' OscillRampL
-      Mortising(61) = Visibility.Collapsed                          ' OscillHorizL
+      Mortising(58) = Visibility.Collapsed                          ' OscEnable
+      Mortising(59) = Visibility.Collapsed                          ' OscHeight
+      Mortising(60) = Visibility.Collapsed                          ' OscRampLen
+      Mortising(61) = Visibility.Collapsed                          ' OscFlatLen
 
       ' Parametri Sawroughing
       Sawroughing(0) = Visibility.Visible                           ' Invert
@@ -691,10 +691,10 @@
       Sawroughing(55) = Visibility.Visible                          ' Expander LeadIn
       Sawroughing(56) = Visibility.Visible                          ' Expander LeadOut
       Sawroughing(57) = Visibility.Collapsed                        ' ApproxGen
-      Sawroughing(58) = Visibility.Collapsed                        ' OscillEnable
-      Sawroughing(59) = Visibility.Collapsed                        ' OscillHeight
-      Sawroughing(60) = Visibility.Collapsed                        ' OscillRampL
-      Sawroughing(61) = Visibility.Collapsed                        ' OscillHorizL
+      Sawroughing(58) = Visibility.Collapsed                        ' OscEnable
+      Sawroughing(59) = Visibility.Collapsed                        ' OscHeight
+      Sawroughing(60) = Visibility.Collapsed                        ' OscRampLen
+      Sawroughing(61) = Visibility.Collapsed                        ' OscFlatLen
 
       ' Parametri Sawfinishing
       Sawfinishing(0) = Visibility.Visible                          ' Invert
@@ -755,10 +755,10 @@
       Sawfinishing(55) = Visibility.Visible                         ' Expander LeadIn
       Sawfinishing(56) = Visibility.Visible                         ' Expander LeadOut
       Sawfinishing(57) = Visibility.Collapsed                       ' ApproxGen
-      Sawfinishing(58) = Visibility.Collapsed                       ' OscillEnable
-      Sawfinishing(59) = Visibility.Collapsed                       ' OscillHeight
-      Sawfinishing(60) = Visibility.Collapsed                       ' OscillRampL
-      Sawfinishing(61) = Visibility.Collapsed                       ' OscillHorizL
+      Sawfinishing(58) = Visibility.Collapsed                       ' OscEnable
+      Sawfinishing(59) = Visibility.Collapsed                       ' OscHeight
+      Sawfinishing(60) = Visibility.Collapsed                       ' OscRampLen
+      Sawfinishing(61) = Visibility.Collapsed                       ' OscFlatLen
 
       ' Parametri GenMachining
       GenMachining(0) = Visibility.Visible                          ' Invert
@@ -819,10 +819,10 @@
       GenMachining(55) = Visibility.Collapsed                       ' Expander LeadIn
       GenMachining(56) = Visibility.Collapsed                       ' Expander LeadOut
       GenMachining(57) = Visibility.Collapsed                       ' ApproxGen
-      GenMachining(58) = Visibility.Collapsed                       ' OscillEnable
-      GenMachining(59) = Visibility.Collapsed                       ' OscillHeight
-      GenMachining(60) = Visibility.Collapsed                       ' OscillRampL
-      GenMachining(61) = Visibility.Collapsed                       ' OscillHorizL
+      GenMachining(58) = Visibility.Collapsed                       ' OscEnable
+      GenMachining(59) = Visibility.Collapsed                       ' OscHeight
+      GenMachining(60) = Visibility.Collapsed                       ' OscRampLen
+      GenMachining(61) = Visibility.Collapsed                       ' OscFlatLen
 
       ' Parametri Chiseling
       Chiseling(0) = Visibility.Visible                          ' Invert
@@ -883,10 +883,10 @@
       Chiseling(55) = Visibility.Collapsed                       ' Expander LeadIn
       Chiseling(56) = Visibility.Visible                         ' Expander LeadOut
       Chiseling(57) = Visibility.Collapsed                       ' ApproxGen
-      Chiseling(58) = Visibility.Collapsed                       ' OscillEnable
-      Chiseling(59) = Visibility.Collapsed                       ' OscillHeight
-      Chiseling(60) = Visibility.Collapsed                       ' OscillRampL
-      Chiseling(61) = Visibility.Collapsed                       ' OscillHorizL
+      Chiseling(58) = Visibility.Collapsed                       ' OscEnable
+      Chiseling(59) = Visibility.Collapsed                       ' OscHeight
+      Chiseling(60) = Visibility.Collapsed                       ' OscRampLen
+      Chiseling(61) = Visibility.Collapsed                       ' OscFlatLen
 
       ' Parametri SurfFinishing
       SurfFinishing(0) = Visibility.Visible                      ' Invert
@@ -947,10 +947,10 @@
       SurfFinishing(55) = Visibility.Visible                     ' Expander LeadIn
       SurfFinishing(56) = Visibility.Visible                     ' Expander LeadOut
       SurfFinishing(57) = Visibility.Visible                     ' ApproxGen
-      SurfFinishing(58) = Visibility.Collapsed                   ' OscillEnable
-      SurfFinishing(59) = Visibility.Collapsed                   ' OscillHeight
-      SurfFinishing(60) = Visibility.Collapsed                   ' OscillRampL
-      SurfFinishing(61) = Visibility.Collapsed                   ' OscillHorizL
+      SurfFinishing(58) = Visibility.Collapsed                   ' OscEnable
+      SurfFinishing(59) = Visibility.Collapsed                   ' OscHeight
+      SurfFinishing(60) = Visibility.Collapsed                   ' OscRampLen
+      SurfFinishing(61) = Visibility.Collapsed                   ' OscFlatLen
 
       ' Parametri WaterJetting
       WaterJetting(0) = Visibility.Visible                       ' Invert
@@ -1011,10 +1011,10 @@
       WaterJetting(55) = Visibility.Visible                      ' Expander LeadIn
       WaterJetting(56) = Visibility.Visible                      ' Expander LeadOut
       WaterJetting(57) = Visibility.Collapsed                    ' ApproxGen
-      WaterJetting(58) = Visibility.Collapsed                    ' OscillEnable
-      WaterJetting(59) = Visibility.Collapsed                    ' OscillHeight
-      WaterJetting(60) = Visibility.Collapsed                    ' OscillRampL
-      WaterJetting(61) = Visibility.Collapsed                    ' OscillHorizL
+      WaterJetting(58) = Visibility.Collapsed                    ' OscEnable
+      WaterJetting(59) = Visibility.Collapsed                    ' OscHeight
+      WaterJetting(60) = Visibility.Collapsed                    ' OscRampLen
+      WaterJetting(61) = Visibility.Collapsed                    ' OscFlatLen
 
       ' Parametri OperationDisposition
       OperationDisposition(0) = Visibility.Collapsed