From dffec5fc1de9ab325580cf35d2d26d538053851f Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Tue, 12 Jul 2016 12:48:33 +0000
Subject: [PATCH] EgtCAM5 : - Migliorie varie.

---
 Application.xaml.vb                       |    5 +
 Constants/ConstIni.vb                     |    6 +
 EgtCAM5.vbproj                            |    1 +
 EgtCAM5Resources.xaml                     |    7 +
 MachiningsDbPage/MachiningsDbView.xaml    | 2843 +++++++++++----------
 MachiningsDbPage/MachiningsDbViewModel.vb |   68 +-
 MainWindow/MainWindowViewModel.vb         |   44 +-
 ProjectPage/ProjectViewModel.vb           |   13 +-
 SharedFieldsClass.vb                      | 1159 +++++----
 Special/Doors.vb                          |   68 +
 StatusBar/StatusBarView.xaml              |    5 +-
 StatusBar/StatusBarViewModel.vb           |   91 +-
 ToolsDbPage/ToolTreeView.vb               |    4 +-
 ToolsDbPage/ToolsDbView.xaml              | 1051 ++++----
 ToolsDbPage/ToolsDbViewModel.vb           |   69 +-
 TopCommandBar/TopCommandBarView.xaml      |    2 +
 TopCommandBar/TopCommandBarViewModel.vb   |   31 +
 17 files changed, 2797 insertions(+), 2670 deletions(-)
 create mode 100644 Special/Doors.vb

diff --git a/Application.xaml.vb b/Application.xaml.vb
index 1c6bdc7..b3564f8 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -150,6 +150,10 @@ Class Application
    Friend Const STATUSSTOPCOMMAND As String = "StatusStopCommand"
    Friend Const STATUSSNAPPOINTTYPETEXT As String = "StatusSnapPointTypeText"
    Friend Const STATUSSNAPPOINTTYPEBACKGROUND As String = "StatusSnapPointTypeBackground"
+   Friend Const LOADSELECTEDMACHINE As String = "LoadSelectedMachine"
+   Friend Const LOADCURRENTMACHINE As String = "LoadCurrentMachine"
+   Friend Const SAVECURRENTMACHINE As String = "SaveCurrentMachine"
+
 
    ' ToolsDbPage messages
    Friend Const REMOVETOOL As String = "RemoveTool"
@@ -169,6 +173,7 @@ Class Application
    Friend Const IMPORTPROJECT As String = "ImportProject"
    Friend Const EXPORTPROJECT As String = "ExportProject"
    Friend Const EXECPROJECT As String = "ExecProject"
+   Friend Const DOORSPROJECT As String = "DoorsProject"
 
    Shared ReadOnly _messenger As New Messenger()
 
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 985719e..2df0de2 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -82,6 +82,12 @@ Module ConstIni
    Public Const K_FLPWINPLACE As String = "WinPlace"
    Public Const K_FLPCURRDIR As String = "CurrDir"
 
+   Public Const S_DOORS As String = "Doors"
+   Public Const K_DDFEXEC As String = "DdfExec"
+   Public Const K_DDFFUNCTION As String = "DdfFun"
+   Public Const K_DDFDIR As String = "DdfDir"
+   Public Const K_DDFDEFAULTDIR As String = "DdfDefaultDir"
+
    Public Const S_MACH As String = "Mach"
    Public Const K_MACHINESDIR As String = "MachinesDir"
    Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index f1519a7..92bcb94 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -179,6 +179,7 @@
       <DependentUpon>ProjectView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProjectPage\ProjectViewModel.vb" />
+    <Compile Include="Special\Doors.vb" />
     <Compile Include="StatusBar\StatusBarView.xaml.vb">
       <DependentUpon>StatusBarView.xaml</DependentUpon>
     </Compile>
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index fe51379..4d134ef 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -74,27 +74,34 @@
    </Style>
 
    <Style x:Key="MachiningsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Margin" Value="10,5,0,0"/>
    </Style>
 
    <Style x:Key="MachiningsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Margin" Value="0,0,0,10"/>
    </Style>
 
    <Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Margin" Value="0,0,0,10"/>
    </Style>
 
    <Style x:Key="MachiningsToolTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Margin" Value="10,5,0,0"/>
    </Style>
 
    <Style x:Key="MachiningsToolTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Margin" Value="0,0,0,10"/>
    </Style>
 
    <Style x:Key="MachiningsToolComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
    </Style>
 
    <Style x:Key="ToolsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Margin" Value="10,0,0,0"/>
    </Style>
 
    <Style x:Key="ToolsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Margin" Value="0,0,5,0"/>
    </Style>
 
    <Style x:Key="GridViewPanelRadioButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
diff --git a/MachiningsDbPage/MachiningsDbView.xaml b/MachiningsDbPage/MachiningsDbView.xaml
index 90f7c96..0f30997 100644
--- a/MachiningsDbPage/MachiningsDbView.xaml
+++ b/MachiningsDbPage/MachiningsDbView.xaml
@@ -13,55 +13,54 @@
       <local:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
       <sys:Int32 x:Key="Invert">0</sys:Int32>
       <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-      <sys:Int32 x:Key="Type">2</sys:Int32>
-      <sys:Int32 x:Key="WorkSide">3</sys:Int32>
-      <sys:Int32 x:Key="HeadSide">4</sys:Int32>
-      <sys:Int32 x:Key="LeadInType">5</sys:Int32>
-      <sys:Int32 x:Key="ExtLinkType">6</sys:Int32>
-      <sys:Int32 x:Key="LeadOutType">7</sys:Int32>
-      <sys:Int32 x:Key="CurveUse">8</sys:Int32>
-      <sys:Int32 x:Key="StepType">9</sys:Int32>
-      <sys:Int32 x:Key="LeadLinkType">10</sys:Int32>
-      <sys:Int32 x:Key="Speed">11</sys:Int32>
-      <sys:Int32 x:Key="Feed">12</sys:Int32>
-      <sys:Int32 x:Key="StartFeed">13</sys:Int32>
-      <sys:Int32 x:Key="EndFeed">14</sys:Int32>
-      <sys:Int32 x:Key="TipFeed">15</sys:Int32>
-      <sys:Int32 x:Key="OffSr">16</sys:Int32>
-      <sys:Int32 x:Key="OffSl">17</sys:Int32>
-      <sys:Int32 x:Key="SideAngle">18</sys:Int32>
-      <sys:Int32 x:Key="Approx">19</sys:Int32>
-      <sys:Int32 x:Key="StartPos">20</sys:Int32>
-      <sys:Int32 x:Key="StartSlowLen">21</sys:Int32>
-      <sys:Int32 x:Key="EndSlowLen">22</sys:Int32>
-      <sys:Int32 x:Key="ThrouAddLen">23</sys:Int32>
-      <sys:Int32 x:Key="StepPar">24</sys:Int32>
-      <sys:Int32 x:Key="ReturnPos">25</sys:Int32>
-      <sys:Int32 x:Key="TabLen">26</sys:Int32>
-      <sys:Int32 x:Key="TabDist">27</sys:Int32>
-      <sys:Int32 x:Key="TabHeight">28</sys:Int32>
-      <sys:Int32 x:Key="TabAngle">29</sys:Int32>
-      <sys:Int32 x:Key="LiTang">30</sys:Int32>
-      <sys:Int32 x:Key="LiPerp">31</sys:Int32>
-      <sys:Int32 x:Key="LiElev">32</sys:Int32>
-      <sys:Int32 x:Key="LiCompLen">33</sys:Int32>
-      <sys:Int32 x:Key="LoTang">34</sys:Int32>
-      <sys:Int32 x:Key="LoPerp">35</sys:Int32>
-      <sys:Int32 x:Key="LoElev">36</sys:Int32>
-      <sys:Int32 x:Key="LoCompLen">37</sys:Int32>
-      <sys:Int32 x:Key="StartAddLen">38</sys:Int32>
-      <sys:Int32 x:Key="EndAddLen">39</sys:Int32>
-      <sys:Int32 x:Key="StepExtArc">40</sys:Int32>
-      <sys:Int32 x:Key="StepIntArc">41</sys:Int32>
-      <sys:Int32 x:Key="SideStep">42</sys:Int32>
-      <sys:Int32 x:Key="VertFeed">43</sys:Int32>
-      <sys:Int32 x:Key="NamePar">44</sys:Int32>
-      <sys:Int32 x:Key="Tool">45</sys:Int32>
-      <sys:Int32 x:Key="DepthStr">46</sys:Int32>
-      <sys:Int32 x:Key="UserNotes">47</sys:Int32>
-      <sys:Int32 x:Key="OverLapStr">48</sys:Int32>
-      <sys:Int32 x:Key="OffsetStr">49</sys:Int32>
-      <sys:Int32 x:Key="SubType">50</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
 
    </UserControl.Resources>
 
@@ -74,18 +73,11 @@
 
       <Grid>
          <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="11*"/>
          </Grid.RowDefinitions>
 
-
-         <!--Combobox per selezionare la macchina corrente-->
-         <ComboBox ItemsSource="{Binding Path=MachinesList}" DisplayMemberPath="Name"
-            SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-            Height="30"/>
-
-         <UniformGrid Grid.Row="1" Columns="3">
+         <UniformGrid Grid.Row="0" Columns="3">
             <Button Content="New" Command="{Binding NewCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"/>
             <Button Content="Save" Command="{Binding SaveCommand}"
@@ -94,7 +86,7 @@
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"/>
          </UniformGrid>
 
-         <TreeView Name="MachiningsTreeView" Grid.Row="2"
+         <TreeView Name="MachiningsTreeView" Grid.Row="1"
             ItemsSource="{Binding Path=MachiningsList}">
             <TreeView.Resources>
                <!--Modifico HierarchicalDataTemplate del CathegoryItem per poter inserire immagine e testo e per -->
@@ -151,37 +143,18 @@
 
       </Grid>
 
-      <Grid Grid.Column="1" Grid.RowSpan="2">
+      <Grid Grid.Column="1">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="11*"/>
+            <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
 
-	 <Grid.Resources>
-         <!--Stile che modifica l'aspetto del messaggio d'errore-->
+         <Grid.Resources>
+            <!--Stile che modifica l'aspetto del messaggio d'errore-->
             <DataTemplate DataType="{x:Type ValidationError}">
                <TextBlock 
                   FontStyle="Italic"
@@ -193,7 +166,18 @@
             </DataTemplate>
          </Grid.Resources>
 
-         <Grid Grid.Column="0" Grid.Row="0">
+         <Grid Grid.Row="0" Margin="0,5,0,0">
+            <Grid Grid.Column="2">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+         <Grid  Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource NamePar}}">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -203,1184 +187,1295 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding InvertTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Invert}}"/>
-            <CheckBox Name="InvertTxBx" Grid.Column="1"
-                                   IsChecked="{Binding Path=SelectedItem.Invert,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Invert}}"/>
+            <TextBlock Text="{Binding NameParTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource NamePar}}"/>
+            <EgtWPFLib5:EgtTextBox Name="NameParTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.NamePar,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource NamePar}}"/>
             <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=InvertTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
+                  Content="{Binding ElementName=NameParTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+               </Grid>
+            </Grid>
          </Grid>
+               <StackPanel Grid.Column="0" Grid.Row="1">
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StartPos}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding StartPosTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StartPos}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="StartPosTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.StartPos,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource StartPos}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=StartPosTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ReturnPos}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ReturnPosTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ReturnPos}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="ReturnPosTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.StepPar,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource ReturnPos}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=ReturnPosTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2" Rows="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource DepthStr}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding DepthStrTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource DepthStr}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="DepthStrTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.DepthStr,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource DepthStr}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=DepthStrTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OverLapStr}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding OverLapStrTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OverLapStr}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="OverLapStrTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OverLapStr,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource OverLapStr}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=OverLapStrTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ThrouAddLen}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ThrouAddLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ThrouAddLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="ThrouAddLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.ThrouAddLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource ThrouAddLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=ThrouAddLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepType}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding StepTypeTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepType}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.StepTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedStepType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource StepType}}"/>
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepPar}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding StepParTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepPar}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="StepParTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.StepPar,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource StepPar}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=StepParTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StartSlowLen}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding StartSlowLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StartSlowLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="StartSlowLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.StartSlowLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource StartSlowLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=StartSlowLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource EndSlowLen}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding EndSlowLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource EndSlowLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="EndSlowLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.EndSlowLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource EndSlowLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=EndSlowLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Invert}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding InvertTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Invert}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="InvertTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.Invert,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Invert}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=InvertTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource WorkSide}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding WorkSideTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource WorkSide}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.WorkSideList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                         Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedWorkSide,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource WorkSide}}"/>
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource HeadSide}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding HeadSideTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource HeadSide}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.HeadSideList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedHeadSide,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource HeadSide}}"/>
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ExtLinkType}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ExtLinkTypeTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ExtLinkType}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.ExtLinkTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedExtLinkType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource ExtLinkType}}"/>
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2" Rows="3">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeadInType}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LeadInTypeTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeadInType}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.LeadInTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedLeadInType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LeadInType}}"/>
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StartAddLen}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding StartAddLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StartAddLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="StartAddLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.StartAddLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource StartAddLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=StartAddLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiTang}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LiTangTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiTang}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LiTangTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LiTang,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LiTang}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LiTangTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiPerp}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LiPerpTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiPerp}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LiPerpTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LiPerp,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LiPerp}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LiPerpTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiElev}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LiElevTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiElev}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LiElevTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LiElev,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LiElev}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LiElevTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiCompLen}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LiCompLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiCompLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LiCompLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LiCompLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LiCompLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LiCompLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2" Rows="3">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeadOutType}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LeadOutTypeTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeadOutType}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.LeadOutTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedLeadOutType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LeadOutType}}"/>
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource EndAddLen}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding EndAddLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource EndAddLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="EndAddLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.EndAddLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource EndAddLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=EndAddLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoTang}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LoTangTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoTang}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LoTangTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LoTang,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LoTang}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LoTangTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoPerp}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LoPerpTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoPerp}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LoPerpTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LoPerp,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LoPerp}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LoPerpTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoElev}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LoElevTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoElev}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LoElevTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LoElev,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LoElev}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LoElevTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoCompLen}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LoCompLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LoCompLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LoCompLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LoCompLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LoCompLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LoCompLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2" Rows="3">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeaveTab}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LeaveTabTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeaveTab}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="LeaveTabTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LeaveTab,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LeaveTab}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LeaveTabTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabLen}}">
+
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding TabLenTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabLen}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="TabLenTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.TabLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource TabLen}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=TabLenTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabHeight}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding TabHeightTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabHeight}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="TabHeightTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.TabHeight,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource TabHeight}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=TabHeightTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabAngle}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding TabAngleTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabAngle}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="TabAngleTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.TabAngle,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource TabAngle}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=TabAngleTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabDist}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding TabDistTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource TabDist}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="TabDistTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.TabDist,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource TabDist}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=TabDistTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource CurveUse}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding CurveUseTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource CurveUse}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.CurveUseList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedCurveUse,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource CurveUse}}"/>
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Approx}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ApproxTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Approx}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="ApproxTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.Approx,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Approx}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=ApproxTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepExtArc}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding StepExtArcTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepExtArc}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="StepExtArcTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.StepExtArc,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource StepExtArc}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=StepExtArcTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepIntArc}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding StepIntArcTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource StepIntArc}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="StepIntArcTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.StepIntArc,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource StepIntArc}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=StepIntArcTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                   <UniformGrid Columns="2">
+                      <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource SideAngle}}">
+
+                         <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                         </Grid.ColumnDefinitions>
+                         <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                         </Grid.RowDefinitions>
+
+                       <TextBlock Text="{Binding SideAngleTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
+                                 Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                              Converter={StaticResource MachiningParamVisibilityConverter},
+                                              ConverterParameter={StaticResource SideAngle}}"/>
+                       <EgtWPFLib5:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
+                                              Text="{Binding Path=SelectedItem.SideAngle,
+                                                    ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                              Visibility="{Binding Path=SelectedItem.Type,
+                                                          ElementName=MachiningsTreeView,
+                                                          Converter={StaticResource MachiningParamVisibilityConverter},
+                                                          ConverterParameter={StaticResource SideAngle}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                           Content="{Binding ElementName=SideAngleTxBx,
+                                   Path=(Validation.Errors).CurrentItem,
+                                   UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                       </Grid>
+                   </UniformGrid>
+
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeadLinkType}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LeadLinkTypeTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LeadLinkType}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.LeadLinkTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedLeadLinkType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LeadLinkType}}">
+
+                        </ComboBox>
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource SideStep}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding SideStepTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource SideStep}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="SideStepTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.SideStep,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource SideStep}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=SideStepTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OffsetStr}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding OffsetStrTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OffsetStr}}"/>
+                        <EgtWPFLib5:EgtTextBox Name="OffsetStrTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OffsetStr,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource OffsetStr}}"/>
+                        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=OffsetStrTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+                     </Grid>
+                  </UniformGrid>
+
+                  <UniformGrid Columns="2">
+                     <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource SubType}}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding SubTypeTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource SubType}}"/>
+                        <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.SubTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{StaticResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedSubType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource SubType}}"/>
+
+                     </Grid>
+                  </UniformGrid>
+
+
+               </StackPanel>
          
-         <Grid Grid.Column="0" Grid.Row="1">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LeaveTabTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LeaveTab}}"/>
-            <CheckBox Name="LeaveTabTxBx" Grid.Column="1"
-                                   IsChecked="{Binding Path=SelectedItem.LeaveTab,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LeaveTab}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LeaveTabTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
+         <Grid Grid.Row="2">
+            <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource UserNotes}}">
+                      <Grid.ColumnDefinitions>
+                         <ColumnDefinition Width="1*"/>
+                         <ColumnDefinition Width="3*"/>
+                      </Grid.ColumnDefinitions>
+                      <Grid.RowDefinitions>
+                         <RowDefinition Height="1*"/>
+                          <RowDefinition Height="1*"/>
+                      </Grid.RowDefinitions>
 
+                   <TextBlock Text="{Binding UserNotesTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                              Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                          Converter={StaticResource MachiningParamVisibilityConverter},
+                                           ConverterParameter={StaticResource UserNotes}}"/>
+                  <EgtWPFLib5:EgtTextBox Name="UserNotesTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                         Text="{Binding Path=SelectedItem.UserNotes,
+                                                ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                          Visibility="{Binding Path=SelectedItem.Type,
+                                                    ElementName=MachiningsTreeView,
+                                                    Converter={StaticResource MachiningParamVisibilityConverter},
+                                                    ConverterParameter={StaticResource UserNotes}}"/>
+             </Grid>
+           </Grid>
          </Grid>
 
-         <!--<Grid Grid.Column="0" Grid.Row="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TypeTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Type}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TypeTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Type,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Type}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TypeTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
-
-         </Grid>-->
-
-         <Grid Grid.Column="0" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding WorkSideTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource WorkSide}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.WorkSideList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                      Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedWorkSide,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource WorkSide}}"/>
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="4">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding HeadSideTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource HeadSide}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.HeadSideList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedHeadSide,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource HeadSide}}"/>
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LeadInTypeTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LeadInType}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.LeadInTypeList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedLeadInType,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LeadInType}}"/>
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="6">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding ExtLinkTypeTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource ExtLinkType}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.ExtLinkTypeList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedExtLinkType,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource ExtLinkType}}"/>
-
-         </Grid>
-         
-         <Grid Grid.Column="0" Grid.Row="7">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LeadOutTypeTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LeadOutType}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.LeadOutTypeList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedLeadOutType,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LeadOutType}}"/>
-
-         </Grid>
-         
-         <Grid Grid.Column="0" Grid.Row="8">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding CurveUseTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource CurveUse}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.CurveUseList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedCurveUse,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource CurveUse}}"/>
-
-         </Grid>
-         
-         <Grid Grid.Column="0" Grid.Row="9">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StepTypeTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StepType}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.StepTypeList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedStepType,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StepType}}"/>
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LeadLinkTypeTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LeadLinkType}}"/>
-            <!--<EgtWPFLib5:EgtTextBox Name="LeadLinkTypeTxBx" Grid.Column="1"
-                                   Text="{Binding Path=SelectedItem.LeadLinkType,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LeadLinkType}}"/>-->
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LeadLinkTypeTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.LeadLinkTypeList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedLeadLinkType,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LeadLinkType}}">
-
-            </ComboBox>
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="11">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding ApproxTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Approx}}"/>
-            <EgtWPFLib5:EgtTextBox Name="ApproxTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Approx,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Approx}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=ApproxTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="12">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StartPosTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StartPos}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StartPosTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StartPos,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StartPos}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=StartPosTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="13">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StartSlowLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StartSlowLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StartSlowLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StartSlowLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StartSlowLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=StartSlowLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="14">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding EndSlowLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource EndSlowLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="EndSlowLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.EndSlowLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource EndSlowLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=EndSlowLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="15">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding ThrouAddLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource ThrouAddLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="ThrouAddLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.ThrouAddLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource ThrouAddLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=ThrouAddLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="16">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StepParTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StepPar}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StepParTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StepPar,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StepPar}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=StepParTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="17">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding ReturnPosTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource ReturnPos}}"/>
-            <EgtWPFLib5:EgtTextBox Name="ReturnPosTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StepPar,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource ReturnPos}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=ReturnPosTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="18">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TabLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource TabLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TabLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.TabLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource TabLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TabLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="19">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TabDistTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource TabDist}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TabDistTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.TabDist,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource TabDist}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TabDistTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="0">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TabHeightTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource TabHeight}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TabHeightTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.TabHeight,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource TabHeight}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TabHeightTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="1">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TabAngleTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource TabAngle}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TabAngleTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.TabAngle,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource TabAngle}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TabAngleTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LiTangTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LiTang}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LiTangTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LiTang,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LiTang}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LiTangTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LiPerpTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LiPerp}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LiPerpTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LiPerp,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LiPerp}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LiPerpTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="4">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LiElevTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LiElev}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LiElevTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LiElev,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LiElev}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LiElevTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LiCompLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LiCompLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LiCompLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LiCompLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LiCompLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LiCompLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="6">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LoTangTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LoTang}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LoTangTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LoTang,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LoTang}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LoTangTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="7">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LoPerpTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LoPerp}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LoPerpTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LoPerp,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LoPerp}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LoPerpTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="8">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LoElevTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LoElev}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LoElevTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LoElev,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LoElev}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LoElevTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="9">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LoCompLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource LoCompLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LoCompLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LoCompLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource LoCompLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LoCompLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StartAddLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StartAddLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StartAddLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StartAddLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StartAddLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=StartAddLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="11">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding EndAddLenTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource EndAddLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="EndAddLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.EndAddLen,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource EndAddLen}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=EndAddLenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="12">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StepExtArcTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StepExtArc}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StepExtArcTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StepExtArc,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StepExtArc}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=StepExtArcTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="13">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StepIntArcTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StepIntArc}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StepIntArcTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StepIntArc,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StepIntArc}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=StepIntArcTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="14">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding SideStepTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource SideStep}}"/>
-            <EgtWPFLib5:EgtTextBox Name="SideStepTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.SideStep,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource SideStep}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=SideStepTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="15">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding NameParTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource NamePar}}"/>
-            <EgtWPFLib5:EgtTextBox Name="NameParTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.NamePar,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource NamePar}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=NameParTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="16">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding DepthStrTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource DepthStr}}"/>
-            <EgtWPFLib5:EgtTextBox Name="DepthStrTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.DepthStr,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource DepthStr}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=DepthStrTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="17">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding UserNotesTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource UserNotes}}"/>
-            <EgtWPFLib5:EgtTextBox Name="UserNotesTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.UserNotes,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource UserNotes}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=UserNotesTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="18">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding OverLapStrTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource OverLapStr}}"/>
-            <EgtWPFLib5:EgtTextBox Name="OverLapStrTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.OverLapStr,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource OverLapStr}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=OverLapStrTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="19">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding OffsetStrTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource OffsetStr}}"/>
-            <EgtWPFLib5:EgtTextBox Name="OffsetStrTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.OffsetStr,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource OffsetStr}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=OffsetStrTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="20">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding SubTypeTxBl}" Style="{StaticResource EgtCAM5_MachiningsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource SubType}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.SubTypeList,
-                                                   ElementName=MachiningsTreeView, Mode=OneWay}"
-                       Style="{StaticResource EgtCAM5_MachiningsComboBox}"
-                      SelectedIndex="{Binding Path=SelectedItem.SelectedSubType,
-                                     ElementName=MachiningsTreeView}"
-                      IsSynchronizedWithCurrentItem="True"
-                      Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource SubType}}"/>
-
-         </Grid>
-
-      </Grid>
-
-      <Grid Grid.Column="2">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-
-         <Grid Grid.Column="0" Grid.Row="0">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding ToolTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+         <Grid Grid.Column="2">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+
+         <Grid Grid.Column="0" Grid.Row="0" Margin="0,5,0,0">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+
+                  <TextBlock Text="{Binding ToolTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource Tool}}"/>
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.ToolList,
+                  <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.ToolList,
                                                    ElementName=MachiningsTreeView, Mode=OneWay}"
-                      Style="{StaticResource EgtCAM5_MachiningsToolComboBox}"
+                      Style="{StaticResource MachiningsToolComboBox}"
                       SelectedIndex="{Binding Path=SelectedItem.SelectedTool,
                                      ElementName=MachiningsTreeView}"
                       IsSynchronizedWithCurrentItem="True"
@@ -1388,271 +1483,245 @@
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource Tool}}"/>
-            <!--<EgtWPFLib5:EgtTextBox Name="ToolTxBx" Grid.Column="1"
+                  <!--<EgtWPFLib5:EgtTextBox Name="ToolTxBx" Grid.Column="1"
                                    Text="{Binding Path=SelectedItem.Tool,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource Tool}}"/>-->
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=ToolTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="1">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+               <Grid Grid.Column="0" Grid.Row="1">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding SpeedTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding SpeedTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource Speed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.Speed,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource Speed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=SpeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+               <Grid Grid.Column="0" Grid.Row="2">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding FeedTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding FeedTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource Feed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="FeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="FeedTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.Feed,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource Feed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=FeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+               <Grid Grid.Column="0" Grid.Row="3">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding StartFeedTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding StartFeedTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource StartFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.StartFeed,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource StartFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=StartFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="4">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+               <Grid Grid.Column="0" Grid.Row="4">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding EndFeedTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding EndFeedTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource EndFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="EndFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="EndFeedTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.EndFeed,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource EndFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=EndFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+               <Grid Grid.Column="0" Grid.Row="5">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding TipFeedTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding TipFeedTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource TipFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TipFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="TipFeedTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.TipFeed,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource TipFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=TipFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="6">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+               <Grid Grid.Column="0" Grid.Row="6">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding OffSrTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding OffSrTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource OffSr}}"/>
-            <EgtWPFLib5:EgtTextBox Name="OffSrTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="OffSrTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.OffSr,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource OffSr}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=OffSrTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="7">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+               <Grid Grid.Column="0" Grid.Row="7">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding OffSlTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding OffSlTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource OffSl}}"/>
-            <EgtWPFLib5:EgtTextBox Name="OffSlTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="OffSlTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.OffSl,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource OffSl}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=OffSlTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>
+               </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="8">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding SideAngleTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
-                                   Converter={StaticResource MachiningParamVisibilityConverter},
-                                   ConverterParameter={StaticResource SideAngle}}"/>
-            <EgtWPFLib5:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
-                                   Text="{Binding Path=SelectedItem.SideAngle,
-                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=MachiningsTreeView,
-                                               Converter={StaticResource MachiningParamVisibilityConverter},
-                                               ConverterParameter={StaticResource SideAngle}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=SideAngleTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
+               <Grid Grid.Column="0" Grid.Row="8">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
 
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="9">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding VertFeedTxBl}" Style="{StaticResource EgtCAM5_MachiningsToolTextBlock}"
+                  <TextBlock Text="{Binding VertFeedTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource VertFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="VertFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsToolTextBox}"
+                  <EgtWPFLib5:EgtTextBox Name="VertFeedTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
                                    Text="{Binding Path=SelectedItem.VertFeed,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource VertFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=VertFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
+               </Grid>
+            </Grid>
          </Grid>
-      </Grid>
-   </Grid>
+
 </UserControl>
diff --git a/MachiningsDbPage/MachiningsDbViewModel.vb b/MachiningsDbPage/MachiningsDbViewModel.vb
index 238c437..5d52133 100644
--- a/MachiningsDbPage/MachiningsDbViewModel.vb
+++ b/MachiningsDbPage/MachiningsDbViewModel.vb
@@ -8,36 +8,6 @@ Namespace EgtCAM5
    Public Class MachiningsDbViewModel
       Inherits TabViewModel
 
-      ' Lista delle macchine disponibili nel programma
-      Private m_MachinesList As New ObservableCollection(Of Machine)
-      Public Property MachinesList As ObservableCollection(Of Machine)
-         Get
-            Return m_MachinesList
-         End Get
-         Set(value As ObservableCollection(Of Machine))
-            m_MachinesList = value
-         End Set
-      End Property
-      ' Macchina correntemente selezionata e quindi attiva
-      Private m_SelectedMachine As Machine
-      Public Property SelectedMachine As Machine
-         Get
-            Return m_SelectedMachine
-         End Get
-         Set(value As Machine)
-            If value IsNot m_SelectedMachine Then
-               m_SelectedMachine = value
-               EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-               Dim x = EgtSetCurrMachine(m_SelectedMachine.Name)
-               IniFile.m_sDbsCurrMachIniFilePath = m_SelectedMachine.MachineDirPath & "\" & m_SelectedMachine.Name & ".ini"
-               'IniFile.m_sTdbCurrMachToolsDirPath = m_SelectedMachine.MachineDirPath & "\Tools"
-               m_MachiningsList.Clear()
-               LoadSelectedMachineMachinings()
-               OnPropertyChanged("SelectedMachine")
-            End If
-         End Set
-      End Property
-
       ' Lista delle lavorazioni
       Private m_MachiningsList As New ObservableCollection(Of FamilyMachiningTreeViewItem)
       Public Property MachiningsList As ObservableCollection(Of FamilyMachiningTreeViewItem)
@@ -361,7 +331,6 @@ Namespace EgtCAM5
       ''' </summary>
       Sub New()
          Me.sTabName = EgtMsg(MSG_MAINWINDOW + 4)
-         SearchMachine()
 
          Application.Msn.Register(Application.REMOVEMACHINING, Sub(MachiningToRemove As MachiningTreeViewItem)
                                                                   Remove(MachiningToRemove)
@@ -401,41 +370,12 @@ Namespace EgtCAM5
                                                                     Next
 
                                                                  End Sub)
-
+         Application.Msn.Register(Application.LOADSELECTEDMACHINE, Sub()
+                                                                      m_MachiningsList.Clear()
+                                                                      LoadSelectedMachineMachinings()
+                                                                   End Sub)
       End Sub
 
-      ''' <summary>
-      ''' Method that search the machines in the correct folder and add to the MachinesList those valid.
-      ''' </summary>
-      Private Sub SearchMachine()
-         Dim TempArray As String() = Directory.GetDirectories(IniFile.m_sMachinesRoot)
-         For i As Integer = 0 To TempArray.Count - 1
-            Dim MachinePathIni As String = TempArray(i) & "\" & Path.GetFileName(TempArray(i)) & ".ini"
-            If File.Exists(MachinePathIni) Then
-               m_MachinesList.Add(New Machine With {.Name = Path.GetFileName(TempArray(i)), .MachineDirPath = TempArray(i)})
-            End If
-         Next
-      End Sub
-
-      ''' <summary>
-      ''' Class that create the association Name/IniPath for the machine's
-      ''' </summary>
-      Class Machine
-
-         Private m_sName As String
-         Public Property Name As String
-            Get
-               Return m_sName
-            End Get
-            Set(value As String)
-               m_sName = value
-            End Set
-         End Property
-
-         Friend MachineDirPath As String
-
-      End Class
-
       ''' <summary>
       ''' Method that search the machines in the correct folder and add to the MachinesList those valid.
       ''' </summary>
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index cee58f5..b01cff6 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -169,28 +169,28 @@ Namespace EgtCAM5
       ''' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
       ''' </summary>
       Public Sub MainWindow_Closing(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATION)
-         '' Gestisco eventuale file corrente modificato
-         Application.Msn.NotifyColleagues(Application.MANAGEMODIFIED)
-         'If m_allowWindowToClose Then
-         '   CloseCommand = New RelayCommand(Nothing, Function() True)
+         'Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATION)
+         ' '' Gestisco eventuale file corrente modificato
+         'Application.Msn.NotifyColleagues(Application.MANAGEMODIFIED)
+         ''If m_allowWindowToClose Then
+         ''   CloseCommand = New RelayCommand(Nothing, Function() True)
+         ''End If
+         '' Salvo posizione Form (se non minimizzato)
+         'If Application.Current.MainWindow.WindowState <> WindowState.Minimized Then
+         '   Dim WinPos As New WinPos
+         '   WindowToWinPos(Application.Current.MainWindow, WinPos)
+         '   WritePrivateProfileWinPos(S_GENERAL, K_WINPLACE, WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
          'End If
-         ' Salvo posizione Form (se non minimizzato)
-         If Application.Current.MainWindow.WindowState <> WindowState.Minimized Then
-            Dim WinPos As New WinPos
-            WindowToWinPos(Application.Current.MainWindow, WinPos)
-            WritePrivateProfileWinPos(S_GENERAL, K_WINPLACE, WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
-         End If
-         ' Terminazione generale di EgtInterface
-         EgtExit()
-         ' Rilascio mutex
-         m_objMutex.Close()
-         ' Aggiorno istanze usate
-         Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
-         nTmp -= (1 << (m_nInstance - 1))
-         WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
-         '' Disabilito gestore Idle
-         'RemoveHandler Application.Idle, AddressOf Application_Idle
+         '' Terminazione generale di EgtInterface
+         'EgtExit()
+         '' Rilascio mutex
+         'm_objMutex.Close()
+         '' Aggiorno istanze usate
+         'Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
+         'nTmp -= (1 << (m_nInstance - 1))
+         'WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
+         ' '' Disabilito gestore Idle
+         ''RemoveHandler Application.Idle, AddressOf Application_Idle
 
       End Sub
 
@@ -245,6 +245,8 @@ Namespace EgtCAM5
             Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
             nTmp -= (1 << (m_nInstance - 1))
             WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
+            ' Salvo impostazione macchina corrente
+            Application.Msn.NotifyColleagues(Application.SAVECURRENTMACHINE)
             '' Disabilito gestore Idle
             'RemoveHandler Application.Idle, AddressOf Application_Idle
             Application.Current.MainWindow.Close()
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index 9f7a56d..39850a8 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -142,7 +142,9 @@ Namespace EgtCAM5
             ' inizializzo gestore lavorazioni
             EgtInitMachMgr(IniFile.m_sMachinesRoot)
          End If
-
+         ' Seleziono la macchina impostata nel file ini
+         Application.Msn.NotifyColleagues(Application.LOADCURRENTMACHINE)
+         EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
       End Sub
 
       ''' <summary>
@@ -552,7 +554,7 @@ Namespace EgtCAM5
 
                                                            End Sub)
          Application.Msn.Register(Application.SAVEPROJECT, Sub()
-                                                              Dim nType As NGE = GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT)
+                                                              Dim nType As NGE = DirectCast(GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT), NGE)
                                                               If Not String.IsNullOrWhiteSpace(m_Controller.GetCurrFile()) Then
                                                                  m_Controller.SaveProject(nType)
                                                               Else
@@ -565,7 +567,7 @@ Namespace EgtCAM5
 
                                                            End Sub)
          Application.Msn.Register(Application.SAVEASPROJECT, Sub()
-                                                                Dim nType As NGE = GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT)
+                                                                Dim nType As NGE = DirectCast(GetPrivateProfileInt(S_GEOMDB, K_SAVETYPE, NGE.CMPTEXT), NGE)
                                                                 Dim sFile As String = m_Controller.GetCurrFile()
                                                                 If String.IsNullOrWhiteSpace(sFile) Then
                                                                    GetPrivateProfileString(S_GENERAL, K_LASTNGEDIR, "", sFile)
@@ -599,6 +601,11 @@ Namespace EgtCAM5
                                                               'End If
 
                                                            End Sub)
+         Application.Msn.Register(Application.DOORSPROJECT, Sub()
+                                                               Dim bOk As Boolean = ExecDoors(m_ProjectScene)
+                                                               OnUpdateUI(Nothing, True)
+                                                               If Not bOk Then Application.Msn.NotifyColleagues(Application.NOTIFYSTATUSOUTPUT, "Error running Ddf file")
+                                                            End Sub)
 
       End Sub
 
diff --git a/SharedFieldsClass.vb b/SharedFieldsClass.vb
index c1adc2c..c54cb5c 100644
--- a/SharedFieldsClass.vb
+++ b/SharedFieldsClass.vb
@@ -1,627 +1,612 @@
 Module SharedFieldsClass
 
    ' Array che contiene il valore della proprietà visibility per ogni campo dell'utensile
-   Friend Drill_Std(26) As Visibility
-   Friend Drill_Long(26) As Visibility
-   Friend Saw_Std(26) As Visibility
-   Friend Saw_Flat(26) As Visibility
-   Friend Mill_Std(26) As Visibility
-   Friend Mill_NoTip(26) As Visibility
-   Friend Mortise_Std(26) As Visibility
-   Friend Compo(26) As Visibility
+   Friend Drill_Std(25) As Visibility
+   Friend Drill_Long(25) As Visibility
+   Friend Saw_Std(25) As Visibility
+   Friend Saw_Flat(25) As Visibility
+   Friend Mill_Std(25) As Visibility
+   Friend Mill_NoTip(25) As Visibility
+   Friend Mortise_Std(25) As Visibility
+   Friend Compo(25) As Visibility
 
    ' Array che contiene il valore della proprietà visibility per ogni campo della lavorazione
-   Friend Milling(50) As Visibility
-   Friend Drilling(50) As Visibility
-   Friend Sawing(50) As Visibility
-   Friend Pocketing(50) As Visibility
-   Friend Mortising(50) As Visibility
-   Friend Sawroughing(50) As Visibility
-   Friend Sawfinishing(50) As Visibility
+   Friend Milling(49) As Visibility
+   Friend Drilling(49) As Visibility
+   Friend Sawing(49) As Visibility
+   Friend Pocketing(49) As Visibility
+   Friend Mortising(49) As Visibility
+   Friend Sawroughing(49) As Visibility
+   Friend Sawfinishing(49) As Visibility
 
    Sub New()
       ' Parametri drill standard
-      Drill_Std(0) = Visibility.Visible            ' Corrector
-      Drill_Std(1) = Visibility.Visible            ' ExitPar
-      Drill_Std(2) = Visibility.Visible            ' Type
-      Drill_Std(3) = Visibility.Hidden             ' Coolant
-      Drill_Std(4) = Visibility.Hidden             ' CornRad
-      Drill_Std(5) = Visibility.Visible            ' Diam
-      Drill_Std(6) = Visibility.Visible            ' TotDiam
-      Drill_Std(7) = Visibility.Visible            ' Feed
-      Drill_Std(8) = Visibility.Visible            ' EndFeed
-      Drill_Std(9) = Visibility.Visible            ' StartFeed
-      Drill_Std(10) = Visibility.Visible           ' TipFeed
-      Drill_Std(11) = Visibility.Visible           ' Len
-      Drill_Std(12) = Visibility.Visible           ' TotLen
-      Drill_Std(13) = Visibility.Visible           ' MaxMat
-      Drill_Std(14) = Visibility.Hidden            ' LonOffset
-      Drill_Std(15) = Visibility.Hidden            ' RadOffset
-      Drill_Std(16) = Visibility.Visible           ' Speed
-      Drill_Std(17) = Visibility.Hidden            ' SideAng
-      Drill_Std(18) = Visibility.Visible           ' MaxSpeed
-      Drill_Std(19) = Visibility.Hidden            ' Thick
-      Drill_Std(20) = Visibility.Hidden            ' MaxAbsorption
-      Drill_Std(21) = Visibility.Hidden            ' MinFeed
-      Drill_Std(22) = Visibility.Visible           ' Draw
-      Drill_Std(23) = Visibility.Visible           ' Head
-      Drill_Std(24) = Visibility.Visible           ' NamePar
-      Drill_Std(25) = Visibility.Visible           ' UserNotes
-      Drill_Std(26) = Visibility.Visible           ' TcPOs
+      Drill_Std(0) = Visibility.Visible               ' Corrector
+      Drill_Std(1) = Visibility.Visible               ' ExitPar
+      Drill_Std(2) = Visibility.Collapsed             ' Coolant
+      Drill_Std(3) = Visibility.Collapsed             ' CornRad
+      Drill_Std(4) = Visibility.Visible               ' Diam
+      Drill_Std(5) = Visibility.Visible               ' TotDiam
+      Drill_Std(6) = Visibility.Visible               ' Feed
+      Drill_Std(7) = Visibility.Visible               ' EndFeed
+      Drill_Std(8) = Visibility.Visible               ' StartFeed
+      Drill_Std(9) = Visibility.Visible               ' TipFeed
+      Drill_Std(10) = Visibility.Visible              ' Len
+      Drill_Std(11) = Visibility.Visible              ' TotLen
+      Drill_Std(12) = Visibility.Visible              ' MaxMat
+      Drill_Std(13) = Visibility.Visible              ' LonOffset
+      Drill_Std(14) = Visibility.Visible              ' RadOffset
+      Drill_Std(15) = Visibility.Visible              ' Speed
+      Drill_Std(16) = Visibility.Collapsed            ' SideAng
+      Drill_Std(17) = Visibility.Visible              ' MaxSpeed
+      Drill_Std(18) = Visibility.Collapsed            ' Thick
+      Drill_Std(19) = Visibility.Collapsed            ' MaxAbsorption
+      Drill_Std(20) = Visibility.Collapsed            ' MinFeed
+      Drill_Std(21) = Visibility.Visible              ' Draw
+      Drill_Std(22) = Visibility.Visible              ' Head
+      Drill_Std(23) = Visibility.Visible              ' NamePar
+      Drill_Std(24) = Visibility.Visible              ' UserNotes
+      Drill_Std(25) = Visibility.Visible              ' TcPOs
 
       ' Parametri drill long
-      Drill_Long(0) = Visibility.Visible            ' Corrector
-      Drill_Long(1) = Visibility.Visible            ' ExitPar
-      Drill_Long(2) = Visibility.Visible            ' Type
-      Drill_Long(3) = Visibility.Hidden             ' Coolant
-      Drill_Long(4) = Visibility.Hidden             ' CornRad
-      Drill_Long(5) = Visibility.Visible            ' Diam
-      Drill_Long(6) = Visibility.Visible            ' TotDiam
-      Drill_Long(7) = Visibility.Visible            ' Feed
-      Drill_Long(8) = Visibility.Visible            ' EndFeed
-      Drill_Long(9) = Visibility.Visible            ' StartFeed
-      Drill_Long(10) = Visibility.Visible           ' TipFeed
-      Drill_Long(11) = Visibility.Visible           ' Len
-      Drill_Long(12) = Visibility.Visible           ' TotLen
-      Drill_Long(13) = Visibility.Visible           ' MaxMat
-      Drill_Long(14) = Visibility.Hidden            ' LonOffset
-      Drill_Long(15) = Visibility.Hidden            ' RadOffset
-      Drill_Long(16) = Visibility.Visible           ' Speed
-      Drill_Long(17) = Visibility.Hidden            ' SideAng
-      Drill_Long(18) = Visibility.Visible           ' MaxSpeed
-      Drill_Long(19) = Visibility.Hidden            ' Thick
-      Drill_Long(20) = Visibility.Hidden            ' MaxAbsorption
-      Drill_Long(21) = Visibility.Hidden            ' MinFeed
-      Drill_Long(22) = Visibility.Visible           ' Draw
-      Drill_Long(23) = Visibility.Visible           ' Head
-      Drill_Long(24) = Visibility.Visible           ' NamePar
-      Drill_Long(25) = Visibility.Visible           ' UserNotes
-      Drill_Long(26) = Visibility.Visible           ' TcPOs
+      Drill_Long(0) = Visibility.Visible              ' Corrector
+      Drill_Long(1) = Visibility.Visible              ' ExitPar
+      Drill_Long(2) = Visibility.Collapsed            ' Coolant
+      Drill_Long(3) = Visibility.Collapsed            ' CornRad
+      Drill_Long(4) = Visibility.Visible              ' Diam
+      Drill_Long(5) = Visibility.Visible              ' TotDiam
+      Drill_Long(6) = Visibility.Visible              ' Feed
+      Drill_Long(7) = Visibility.Visible              ' EndFeed
+      Drill_Long(8) = Visibility.Visible              ' StartFeed
+      Drill_Long(9) = Visibility.Visible              ' TipFeed
+      Drill_Long(10) = Visibility.Visible             ' Len
+      Drill_Long(11) = Visibility.Visible             ' TotLen
+      Drill_Long(12) = Visibility.Visible             ' MaxMat
+      Drill_Long(13) = Visibility.Visible             ' LonOffset
+      Drill_Long(14) = Visibility.Visible             ' RadOffset
+      Drill_Long(15) = Visibility.Visible             ' Speed
+      Drill_Long(16) = Visibility.Collapsed           ' SideAng
+      Drill_Long(17) = Visibility.Visible             ' MaxSpeed
+      Drill_Long(18) = Visibility.Collapsed           ' Thick
+      Drill_Long(19) = Visibility.Collapsed           ' MaxAbsorption
+      Drill_Long(20) = Visibility.Collapsed           ' MinFeed
+      Drill_Long(21) = Visibility.Visible             ' Draw
+      Drill_Long(22) = Visibility.Visible             ' Head
+      Drill_Long(23) = Visibility.Visible             ' NamePar
+      Drill_Long(24) = Visibility.Visible             ' UserNotes
+      Drill_Long(25) = Visibility.Visible             ' TcPOs
 
       'Parametri Saw Standard
-      Saw_Std(0) = Visibility.Visible            ' Corrector
-      Saw_Std(1) = Visibility.Visible            ' ExitPar
-      Saw_Std(2) = Visibility.Visible            ' Type
-      Saw_Std(3) = Visibility.Hidden             ' Coolant
-      Saw_Std(4) = Visibility.Hidden             ' CornRad
-      Saw_Std(5) = Visibility.Visible            ' Diam
-      Saw_Std(6) = Visibility.Visible            ' TotDiam
-      Saw_Std(7) = Visibility.Visible            ' Feed
-      Saw_Std(8) = Visibility.Visible            ' EndFeed
-      Saw_Std(9) = Visibility.Visible            ' StartFeed
-      Saw_Std(10) = Visibility.Visible           ' TipFeed
-      Saw_Std(11) = Visibility.Visible           ' Len
-      Saw_Std(12) = Visibility.Visible           ' TotLen
-      Saw_Std(13) = Visibility.Visible           ' MaxMat
-      Saw_Std(14) = Visibility.Visible           ' LonOffset
-      Saw_Std(15) = Visibility.Visible           ' RadOffset
-      Saw_Std(16) = Visibility.Visible           ' Speed
-      Saw_Std(17) = Visibility.Hidden            ' SideAng
-      Saw_Std(18) = Visibility.Visible           ' MaxSpeed
-      Saw_Std(19) = Visibility.Visible           ' Thick
-      Saw_Std(20) = Visibility.Hidden            ' MaxAbsorption
-      Saw_Std(21) = Visibility.Hidden            ' MinFeed
-      Saw_Std(22) = Visibility.Visible           ' Draw
-      Saw_Std(23) = Visibility.Visible           ' Head
-      Saw_Std(24) = Visibility.Visible           ' NamePar
-      Saw_Std(25) = Visibility.Visible           ' UserNotes
-      Saw_Std(26) = Visibility.Visible           ' TcPOs
+      Saw_Std(0) = Visibility.Visible                 ' Corrector
+      Saw_Std(1) = Visibility.Visible                 ' ExitPar
+      Saw_Std(2) = Visibility.Collapsed               ' Coolant
+      Saw_Std(3) = Visibility.Collapsed               ' CornRad
+      Saw_Std(4) = Visibility.Visible                 ' Diam
+      Saw_Std(5) = Visibility.Visible                 ' TotDiam
+      Saw_Std(6) = Visibility.Visible                 ' Feed
+      Saw_Std(7) = Visibility.Visible                 ' EndFeed
+      Saw_Std(8) = Visibility.Visible                 ' StartFeed
+      Saw_Std(9) = Visibility.Visible                 ' TipFeed
+      Saw_Std(10) = Visibility.Visible                ' Len
+      Saw_Std(11) = Visibility.Visible                ' TotLen
+      Saw_Std(12) = Visibility.Visible                ' MaxMat
+      Saw_Std(13) = Visibility.Visible                ' LonOffset
+      Saw_Std(14) = Visibility.Visible                ' RadOffset
+      Saw_Std(15) = Visibility.Visible                ' Speed
+      Saw_Std(16) = Visibility.Collapsed              ' SideAng
+      Saw_Std(17) = Visibility.Visible                ' MaxSpeed
+      Saw_Std(18) = Visibility.Visible                ' Thick
+      Saw_Std(19) = Visibility.Collapsed              ' MaxAbsorption
+      Saw_Std(20) = Visibility.Collapsed              ' MinFeed
+      Saw_Std(21) = Visibility.Visible                ' Draw
+      Saw_Std(22) = Visibility.Visible                ' Head
+      Saw_Std(23) = Visibility.Visible                ' NamePar
+      Saw_Std(24) = Visibility.Visible                ' UserNotes
+      Saw_Std(25) = Visibility.Visible                ' TcPOs
 
       'Parametri Saw Flat
-      Saw_Flat(0) = Visibility.Visible            ' Corrector
-      Saw_Flat(1) = Visibility.Visible            ' ExitPar
-      Saw_Flat(2) = Visibility.Visible            ' Type
-      Saw_Flat(3) = Visibility.Hidden             ' Coolant
-      Saw_Flat(4) = Visibility.Hidden             ' CornRad
-      Saw_Flat(5) = Visibility.Visible            ' Diam
-      Saw_Flat(6) = Visibility.Visible            ' TotDiam
-      Saw_Flat(7) = Visibility.Visible            ' Feed
-      Saw_Flat(8) = Visibility.Visible            ' EndFeed
-      Saw_Flat(9) = Visibility.Visible            ' StartFeed
-      Saw_Flat(10) = Visibility.Visible           ' TipFeed
-      Saw_Flat(11) = Visibility.Visible           ' Len
-      Saw_Flat(12) = Visibility.Visible           ' TotLen
-      Saw_Flat(13) = Visibility.Visible           ' MaxMat
-      Saw_Flat(14) = Visibility.Visible           ' LonOffset
-      Saw_Flat(15) = Visibility.Visible           ' RadOffset
-      Saw_Flat(16) = Visibility.Visible           ' Speed
-      Saw_Flat(17) = Visibility.Hidden            ' SideAng
-      Saw_Flat(18) = Visibility.Visible           ' MaxSpeed
-      Saw_Flat(19) = Visibility.Visible           ' Thick
-      Saw_Flat(20) = Visibility.Hidden            ' MaxAbsorption
-      Saw_Flat(21) = Visibility.Hidden            ' MinFeed
-      Saw_Flat(22) = Visibility.Visible           ' Draw
-      Saw_Flat(23) = Visibility.Visible           ' Head
-      Saw_Flat(24) = Visibility.Visible           ' NamePar
-      Saw_Flat(25) = Visibility.Visible           ' UserNotes
-      Saw_Flat(26) = Visibility.Visible           ' TcPOs
+      Saw_Flat(0) = Visibility.Visible                ' Corrector
+      Saw_Flat(1) = Visibility.Visible                ' ExitPar
+      Saw_Flat(2) = Visibility.Collapsed              ' Coolant
+      Saw_Flat(3) = Visibility.Collapsed              ' CornRad
+      Saw_Flat(4) = Visibility.Visible                ' Diam
+      Saw_Flat(5) = Visibility.Visible                ' TotDiam
+      Saw_Flat(6) = Visibility.Visible                ' Feed
+      Saw_Flat(7) = Visibility.Visible                ' EndFeed
+      Saw_Flat(8) = Visibility.Visible                ' StartFeed
+      Saw_Flat(9) = Visibility.Visible                ' TipFeed
+      Saw_Flat(10) = Visibility.Visible               ' Len
+      Saw_Flat(11) = Visibility.Visible               ' TotLen
+      Saw_Flat(12) = Visibility.Visible               ' MaxMat
+      Saw_Flat(13) = Visibility.Visible               ' LonOffset
+      Saw_Flat(14) = Visibility.Visible               ' RadOffset
+      Saw_Flat(15) = Visibility.Visible               ' Speed
+      Saw_Flat(16) = Visibility.Collapsed             ' SideAng
+      Saw_Flat(17) = Visibility.Visible               ' MaxSpeed
+      Saw_Flat(18) = Visibility.Visible               ' Thick
+      Saw_Flat(19) = Visibility.Collapsed             ' MaxAbsorption
+      Saw_Flat(20) = Visibility.Collapsed             ' MinFeed
+      Saw_Flat(21) = Visibility.Visible               ' Draw
+      Saw_Flat(22) = Visibility.Visible               ' Head
+      Saw_Flat(23) = Visibility.Visible               ' NamePar
+      Saw_Flat(24) = Visibility.Visible               ' UserNotes
+      Saw_Flat(25) = Visibility.Visible               ' TcPOs
 
       'Parametri Mill standard
-      Mill_Std(0) = Visibility.Visible            ' Corrector
-      Mill_Std(1) = Visibility.Visible            ' ExitPar
-      Mill_Std(2) = Visibility.Visible            ' Type
-      Mill_Std(3) = Visibility.Hidden             ' Coolant
-      Mill_Std(4) = Visibility.Visible            ' CornRad
-      Mill_Std(5) = Visibility.Visible            ' Diam
-      Mill_Std(6) = Visibility.Visible            ' TotDiam
-      Mill_Std(7) = Visibility.Visible            ' Feed
-      Mill_Std(8) = Visibility.Visible            ' EndFeed
-      Mill_Std(9) = Visibility.Visible            ' StartFeed
-      Mill_Std(10) = Visibility.Visible           ' TipFeed
-      Mill_Std(11) = Visibility.Visible           ' Len
-      Mill_Std(12) = Visibility.Visible           ' TotLen
-      Mill_Std(13) = Visibility.Visible           ' MaxMat
-      Mill_Std(14) = Visibility.Visible           ' LonOffset
-      Mill_Std(15) = Visibility.Visible           ' RadOffset
-      Mill_Std(16) = Visibility.Visible           ' Speed
-      Mill_Std(17) = Visibility.Visible           ' SideAng
-      Mill_Std(18) = Visibility.Visible           ' MaxSpeed
-      Mill_Std(19) = Visibility.Hidden            ' Thick
-      Mill_Std(20) = Visibility.Hidden            ' MaxAbsorption
-      Mill_Std(21) = Visibility.Hidden            ' MinFeed
-      Mill_Std(22) = Visibility.Visible           ' Draw
-      Mill_Std(23) = Visibility.Visible           ' Head
-      Mill_Std(24) = Visibility.Visible           ' NamePar
-      Mill_Std(25) = Visibility.Visible           ' UserNotes
-      Mill_Std(26) = Visibility.Visible           ' TcPOs
+      Mill_Std(0) = Visibility.Visible                ' Corrector
+      Mill_Std(1) = Visibility.Visible                ' ExitPar
+      Mill_Std(2) = Visibility.Collapsed              ' Coolant
+      Mill_Std(3) = Visibility.Visible                ' CornRad
+      Mill_Std(4) = Visibility.Visible                ' Diam
+      Mill_Std(5) = Visibility.Visible                ' TotDiam
+      Mill_Std(6) = Visibility.Visible                ' Feed
+      Mill_Std(7) = Visibility.Visible                ' EndFeed
+      Mill_Std(8) = Visibility.Visible                ' StartFeed
+      Mill_Std(9) = Visibility.Visible                ' TipFeed
+      Mill_Std(10) = Visibility.Visible               ' Len
+      Mill_Std(11) = Visibility.Visible               ' TotLen
+      Mill_Std(12) = Visibility.Visible               ' MaxMat
+      Mill_Std(13) = Visibility.Visible               ' LonOffset
+      Mill_Std(14) = Visibility.Visible               ' RadOffset
+      Mill_Std(15) = Visibility.Visible               ' Speed
+      Mill_Std(16) = Visibility.Visible               ' SideAng
+      Mill_Std(17) = Visibility.Visible               ' MaxSpeed
+      Mill_Std(18) = Visibility.Collapsed             ' Thick
+      Mill_Std(19) = Visibility.Collapsed             ' MaxAbsorption
+      Mill_Std(20) = Visibility.Collapsed             ' MinFeed
+      Mill_Std(21) = Visibility.Visible               ' Draw
+      Mill_Std(22) = Visibility.Visible               ' Head
+      Mill_Std(23) = Visibility.Visible               ' NamePar
+      Mill_Std(24) = Visibility.Visible               ' UserNotes
+      Mill_Std(25) = Visibility.Visible               ' TcPOs
 
       'Parametri Mill NoTip
-      Mill_NoTip(0) = Visibility.Visible            ' Corrector
-      Mill_NoTip(1) = Visibility.Visible            ' ExitPar
-      Mill_NoTip(2) = Visibility.Visible            ' Type
-      Mill_NoTip(3) = Visibility.Hidden             ' Coolant
-      Mill_NoTip(4) = Visibility.Visible            ' CornRad
-      Mill_NoTip(5) = Visibility.Visible            ' Diam
-      Mill_NoTip(6) = Visibility.Visible            ' TotDiam
-      Mill_NoTip(7) = Visibility.Visible            ' Feed
-      Mill_NoTip(8) = Visibility.Visible            ' EndFeed
-      Mill_NoTip(9) = Visibility.Visible            ' StartFeed
-      Mill_NoTip(10) = Visibility.Visible           ' TipFeed
-      Mill_NoTip(11) = Visibility.Visible           ' Len
-      Mill_NoTip(12) = Visibility.Visible           ' TotLen
-      Mill_NoTip(13) = Visibility.Visible           ' MaxMat
-      Mill_NoTip(14) = Visibility.Visible           ' LonOffset
-      Mill_NoTip(15) = Visibility.Visible           ' RadOffset
-      Mill_NoTip(16) = Visibility.Visible           ' Speed
-      Mill_NoTip(17) = Visibility.Visible           ' SideAng
-      Mill_NoTip(18) = Visibility.Visible           ' MaxSpeed
-      Mill_NoTip(19) = Visibility.Hidden            ' Thick
-      Mill_NoTip(20) = Visibility.Hidden            ' MaxAbsorption
-      Mill_NoTip(21) = Visibility.Hidden            ' MinFeed
-      Mill_NoTip(22) = Visibility.Visible           ' Draw
-      Mill_NoTip(23) = Visibility.Visible           ' Head
-      Mill_NoTip(24) = Visibility.Visible           ' NamePar
-      Mill_NoTip(25) = Visibility.Visible           ' UserNotes
-      Mill_NoTip(26) = Visibility.Visible           ' TcPOs
+      Mill_NoTip(0) = Visibility.Visible              ' Corrector
+      Mill_NoTip(1) = Visibility.Visible              ' ExitPar
+      Mill_NoTip(2) = Visibility.Collapsed            ' Coolant
+      Mill_NoTip(3) = Visibility.Visible              ' CornRad
+      Mill_NoTip(4) = Visibility.Visible              ' Diam
+      Mill_NoTip(5) = Visibility.Visible              ' TotDiam
+      Mill_NoTip(6) = Visibility.Visible              ' Feed
+      Mill_NoTip(7) = Visibility.Visible              ' EndFeed
+      Mill_NoTip(8) = Visibility.Visible              ' StartFeed
+      Mill_NoTip(9) = Visibility.Visible              ' TipFeed
+      Mill_NoTip(10) = Visibility.Visible             ' Len
+      Mill_NoTip(11) = Visibility.Visible             ' TotLen
+      Mill_NoTip(12) = Visibility.Visible             ' MaxMat
+      Mill_NoTip(13) = Visibility.Visible             ' LonOffset
+      Mill_NoTip(14) = Visibility.Visible             ' RadOffset
+      Mill_NoTip(15) = Visibility.Visible             ' Speed
+      Mill_NoTip(16) = Visibility.Visible             ' SideAng
+      Mill_NoTip(17) = Visibility.Visible             ' MaxSpeed
+      Mill_NoTip(18) = Visibility.Collapsed           ' Thick
+      Mill_NoTip(19) = Visibility.Collapsed           ' MaxAbsorption
+      Mill_NoTip(20) = Visibility.Collapsed           ' MinFeed
+      Mill_NoTip(21) = Visibility.Visible             ' Draw
+      Mill_NoTip(22) = Visibility.Visible             ' Head
+      Mill_NoTip(23) = Visibility.Visible             ' NamePar
+      Mill_NoTip(24) = Visibility.Visible             ' UserNotes
+      Mill_NoTip(25) = Visibility.Visible             ' TcPOs
 
       'Parametri Mortise Standard
-      Mortise_Std(0) = Visibility.Hidden             ' Corrector
-      Mortise_Std(1) = Visibility.Visible            ' ExitPar
-      Mortise_Std(2) = Visibility.Visible            ' Type
-      Mortise_Std(3) = Visibility.Hidden             ' Coolant
-      Mortise_Std(4) = Visibility.Visible            ' CornRad
-      Mortise_Std(5) = Visibility.Visible            ' Diam
-      Mortise_Std(6) = Visibility.Visible            ' TotDiam
-      Mortise_Std(7) = Visibility.Visible            ' Feed
-      Mortise_Std(8) = Visibility.Visible            ' EndFeed
-      Mortise_Std(9) = Visibility.Visible            ' StartFeed
-      Mortise_Std(10) = Visibility.Visible           ' TipFeed
-      Mortise_Std(11) = Visibility.Visible           ' Len
-      Mortise_Std(12) = Visibility.Visible           ' TotLen
-      Mortise_Std(13) = Visibility.Visible           ' MaxMat
-      Mortise_Std(14) = Visibility.Visible           ' LonOffset
-      Mortise_Std(15) = Visibility.Visible           ' RadOffset
-      Mortise_Std(16) = Visibility.Visible           ' Speed
-      Mortise_Std(17) = Visibility.Hidden            ' SideAng
-      Mortise_Std(18) = Visibility.Visible           ' MaxSpeed
-      Mortise_Std(19) = Visibility.Visible           ' Thick
-      Mortise_Std(20) = Visibility.Hidden            ' MaxAbsorption
-      Mortise_Std(21) = Visibility.Hidden            ' MinFeed
-      Mortise_Std(22) = Visibility.Visible           ' Draw
-      Mortise_Std(23) = Visibility.Visible           ' Head
-      Mortise_Std(24) = Visibility.Visible           ' NamePar
-      Mortise_Std(25) = Visibility.Visible           ' UserNotes
-      Mortise_Std(26) = Visibility.Visible           ' TcPOs
+      Mortise_Std(0) = Visibility.Collapsed           ' Corrector
+      Mortise_Std(1) = Visibility.Visible             ' ExitPar
+      Mortise_Std(2) = Visibility.Collapsed           ' Coolant
+      Mortise_Std(3) = Visibility.Visible             ' CornRad
+      Mortise_Std(4) = Visibility.Visible             ' Diam
+      Mortise_Std(5) = Visibility.Visible             ' TotDiam
+      Mortise_Std(6) = Visibility.Visible             ' Feed
+      Mortise_Std(7) = Visibility.Visible             ' EndFeed
+      Mortise_Std(8) = Visibility.Visible             ' StartFeed
+      Mortise_Std(9) = Visibility.Visible             ' TipFeed
+      Mortise_Std(10) = Visibility.Visible            ' Len
+      Mortise_Std(11) = Visibility.Visible            ' TotLen
+      Mortise_Std(12) = Visibility.Visible            ' MaxMat
+      Mortise_Std(13) = Visibility.Visible            ' LonOffset
+      Mortise_Std(14) = Visibility.Visible            ' RadOffset
+      Mortise_Std(15) = Visibility.Visible            ' Speed
+      Mortise_Std(16) = Visibility.Collapsed          ' SideAng
+      Mortise_Std(17) = Visibility.Visible            ' MaxSpeed
+      Mortise_Std(18) = Visibility.Visible            ' Thick
+      Mortise_Std(19) = Visibility.Collapsed          ' MaxAbsorption
+      Mortise_Std(20) = Visibility.Collapsed          ' MinFeed
+      Mortise_Std(21) = Visibility.Visible            ' Draw
+      Mortise_Std(22) = Visibility.Visible            ' Head
+      Mortise_Std(23) = Visibility.Visible            ' NamePar
+      Mortise_Std(24) = Visibility.Visible            ' UserNotes
+      Mortise_Std(25) = Visibility.Visible            ' TcPOs
 
       'Parametri Compo
-      Compo(0) = Visibility.Hidden             ' Corrector
-      Compo(1) = Visibility.Visible            ' ExitPar
-      Compo(2) = Visibility.Visible            ' Type
-      Compo(3) = Visibility.Hidden             ' Coolant
-      Compo(4) = Visibility.Hidden             ' CornRad
-      Compo(5) = Visibility.Visible            ' Diam
-      Compo(6) = Visibility.Visible            ' TotDiam
-      Compo(7) = Visibility.Visible            ' Feed
-      Compo(8) = Visibility.Visible            ' EndFeed
-      Compo(9) = Visibility.Visible            ' StartFeed
-      Compo(10) = Visibility.Visible           ' TipFeed
-      Compo(11) = Visibility.Visible           ' Len
-      Compo(12) = Visibility.Visible           ' TotLen
-      Compo(13) = Visibility.Visible           ' MaxMat
-      Compo(14) = Visibility.Visible           ' LonOffset
-      Compo(15) = Visibility.Visible           ' RadOffset
-      Compo(16) = Visibility.Visible           ' Speed
-      Compo(17) = Visibility.Hidden            ' SideAng
-      Compo(18) = Visibility.Visible           ' MaxSpeed
-      Compo(19) = Visibility.Hidden            ' Thick
-      Compo(20) = Visibility.Hidden            ' MaxAbsorption
-      Compo(21) = Visibility.Hidden            ' MinFeed
-      Compo(22) = Visibility.Visible           ' Draw
-      Compo(23) = Visibility.Visible           ' Head
-      Compo(24) = Visibility.Visible           ' NamePar
-      Compo(25) = Visibility.Visible           ' UserNotes
-      Compo(26) = Visibility.Visible           ' TcPOs
+      Compo(0) = Visibility.Collapsed                 ' Corrector
+      Compo(1) = Visibility.Visible                   ' ExitPar
+      Compo(2) = Visibility.Collapsed                 ' Coolant
+      Compo(3) = Visibility.Collapsed                 ' CornRad
+      Compo(4) = Visibility.Visible                   ' Diam
+      Compo(5) = Visibility.Visible                   ' TotDiam
+      Compo(6) = Visibility.Visible                   ' Feed
+      Compo(7) = Visibility.Visible                   ' EndFeed
+      Compo(8) = Visibility.Visible                   ' StartFeed
+      Compo(9) = Visibility.Visible                   ' TipFeed
+      Compo(10) = Visibility.Visible                  ' Len
+      Compo(11) = Visibility.Visible                  ' TotLen
+      Compo(12) = Visibility.Visible                  ' MaxMat
+      Compo(13) = Visibility.Visible                  ' LonOffset
+      Compo(14) = Visibility.Visible                  ' RadOffset
+      Compo(15) = Visibility.Visible                  ' Speed
+      Compo(16) = Visibility.Collapsed                ' SideAng
+      Compo(17) = Visibility.Visible                  ' MaxSpeed
+      Compo(18) = Visibility.Collapsed                ' Thick
+      Compo(19) = Visibility.Collapsed                ' MaxAbsorption
+      Compo(20) = Visibility.Collapsed                ' MinFeed
+      Compo(21) = Visibility.Visible                  ' Draw
+      Compo(22) = Visibility.Visible                  ' Head
+      Compo(23) = Visibility.Visible                  ' NamePar
+      Compo(24) = Visibility.Visible                  ' UserNotes
+      Compo(25) = Visibility.Visible                  ' TcPOs
 
       ' Parametri Milling
-      Milling(0) = Visibility.Visible            ' Invert
-      Milling(1) = Visibility.Visible            ' LeaveTab
-      Milling(2) = Visibility.Visible            ' Type
-      Milling(3) = Visibility.Visible            ' WorkSide
-      Milling(4) = Visibility.Hidden             ' HeadSide
-      Milling(5) = Visibility.Visible            ' LeadInType
-      Milling(6) = Visibility.Hidden             ' ExtLinkType
-      Milling(7) = Visibility.Visible            ' LeadOutType
-      Milling(8) = Visibility.Hidden             ' CurveUse
-      Milling(9) = Visibility.Visible            ' StepType
-      Milling(10) = Visibility.Hidden            ' LeadLinkType
-      Milling(11) = Visibility.Visible           ' Speed
-      Milling(12) = Visibility.Visible           ' Feed
-      Milling(13) = Visibility.Visible           ' StartFeed
-      Milling(14) = Visibility.Visible           ' EndFeed
-      Milling(15) = Visibility.Visible           ' TipFeed
-      Milling(16) = Visibility.Visible           ' OffSr
-      Milling(17) = Visibility.Visible           ' OffSl
-      Milling(18) = Visibility.Visible           ' SideAngle
-      Milling(19) = Visibility.Hidden            ' Approx
-      Milling(20) = Visibility.Visible           ' StartPos
-      Milling(21) = Visibility.Hidden            ' StartSlowLen
-      Milling(22) = Visibility.Hidden            ' EndSlowLen
-      Milling(23) = Visibility.Hidden            ' ThroughAddlen
-      Milling(24) = Visibility.Visible           ' StepPar
-      Milling(25) = Visibility.Visible           ' ReturnPos
-      Milling(26) = Visibility.Visible           ' TabLen
-      Milling(27) = Visibility.Visible           ' TabDist
-      Milling(28) = Visibility.Visible           ' TabHeight
-      Milling(29) = Visibility.Visible           ' TabAngle
-      Milling(30) = Visibility.Visible           ' LiTang
-      Milling(31) = Visibility.Visible           ' LiPerp
-      Milling(32) = Visibility.Visible           ' LiElev
-      Milling(33) = Visibility.Visible           ' LiCompLen
-      Milling(34) = Visibility.Visible           ' LoTang
-      Milling(35) = Visibility.Visible           ' LoPerp
-      Milling(36) = Visibility.Visible           ' LoElev
-      Milling(37) = Visibility.Visible           ' LoCompLen
-      Milling(38) = Visibility.Visible           ' StartAddLen
-      Milling(39) = Visibility.Visible           ' EndAddLen
-      Milling(40) = Visibility.Hidden            ' StepExtArc
-      Milling(41) = Visibility.Hidden            ' StepIntArc
-      Milling(42) = Visibility.Hidden            ' SideStep
-      Milling(43) = Visibility.Hidden            ' VertFeed
-      Milling(44) = Visibility.Visible           ' NamePar
-      Milling(45) = Visibility.Visible           ' Tool
-      Milling(46) = Visibility.Visible           ' DepthStr
-      Milling(47) = Visibility.Visible           ' UserNotes
-      Milling(48) = Visibility.Visible           ' OverLapStr
-      Milling(49) = Visibility.Hidden            ' OffsetStr
-      Milling(50) = Visibility.Hidden            ' SubType
+      Milling(0) = Visibility.Visible                 ' Invert
+      Milling(1) = Visibility.Visible                 ' LeaveTab
+      Milling(2) = Visibility.Visible                 ' WorkSide
+      Milling(3) = Visibility.Collapsed               ' HeadSide
+      Milling(4) = Visibility.Visible                 ' LeadInType
+      Milling(5) = Visibility.Collapsed               ' ExtLinkType
+      Milling(6) = Visibility.Visible                 ' LeadOutType
+      Milling(7) = Visibility.Collapsed               ' CurveUse
+      Milling(8) = Visibility.Visible                 ' StepType
+      Milling(9) = Visibility.Collapsed               ' LeadLinkType
+      Milling(10) = Visibility.Visible                ' Speed
+      Milling(11) = Visibility.Visible                ' Feed
+      Milling(12) = Visibility.Visible                ' StartFeed
+      Milling(13) = Visibility.Visible                ' EndFeed
+      Milling(14) = Visibility.Visible                ' TipFeed
+      Milling(15) = Visibility.Visible                ' OffSr
+      Milling(16) = Visibility.Visible                ' OffSl
+      Milling(17) = Visibility.Visible                ' SideAngle
+      Milling(18) = Visibility.Collapsed              ' Approx
+      Milling(19) = Visibility.Visible                ' StartPos
+      Milling(20) = Visibility.Collapsed              ' StartSlowLen
+      Milling(21) = Visibility.Collapsed              ' EndSlowLen
+      Milling(22) = Visibility.Collapsed              ' ThroughAddlen
+      Milling(23) = Visibility.Visible                ' StepPar
+      Milling(24) = Visibility.Visible                ' ReturnPos
+      Milling(25) = Visibility.Visible                ' TabLen
+      Milling(26) = Visibility.Visible                ' TabDist
+      Milling(27) = Visibility.Visible                ' TabHeight
+      Milling(28) = Visibility.Visible                ' TabAngle
+      Milling(29) = Visibility.Visible                ' LiTang
+      Milling(30) = Visibility.Visible                ' LiPerp
+      Milling(31) = Visibility.Visible                ' LiElev
+      Milling(32) = Visibility.Visible                ' LiCompLen
+      Milling(33) = Visibility.Visible                ' LoTang
+      Milling(34) = Visibility.Visible                ' LoPerp
+      Milling(35) = Visibility.Visible                ' LoElev
+      Milling(36) = Visibility.Visible                ' LoCompLen
+      Milling(37) = Visibility.Visible                ' StartAddLen
+      Milling(38) = Visibility.Visible                ' EndAddLen
+      Milling(39) = Visibility.Collapsed              ' StepExtArc
+      Milling(40) = Visibility.Collapsed              ' StepIntArc
+      Milling(41) = Visibility.Collapsed              ' SideStep
+      Milling(42) = Visibility.Collapsed              ' VertFeed
+      Milling(43) = Visibility.Visible                ' NamePar
+      Milling(44) = Visibility.Visible                ' Tool
+      Milling(45) = Visibility.Visible                ' DepthStr
+      Milling(46) = Visibility.Visible                ' UserNotes
+      Milling(47) = Visibility.Visible                ' OverLapStr
+      Milling(48) = Visibility.Collapsed              ' OffsetStr
+      Milling(49) = Visibility.Collapsed              ' SubType
 
       ' Parametri Drilling
-      Drilling(0) = Visibility.Visible            ' Invert
-      Drilling(1) = Visibility.Hidden             ' LeaveTab
-      Drilling(2) = Visibility.Visible            ' Type
-      Drilling(3) = Visibility.Hidden             ' WorkSide
-      Drilling(4) = Visibility.Hidden             ' HeadSide
-      Drilling(5) = Visibility.Hidden             ' LeadInType
-      Drilling(6) = Visibility.Hidden             ' ExtLinkType
-      Drilling(7) = Visibility.Hidden             ' LeadOutType
-      Drilling(8) = Visibility.Hidden             ' CurveUse
-      Drilling(9) = Visibility.Hidden             ' StepType
-      Drilling(10) = Visibility.Hidden            ' LeadLinkType
-      Drilling(11) = Visibility.Visible           ' Speed
-      Drilling(12) = Visibility.Visible           ' Feed
-      Drilling(13) = Visibility.Visible           ' StartFeed
-      Drilling(14) = Visibility.Visible           ' EndFeed
-      Drilling(15) = Visibility.Visible           ' TipFeed
-      Drilling(16) = Visibility.Hidden            ' OffSr
-      Drilling(17) = Visibility.Hidden            ' OffSl
-      Drilling(18) = Visibility.Hidden            ' SideAngle
-      Drilling(19) = Visibility.Hidden            ' Approx
-      Drilling(20) = Visibility.Visible           ' StartPos
-      Drilling(21) = Visibility.Visible           ' StartSlowLen
-      Drilling(22) = Visibility.Visible           ' EndSlowLen
-      Drilling(23) = Visibility.Visible           ' ThroughAddlen
-      Drilling(24) = Visibility.Visible           ' StepPar
-      Drilling(25) = Visibility.Visible           ' ReturnPos
-      Drilling(26) = Visibility.Hidden            ' TabLen
-      Drilling(27) = Visibility.Hidden            ' TabDist
-      Drilling(28) = Visibility.Hidden            ' TabHeight
-      Drilling(29) = Visibility.Hidden            ' TabAngle
-      Drilling(30) = Visibility.Hidden            ' LiTang
-      Drilling(31) = Visibility.Hidden            ' LiPerp
-      Drilling(32) = Visibility.Hidden            ' LiElev
-      Drilling(33) = Visibility.Hidden            ' LiCompLen
-      Drilling(34) = Visibility.Hidden            ' LoTang
-      Drilling(35) = Visibility.Hidden            ' LoPerp
-      Drilling(36) = Visibility.Hidden            ' LoElev
-      Drilling(37) = Visibility.Hidden            ' LoCompLen
-      Drilling(38) = Visibility.Hidden            ' StartAddLen
-      Drilling(39) = Visibility.Hidden            ' EndAddLen
-      Drilling(40) = Visibility.Hidden            ' StepExtArc
-      Drilling(41) = Visibility.Hidden            ' StepIntArc
-      Drilling(42) = Visibility.Hidden            ' SideStep
-      Drilling(43) = Visibility.Hidden            ' VertFeed
-      Drilling(44) = Visibility.Visible           ' NamePar
-      Drilling(45) = Visibility.Visible           ' Tool
-      Drilling(46) = Visibility.Visible           ' DepthStr
-      Drilling(47) = Visibility.Visible           ' UserNotes
-      Drilling(48) = Visibility.Hidden            ' OverLapStr
-      Drilling(49) = Visibility.Hidden            ' OffsetStr
-      Drilling(50) = Visibility.Hidden            ' SubType
+      Drilling(0) = Visibility.Visible                ' Invert
+      Drilling(1) = Visibility.Collapsed              ' LeaveTab
+      Drilling(2) = Visibility.Collapsed              ' WorkSide
+      Drilling(3) = Visibility.Collapsed              ' HeadSide
+      Drilling(4) = Visibility.Collapsed              ' LeadInType
+      Drilling(5) = Visibility.Collapsed              ' ExtLinkType
+      Drilling(6) = Visibility.Collapsed              ' LeadOutType
+      Drilling(7) = Visibility.Collapsed              ' CurveUse
+      Drilling(8) = Visibility.Collapsed              ' StepType
+      Drilling(9) = Visibility.Collapsed              ' LeadLinkType
+      Drilling(10) = Visibility.Visible               ' Speed
+      Drilling(11) = Visibility.Visible               ' Feed
+      Drilling(12) = Visibility.Visible               ' StartFeed
+      Drilling(13) = Visibility.Visible               ' EndFeed
+      Drilling(14) = Visibility.Visible               ' TipFeed
+      Drilling(15) = Visibility.Collapsed             ' OffSr
+      Drilling(16) = Visibility.Collapsed             ' OffSl
+      Drilling(17) = Visibility.Collapsed             ' SideAngle
+      Drilling(18) = Visibility.Collapsed             ' Approx
+      Drilling(19) = Visibility.Visible               ' StartPos
+      Drilling(20) = Visibility.Visible               ' StartSlowLen
+      Drilling(21) = Visibility.Visible               ' EndSlowLen
+      Drilling(22) = Visibility.Visible               ' ThroughAddlen
+      Drilling(23) = Visibility.Visible               ' StepPar
+      Drilling(24) = Visibility.Visible               ' ReturnPos
+      Drilling(25) = Visibility.Collapsed             ' TabLen
+      Drilling(26) = Visibility.Collapsed             ' TabDist
+      Drilling(27) = Visibility.Collapsed             ' TabHeight
+      Drilling(28) = Visibility.Collapsed             ' TabAngle
+      Drilling(29) = Visibility.Collapsed             ' LiTang
+      Drilling(30) = Visibility.Collapsed             ' LiPerp
+      Drilling(31) = Visibility.Collapsed             ' LiElev
+      Drilling(32) = Visibility.Collapsed             ' LiCompLen
+      Drilling(33) = Visibility.Collapsed             ' LoTang
+      Drilling(34) = Visibility.Collapsed             ' LoPerp
+      Drilling(35) = Visibility.Collapsed             ' LoElev
+      Drilling(36) = Visibility.Collapsed             ' LoCompLen
+      Drilling(37) = Visibility.Collapsed             ' StartAddLen
+      Drilling(38) = Visibility.Collapsed             ' EndAddLen
+      Drilling(39) = Visibility.Collapsed             ' StepExtArc
+      Drilling(40) = Visibility.Collapsed             ' StepIntArc
+      Drilling(41) = Visibility.Collapsed             ' SideStep
+      Drilling(42) = Visibility.Collapsed             ' VertFeed
+      Drilling(43) = Visibility.Visible               ' NamePar
+      Drilling(44) = Visibility.Visible               ' Tool
+      Drilling(45) = Visibility.Visible               ' DepthStr
+      Drilling(46) = Visibility.Visible               ' UserNotes
+      Drilling(47) = Visibility.Collapsed             ' OverLapStr
+      Drilling(48) = Visibility.Visible               ' OffsetStr
+      Drilling(49) = Visibility.Visible               ' SubType
 
       ' Parametri Sawing
-      Sawing(0) = Visibility.Visible            ' Invert
-      Sawing(1) = Visibility.Hidden             ' LeaveTab
-      Sawing(2) = Visibility.Visible            ' Type
-      Sawing(3) = Visibility.Visible            ' WorkSide
-      Sawing(4) = Visibility.Visible            ' HeadSide
-      Sawing(5) = Visibility.Visible            ' LeadInType
-      Sawing(6) = Visibility.Visible            ' ExtLinkType
-      Sawing(7) = Visibility.Visible             ' LeadOutType
-      Sawing(8) = Visibility.Visible            ' CurveUse
-      Sawing(9) = Visibility.Visible            ' StepType
-      Sawing(10) = Visibility.Hidden            ' LeadLinkType
-      Sawing(11) = Visibility.Visible           ' Speed
-      Sawing(12) = Visibility.Visible           ' Feed
-      Sawing(13) = Visibility.Visible           ' StartFeed
-      Sawing(14) = Visibility.Visible           ' EndFeed
-      Sawing(15) = Visibility.Visible           ' TipFeed
-      Sawing(16) = Visibility.Visible           ' OffSr
-      Sawing(17) = Visibility.Visible           ' OffSl
-      Sawing(18) = Visibility.Visible           ' SideAngle
-      Sawing(19) = Visibility.Visible           ' Approx
-      Sawing(20) = Visibility.Visible           ' StartPos
-      Sawing(21) = Visibility.Hidden            ' StartSlowLen
-      Sawing(22) = Visibility.Hidden            ' EndSlowLen
-      Sawing(23) = Visibility.Hidden            ' ThroughAddlen
-      Sawing(24) = Visibility.Visible           ' StepPar
-      Sawing(25) = Visibility.Visible           ' ReturnPos
-      Sawing(26) = Visibility.Hidden            ' TabLen
-      Sawing(27) = Visibility.Hidden            ' TabDist
-      Sawing(28) = Visibility.Hidden            ' TabHeight
-      Sawing(29) = Visibility.Hidden            ' TabAngle
-      Sawing(30) = Visibility.Hidden            ' LiTang
-      Sawing(31) = Visibility.Hidden            ' LiPerp
-      Sawing(32) = Visibility.Hidden            ' LiElev
-      Sawing(33) = Visibility.Hidden            ' LiCompLen
-      Sawing(34) = Visibility.Hidden            ' LoTang
-      Sawing(35) = Visibility.Hidden            ' LoPerp
-      Sawing(36) = Visibility.Hidden            ' LoElev
-      Sawing(37) = Visibility.Hidden            ' LoCompLen
-      Sawing(38) = Visibility.Visible           ' StartAddLen
-      Sawing(39) = Visibility.Hidden            ' EndAddLen
-      Sawing(40) = Visibility.Visible           ' StepExtArc
-      Sawing(41) = Visibility.Visible           ' StepIntArc
-      Sawing(42) = Visibility.Hidden            ' SideStep
-      Sawing(43) = Visibility.Hidden            ' VertFeed
-      Sawing(44) = Visibility.Visible           ' NamePar
-      Sawing(45) = Visibility.Visible           ' Tool
-      Sawing(46) = Visibility.Visible           ' DepthStr
-      Sawing(47) = Visibility.Visible           ' UserNotes
-      Sawing(48) = Visibility.Hidden            ' OverLapStr
-      Sawing(49) = Visibility.Hidden            ' OffsetStr
-      Sawing(50) = Visibility.Hidden            ' SubType
+      Sawing(0) = Visibility.Visible                  ' Invert
+      Sawing(1) = Visibility.Collapsed                ' LeaveTab
+      Sawing(2) = Visibility.Visible                  ' WorkSide
+      Sawing(3) = Visibility.Visible                  ' HeadSide
+      Sawing(4) = Visibility.Visible                  ' LeadInType
+      Sawing(5) = Visibility.Visible                  ' ExtLinkType
+      Sawing(6) = Visibility.Visible                  ' LeadOutType
+      Sawing(7) = Visibility.Visible                  ' CurveUse
+      Sawing(8) = Visibility.Visible                  ' StepType
+      Sawing(9) = Visibility.Collapsed                ' LeadLinkType
+      Sawing(10) = Visibility.Visible                 ' Speed
+      Sawing(11) = Visibility.Visible                 ' Feed
+      Sawing(12) = Visibility.Visible                 ' StartFeed
+      Sawing(13) = Visibility.Visible                 ' EndFeed
+      Sawing(14) = Visibility.Visible                 ' TipFeed
+      Sawing(15) = Visibility.Visible                 ' OffSr
+      Sawing(16) = Visibility.Visible                 ' OffSl
+      Sawing(17) = Visibility.Visible                 ' SideAngle
+      Sawing(18) = Visibility.Visible                 ' Approx
+      Sawing(19) = Visibility.Visible                 ' StartPos
+      Sawing(20) = Visibility.Collapsed               ' StartSlowLen
+      Sawing(21) = Visibility.Collapsed               ' EndSlowLen
+      Sawing(22) = Visibility.Collapsed               ' ThroughAddlen
+      Sawing(23) = Visibility.Visible                 ' StepPar
+      Sawing(24) = Visibility.Visible                 ' ReturnPos
+      Sawing(25) = Visibility.Collapsed               ' TabLen
+      Sawing(26) = Visibility.Collapsed               ' TabDist
+      Sawing(27) = Visibility.Collapsed               ' TabHeight
+      Sawing(28) = Visibility.Collapsed               ' TabAngle
+      Sawing(29) = Visibility.Collapsed               ' LiTang
+      Sawing(30) = Visibility.Collapsed               ' LiPerp
+      Sawing(31) = Visibility.Collapsed               ' LiElev
+      Sawing(32) = Visibility.Collapsed               ' LiCompLen
+      Sawing(33) = Visibility.Collapsed               ' LoTang
+      Sawing(34) = Visibility.Collapsed               ' LoPerp
+      Sawing(35) = Visibility.Collapsed               ' LoElev
+      Sawing(36) = Visibility.Collapsed               ' LoCompLen
+      Sawing(37) = Visibility.Visible                 ' StartAddLen
+      Sawing(38) = Visibility.Collapsed               ' EndAddLen
+      Sawing(39) = Visibility.Visible                 ' StepExtArc
+      Sawing(40) = Visibility.Visible                 ' StepIntArc
+      Sawing(41) = Visibility.Collapsed               ' SideStep
+      Sawing(42) = Visibility.Collapsed               ' VertFeed
+      Sawing(43) = Visibility.Visible                 ' NamePar
+      Sawing(44) = Visibility.Visible                 ' Tool
+      Sawing(45) = Visibility.Visible                 ' DepthStr
+      Sawing(46) = Visibility.Visible                 ' UserNotes
+      Sawing(47) = Visibility.Collapsed               ' OverLapStr
+      Sawing(48) = Visibility.Collapsed               ' OffsetStr
+      Sawing(49) = Visibility.Collapsed               ' SubType
 
       ' Parametri Pocketing
-      Pocketing(0) = Visibility.Visible            ' Invert
-      Pocketing(1) = Visibility.Hidden             ' LeaveTab
-      Pocketing(2) = Visibility.Visible            ' Type
-      Pocketing(3) = Visibility.Hidden             ' WorkSide
-      Pocketing(4) = Visibility.Hidden             ' HeadSide
-      Pocketing(5) = Visibility.Hidden             ' LeadInType
-      Pocketing(6) = Visibility.Hidden             ' ExtLinkType
-      Pocketing(7) = Visibility.Hidden             ' LeadOutType
-      Pocketing(8) = Visibility.Hidden             ' CurveUse
-      Pocketing(9) = Visibility.Hidden             ' StepType
-      Pocketing(10) = Visibility.Hidden            ' LeadLinkType
-      Pocketing(11) = Visibility.Visible           ' Speed
-      Pocketing(12) = Visibility.Visible           ' Feed
-      Pocketing(13) = Visibility.Visible           ' StartFeed
-      Pocketing(14) = Visibility.Visible           ' EndFeed
-      Pocketing(15) = Visibility.Visible           ' TipFeed
-      Pocketing(16) = Visibility.Hidden            ' OffSr
-      Pocketing(17) = Visibility.Hidden            ' OffSl
-      Pocketing(18) = Visibility.Hidden            ' SideAngle
-      Pocketing(19) = Visibility.Hidden            ' Approx
-      Pocketing(20) = Visibility.Visible           ' StartPos
-      Pocketing(21) = Visibility.Hidden            ' StartSlowLen
-      Pocketing(22) = Visibility.Hidden            ' EndSlowLen
-      Pocketing(23) = Visibility.Hidden            ' ThroughAddlen
-      Pocketing(24) = Visibility.Hidden            ' StepPar
-      Pocketing(25) = Visibility.Visible           ' ReturnPos
-      Pocketing(26) = Visibility.Hidden            ' TabLen
-      Pocketing(27) = Visibility.Hidden            ' TabDist
-      Pocketing(28) = Visibility.Hidden            ' TabHeight
-      Pocketing(29) = Visibility.Hidden            ' TabAngle
-      Pocketing(30) = Visibility.Hidden            ' LiTang
-      Pocketing(31) = Visibility.Hidden            ' LiPerp
-      Pocketing(32) = Visibility.Hidden            ' LiElev
-      Pocketing(33) = Visibility.Hidden            ' LiCompLen
-      Pocketing(34) = Visibility.Hidden            ' LoTang
-      Pocketing(35) = Visibility.Hidden            ' LoPerp
-      Pocketing(36) = Visibility.Hidden            ' LoElev
-      Pocketing(37) = Visibility.Hidden            ' LoCompLen
-      Pocketing(38) = Visibility.Hidden            ' StartAddLen
-      Pocketing(39) = Visibility.Hidden            ' EndAddLen
-      Pocketing(40) = Visibility.Hidden            ' StepExtArc
-      Pocketing(41) = Visibility.Hidden            ' StepIntArc
-      Pocketing(42) = Visibility.Hidden            ' SideStep
-      Pocketing(43) = Visibility.Hidden            ' VertFeed
-      Pocketing(44) = Visibility.Visible           ' NamePar
-      Pocketing(45) = Visibility.Visible           ' Tool
-      Pocketing(46) = Visibility.Visible           ' DepthStr
-      Pocketing(47) = Visibility.Visible           ' UserNotes
-      Pocketing(48) = Visibility.Hidden            ' OverLapStr
-      Pocketing(49) = Visibility.Hidden            ' OffsetStr
-      Pocketing(50) = Visibility.Hidden            ' SubType
+      Pocketing(0) = Visibility.Visible               ' Invert
+      Pocketing(1) = Visibility.Collapsed             ' LeaveTab
+      Pocketing(2) = Visibility.Collapsed             ' WorkSide
+      Pocketing(3) = Visibility.Collapsed             ' HeadSide
+      Pocketing(4) = Visibility.Collapsed             ' LeadInType
+      Pocketing(5) = Visibility.Collapsed             ' ExtLinkType
+      Pocketing(6) = Visibility.Collapsed             ' LeadOutType
+      Pocketing(7) = Visibility.Collapsed             ' CurveUse
+      Pocketing(8) = Visibility.Collapsed             ' StepType
+      Pocketing(9) = Visibility.Collapsed             ' LeadLinkType
+      Pocketing(10) = Visibility.Visible              ' Speed
+      Pocketing(11) = Visibility.Visible              ' Feed
+      Pocketing(12) = Visibility.Visible              ' StartFeed
+      Pocketing(13) = Visibility.Visible              ' EndFeed
+      Pocketing(14) = Visibility.Visible              ' TipFeed
+      Pocketing(15) = Visibility.Collapsed            ' OffSr
+      Pocketing(16) = Visibility.Collapsed            ' OffSl
+      Pocketing(17) = Visibility.Collapsed            ' SideAngle
+      Pocketing(18) = Visibility.Collapsed            ' Approx
+      Pocketing(19) = Visibility.Visible              ' StartPos
+      Pocketing(20) = Visibility.Collapsed            ' StartSlowLen
+      Pocketing(21) = Visibility.Collapsed            ' EndSlowLen
+      Pocketing(22) = Visibility.Collapsed            ' ThroughAddlen
+      Pocketing(23) = Visibility.Collapsed            ' StepPar
+      Pocketing(24) = Visibility.Visible              ' ReturnPos
+      Pocketing(25) = Visibility.Collapsed            ' TabLen
+      Pocketing(26) = Visibility.Collapsed            ' TabDist
+      Pocketing(27) = Visibility.Collapsed            ' TabHeight
+      Pocketing(28) = Visibility.Collapsed            ' TabAngle
+      Pocketing(29) = Visibility.Collapsed            ' LiTang
+      Pocketing(30) = Visibility.Collapsed            ' LiPerp
+      Pocketing(31) = Visibility.Collapsed            ' LiElev
+      Pocketing(32) = Visibility.Collapsed            ' LiCompLen
+      Pocketing(33) = Visibility.Collapsed            ' LoTang
+      Pocketing(34) = Visibility.Collapsed            ' LoPerp
+      Pocketing(35) = Visibility.Collapsed            ' LoElev
+      Pocketing(36) = Visibility.Collapsed            ' LoCompLen
+      Pocketing(37) = Visibility.Collapsed            ' StartAddLen
+      Pocketing(38) = Visibility.Collapsed            ' EndAddLen
+      Pocketing(39) = Visibility.Collapsed            ' StepExtArc
+      Pocketing(40) = Visibility.Collapsed            ' StepIntArc
+      Pocketing(41) = Visibility.Collapsed            ' SideStep
+      Pocketing(42) = Visibility.Collapsed            ' VertFeed
+      Pocketing(43) = Visibility.Visible              ' NamePar
+      Pocketing(44) = Visibility.Visible              ' Tool
+      Pocketing(45) = Visibility.Visible              ' DepthStr
+      Pocketing(46) = Visibility.Visible              ' UserNotes
+      Pocketing(47) = Visibility.Collapsed            ' OverLapStr
+      Pocketing(48) = Visibility.Collapsed            ' OffsetStr
+      Pocketing(49) = Visibility.Collapsed            ' SubType
 
       ' Parametri Mortising
-      Mortising(0) = Visibility.Visible            ' Invert
-      Mortising(1) = Visibility.Hidden             ' LeaveTab
-      Mortising(2) = Visibility.Visible            ' Type
-      Mortising(3) = Visibility.Hidden             ' WorkSide
-      Mortising(4) = Visibility.Hidden             ' HeadSide
-      Mortising(5) = Visibility.Hidden             ' LeadInType
-      Mortising(6) = Visibility.Hidden             ' ExtLinkType
-      Mortising(7) = Visibility.Hidden             ' LeadOutType
-      Mortising(8) = Visibility.Hidden             ' CurveUse
-      Mortising(9) = Visibility.Hidden             ' StepType
-      Mortising(10) = Visibility.Hidden            ' LeadLinkType
-      Mortising(11) = Visibility.Visible           ' Speed
-      Mortising(12) = Visibility.Visible           ' Feed
-      Mortising(13) = Visibility.Visible           ' StartFeed
-      Mortising(14) = Visibility.Visible           ' EndFeed
-      Mortising(15) = Visibility.Visible           ' TipFeed
-      Mortising(16) = Visibility.Hidden            ' OffSr
-      Mortising(17) = Visibility.Hidden            ' OffSl
-      Mortising(18) = Visibility.Hidden            ' SideAngle
-      Mortising(19) = Visibility.Hidden            ' Approx
-      Mortising(20) = Visibility.Visible           ' StartPos
-      Mortising(21) = Visibility.Hidden            ' StartSlowLen
-      Mortising(22) = Visibility.Hidden            ' EndSlowLen
-      Mortising(23) = Visibility.Hidden            ' ThroughAddlen
-      Mortising(24) = Visibility.Hidden            ' StepPar
-      Mortising(25) = Visibility.Visible           ' Returnpos
-      Mortising(26) = Visibility.Hidden            ' TabLen
-      Mortising(27) = Visibility.Hidden            ' TabDist
-      Mortising(28) = Visibility.Hidden            ' TabHeight
-      Mortising(29) = Visibility.Hidden            ' TabAngle
-      Mortising(30) = Visibility.Hidden            ' LiTang
-      Mortising(31) = Visibility.Hidden            ' LiPerp
-      Mortising(32) = Visibility.Hidden            ' LiElev
-      Mortising(33) = Visibility.Hidden            ' LiCompLen
-      Mortising(34) = Visibility.Hidden            ' LoTang
-      Mortising(35) = Visibility.Hidden            ' LoPerp
-      Mortising(36) = Visibility.Hidden            ' LoElev
-      Mortising(37) = Visibility.Hidden            ' LoCompLen
-      Mortising(38) = Visibility.Hidden            ' StartAddLen
-      Mortising(39) = Visibility.Hidden            ' EndAddLen
-      Mortising(40) = Visibility.Hidden            ' StepExtArc
-      Mortising(41) = Visibility.Hidden            ' StepIntArc
-      Mortising(42) = Visibility.Hidden            ' SideStep
-      Mortising(43) = Visibility.Hidden            ' VertFeed
-      Mortising(44) = Visibility.Visible           ' Name
-      Mortising(45) = Visibility.Visible           ' Tool
-      Mortising(46) = Visibility.Visible           ' DepthStr
-      Mortising(47) = Visibility.Visible           ' UserNotes
-      Mortising(48) = Visibility.Hidden            ' OverLapStr
-      Mortising(49) = Visibility.Hidden            ' OffsetStr
-      Mortising(50) = Visibility.Hidden            ' SubType
+      Mortising(0) = Visibility.Visible               ' Invert
+      Mortising(1) = Visibility.Collapsed             ' LeaveTab
+      Mortising(2) = Visibility.Collapsed             ' WorkSide
+      Mortising(3) = Visibility.Collapsed             ' HeadSide
+      Mortising(4) = Visibility.Collapsed             ' LeadInType
+      Mortising(5) = Visibility.Collapsed             ' ExtLinkType
+      Mortising(6) = Visibility.Collapsed             ' LeadOutType
+      Mortising(7) = Visibility.Collapsed             ' CurveUse
+      Mortising(8) = Visibility.Collapsed             ' StepType
+      Mortising(9) = Visibility.Collapsed             ' LeadLinkType
+      Mortising(10) = Visibility.Visible              ' Speed
+      Mortising(11) = Visibility.Visible              ' Feed
+      Mortising(12) = Visibility.Visible              ' StartFeed
+      Mortising(13) = Visibility.Visible              ' EndFeed
+      Mortising(14) = Visibility.Visible              ' TipFeed
+      Mortising(15) = Visibility.Collapsed            ' OffSr
+      Mortising(16) = Visibility.Collapsed            ' OffSl
+      Mortising(17) = Visibility.Collapsed            ' SideAngle
+      Mortising(18) = Visibility.Collapsed            ' Approx
+      Mortising(19) = Visibility.Visible              ' StartPos
+      Mortising(20) = Visibility.Collapsed            ' StartSlowLen
+      Mortising(21) = Visibility.Collapsed            ' EndSlowLen
+      Mortising(22) = Visibility.Collapsed            ' ThroughAddlen
+      Mortising(23) = Visibility.Collapsed            ' StepPar
+      Mortising(24) = Visibility.Visible              ' Returnpos
+      Mortising(25) = Visibility.Collapsed            ' TabLen
+      Mortising(26) = Visibility.Collapsed            ' TabDist
+      Mortising(27) = Visibility.Collapsed            ' TabHeight
+      Mortising(28) = Visibility.Collapsed            ' TabAngle
+      Mortising(29) = Visibility.Collapsed            ' LiTang
+      Mortising(30) = Visibility.Collapsed            ' LiPerp
+      Mortising(31) = Visibility.Collapsed            ' LiElev
+      Mortising(32) = Visibility.Collapsed            ' LiCompLen
+      Mortising(33) = Visibility.Collapsed            ' LoTang
+      Mortising(34) = Visibility.Collapsed            ' LoPerp
+      Mortising(35) = Visibility.Collapsed            ' LoElev
+      Mortising(36) = Visibility.Collapsed            ' LoCompLen
+      Mortising(37) = Visibility.Collapsed            ' StartAddLen
+      Mortising(38) = Visibility.Collapsed            ' EndAddLen
+      Mortising(39) = Visibility.Collapsed            ' StepExtArc
+      Mortising(40) = Visibility.Collapsed            ' StepIntArc
+      Mortising(41) = Visibility.Collapsed            ' SideStep
+      Mortising(42) = Visibility.Collapsed            ' VertFeed
+      Mortising(43) = Visibility.Visible              ' Name
+      Mortising(44) = Visibility.Visible              ' Tool
+      Mortising(45) = Visibility.Visible              ' DepthStr
+      Mortising(46) = Visibility.Visible              ' UserNotes
+      Mortising(47) = Visibility.Collapsed            ' OverLapStr
+      Mortising(48) = Visibility.Collapsed            ' OffsetStr
+      Mortising(49) = Visibility.Collapsed            ' SubType
 
       ' Parametri Sawroughing
-      Sawroughing(0) = Visibility.Visible            ' Invert
-      Sawroughing(1) = Visibility.Hidden             ' LeaveTab
-      Sawroughing(2) = Visibility.Visible            ' Type
-      Sawroughing(3) = Visibility.Hidden             ' WorkSide
-      Sawroughing(4) = Visibility.Visible            ' HeadSide
-      Sawroughing(5) = Visibility.Visible            ' LeadInType
-      Sawroughing(6) = Visibility.Hidden             ' ExtLinkType
-      Sawroughing(7) = Visibility.Hidden             ' LeadOutType
-      Sawroughing(8) = Visibility.Hidden             ' CurveUse
-      Sawroughing(9) = Visibility.Visible            ' StepType
-      Sawroughing(10) = Visibility.Visible           ' LeadLinkType
-      Sawroughing(11) = Visibility.Visible           ' Speed
-      Sawroughing(12) = Visibility.Visible           ' Feed
-      Sawroughing(13) = Visibility.Visible           ' StartFeed
-      Sawroughing(14) = Visibility.Visible           ' EndFeed
-      Sawroughing(15) = Visibility.Visible           ' TipFeed
-      Sawroughing(16) = Visibility.Hidden            ' OffSr
-      Sawroughing(17) = Visibility.Hidden            ' OffSl
-      Sawroughing(18) = Visibility.Hidden            ' SideAngle
-      Sawroughing(19) = Visibility.Hidden            ' Approx
-      Sawroughing(20) = Visibility.Visible           ' StartPos
-      Sawroughing(21) = Visibility.Hidden            ' StartSlowLen
-      Sawroughing(22) = Visibility.Hidden            ' EndSlowLen
-      Sawroughing(23) = Visibility.Hidden            ' ThroughAddlen
-      Sawroughing(24) = Visibility.Visible           ' StepPar
-      Sawroughing(25) = Visibility.Visible           ' Returnpos
-      Sawroughing(26) = Visibility.Hidden            ' TabLen
-      Sawroughing(27) = Visibility.Hidden            ' TabDist
-      Sawroughing(28) = Visibility.Hidden            ' TabHeight
-      Sawroughing(29) = Visibility.Hidden            ' TabAngle
-      Sawroughing(30) = Visibility.Hidden            ' LiTang
-      Sawroughing(31) = Visibility.Hidden            ' LiPerp
-      Sawroughing(32) = Visibility.Hidden            ' LiElev
-      Sawroughing(33) = Visibility.Hidden            ' LiCompLen
-      Sawroughing(34) = Visibility.Hidden            ' LoTang
-      Sawroughing(35) = Visibility.Hidden            ' LoPerp
-      Sawroughing(36) = Visibility.Hidden            ' LoElev
-      Sawroughing(37) = Visibility.Hidden            ' LoCompLen
-      Sawroughing(38) = Visibility.Hidden            ' StartAddLen
-      Sawroughing(39) = Visibility.Hidden            ' EndAddLen
-      Sawroughing(40) = Visibility.Hidden            ' StepExtArc
-      Sawroughing(41) = Visibility.Hidden            ' StepIntArc
-      Sawroughing(42) = Visibility.Visible           ' SideStep
-      Sawroughing(43) = Visibility.Visible           ' VertFeed
-      Sawroughing(44) = Visibility.Visible           ' Name
-      Sawroughing(45) = Visibility.Visible           ' Tool
-      Sawroughing(46) = Visibility.Visible           ' DepthStr
-      Sawroughing(47) = Visibility.Visible           ' UserNotes
-      Sawroughing(48) = Visibility.Hidden            ' OverLapStr
-      Sawroughing(49) = Visibility.Hidden            ' OffsetStr
-      Sawroughing(50) = Visibility.Hidden            ' SubType
+      Sawroughing(0) = Visibility.Visible             ' Invert
+      Sawroughing(1) = Visibility.Collapsed           ' LeaveTab
+      Sawroughing(2) = Visibility.Collapsed           ' WorkSide
+      Sawroughing(3) = Visibility.Visible             ' HeadSide
+      Sawroughing(4) = Visibility.Collapsed           ' LeadInType
+      Sawroughing(5) = Visibility.Collapsed           ' ExtLinkType
+      Sawroughing(6) = Visibility.Collapsed           ' LeadOutType
+      Sawroughing(7) = Visibility.Collapsed           ' CurveUse
+      Sawroughing(8) = Visibility.Visible             ' StepType
+      Sawroughing(9) = Visibility.Visible             ' LeadLinkType
+      Sawroughing(10) = Visibility.Visible            ' Speed
+      Sawroughing(11) = Visibility.Visible            ' Feed
+      Sawroughing(12) = Visibility.Visible            ' StartFeed
+      Sawroughing(13) = Visibility.Visible            ' EndFeed
+      Sawroughing(14) = Visibility.Visible            ' TipFeed
+      Sawroughing(15) = Visibility.Collapsed          ' OffSr
+      Sawroughing(16) = Visibility.Collapsed          ' OffSl
+      Sawroughing(17) = Visibility.Collapsed          ' SideAngle
+      Sawroughing(18) = Visibility.Collapsed          ' Approx
+      Sawroughing(19) = Visibility.Visible            ' StartPos
+      Sawroughing(20) = Visibility.Collapsed          ' StartSlowLen
+      Sawroughing(21) = Visibility.Collapsed          ' EndSlowLen
+      Sawroughing(22) = Visibility.Collapsed          ' ThroughAddlen
+      Sawroughing(23) = Visibility.Visible            ' StepPar
+      Sawroughing(24) = Visibility.Visible            ' Returnpos
+      Sawroughing(25) = Visibility.Collapsed          ' TabLen
+      Sawroughing(26) = Visibility.Collapsed          ' TabDist
+      Sawroughing(27) = Visibility.Collapsed          ' TabHeight
+      Sawroughing(28) = Visibility.Collapsed          ' TabAngle
+      Sawroughing(29) = Visibility.Collapsed          ' LiTang
+      Sawroughing(30) = Visibility.Collapsed          ' LiPerp
+      Sawroughing(31) = Visibility.Collapsed          ' LiElev
+      Sawroughing(32) = Visibility.Collapsed          ' LiCompLen
+      Sawroughing(33) = Visibility.Collapsed          ' LoTang
+      Sawroughing(34) = Visibility.Collapsed          ' LoPerp
+      Sawroughing(35) = Visibility.Collapsed          ' LoElev
+      Sawroughing(36) = Visibility.Collapsed          ' LoCompLen
+      Sawroughing(37) = Visibility.Collapsed          ' StartAddLen
+      Sawroughing(38) = Visibility.Collapsed          ' EndAddLen
+      Sawroughing(39) = Visibility.Collapsed          ' StepExtArc
+      Sawroughing(40) = Visibility.Collapsed          ' StepIntArc
+      Sawroughing(41) = Visibility.Visible            ' SideStep
+      Sawroughing(42) = Visibility.Visible            ' VertFeed
+      Sawroughing(43) = Visibility.Visible            ' Name
+      Sawroughing(44) = Visibility.Visible            ' Tool
+      Sawroughing(45) = Visibility.Visible            ' DepthStr
+      Sawroughing(46) = Visibility.Visible            ' UserNotes
+      Sawroughing(47) = Visibility.Collapsed          ' OverLapStr
+      Sawroughing(48) = Visibility.Collapsed          ' OffsetStr
+      Sawroughing(49) = Visibility.Collapsed          ' SubType
 
       ' Parametri Sawfinishing
       Sawfinishing(0) = Visibility.Visible            ' Invert
-      Sawfinishing(1) = Visibility.Hidden             ' LeaveTab
-      Sawfinishing(2) = Visibility.Visible            ' Type
-      Sawfinishing(3) = Visibility.Hidden             ' WorkSide
-      Sawfinishing(4) = Visibility.Visible            ' HeadSide
-      Sawfinishing(5) = Visibility.Visible            ' LeadInType
-      Sawfinishing(6) = Visibility.Hidden             ' ExtLinkType
-      Sawfinishing(7) = Visibility.Hidden             ' LeadOutType
-      Sawfinishing(8) = Visibility.Hidden             ' CurveUse
-      Sawfinishing(9) = Visibility.Visible            ' StepType
-      Sawfinishing(10) = Visibility.Visible            ' LeadLinkType
-      Sawfinishing(11) = Visibility.Visible           ' Speed
-      Sawfinishing(12) = Visibility.Visible           ' Feed
-      Sawfinishing(13) = Visibility.Visible           ' StartFeed
-      Sawfinishing(14) = Visibility.Visible           ' EndFeed
-      Sawfinishing(15) = Visibility.Visible           ' TipFeed
-      Sawfinishing(16) = Visibility.Hidden            ' OffSr
-      Sawfinishing(17) = Visibility.Hidden            ' OffSl
-      Sawfinishing(18) = Visibility.Hidden            ' SideAngle
-      Sawfinishing(19) = Visibility.Hidden            ' Approx
-      Sawfinishing(20) = Visibility.Visible           ' StartPos
-      Sawfinishing(21) = Visibility.Hidden            ' StartSlowLen
-      Sawfinishing(22) = Visibility.Hidden            ' EndSlowLen
-      Sawfinishing(23) = Visibility.Hidden            ' ThroughAddlen
-      Sawfinishing(24) = Visibility.Visible           ' StepPar
-      Sawfinishing(25) = Visibility.Visible           ' Returnpos
-      Sawfinishing(26) = Visibility.Hidden            ' TabLen
-      Sawfinishing(27) = Visibility.Hidden            ' TabDist
-      Sawfinishing(28) = Visibility.Hidden            ' TabHeight
-      Sawfinishing(29) = Visibility.Hidden            ' TabAngle
-      Sawfinishing(30) = Visibility.Hidden            ' LiTang
-      Sawfinishing(31) = Visibility.Hidden            ' LiPerp
-      Sawfinishing(32) = Visibility.Hidden            ' LiElev
-      Sawfinishing(33) = Visibility.Hidden            ' LiCompLen
-      Sawfinishing(34) = Visibility.Hidden            ' LoTang
-      Sawfinishing(35) = Visibility.Hidden            ' LoPerp
-      Sawfinishing(36) = Visibility.Hidden            ' LoElev
-      Sawfinishing(37) = Visibility.Hidden            ' LoCompLen
-      Sawfinishing(38) = Visibility.Hidden            ' StartAddLen
-      Sawfinishing(39) = Visibility.Hidden            ' EndAddLen
-      Sawfinishing(40) = Visibility.Hidden            ' StepExtArc
-      Sawfinishing(41) = Visibility.Hidden            ' StepIntArc
-      Sawfinishing(42) = Visibility.Visible           ' SideStep
-      Sawfinishing(43) = Visibility.Visible           ' VertFeed
-      Sawfinishing(44) = Visibility.Visible           ' Name
-      Sawfinishing(45) = Visibility.Visible           ' Tool
-      Sawfinishing(46) = Visibility.Visible           ' DepthStr
-      Sawfinishing(47) = Visibility.Visible           ' UserNotes
-      Sawfinishing(48) = Visibility.Hidden            ' OverLapStr
-      Sawfinishing(49) = Visibility.Hidden            ' OffsetStr
-      Sawfinishing(50) = Visibility.Visible           ' SubType
+      Sawfinishing(1) = Visibility.Collapsed          ' LeaveTab
+      Sawfinishing(2) = Visibility.Collapsed          ' WorkSide
+      Sawfinishing(3) = Visibility.Visible            ' HeadSide
+      Sawfinishing(4) = Visibility.Collapsed          ' LeadInType
+      Sawfinishing(5) = Visibility.Collapsed          ' ExtLinkType
+      Sawfinishing(6) = Visibility.Collapsed          ' LeadOutType
+      Sawfinishing(7) = Visibility.Collapsed          ' CurveUse
+      Sawfinishing(8) = Visibility.Visible            ' StepType
+      Sawfinishing(9) = Visibility.Visible            ' LeadLinkType
+      Sawfinishing(10) = Visibility.Visible           ' Speed
+      Sawfinishing(11) = Visibility.Visible           ' Feed
+      Sawfinishing(12) = Visibility.Visible           ' StartFeed
+      Sawfinishing(13) = Visibility.Visible           ' EndFeed
+      Sawfinishing(14) = Visibility.Visible           ' TipFeed
+      Sawfinishing(15) = Visibility.Collapsed         ' OffSr
+      Sawfinishing(16) = Visibility.Collapsed         ' OffSl
+      Sawfinishing(17) = Visibility.Collapsed         ' SideAngle
+      Sawfinishing(18) = Visibility.Collapsed         ' Approx
+      Sawfinishing(19) = Visibility.Visible           ' StartPos
+      Sawfinishing(20) = Visibility.Collapsed         ' StartSlowLen
+      Sawfinishing(21) = Visibility.Collapsed         ' EndSlowLen
+      Sawfinishing(22) = Visibility.Collapsed         ' ThroughAddlen
+      Sawfinishing(23) = Visibility.Visible           ' StepPar
+      Sawfinishing(24) = Visibility.Visible           ' Returnpos
+      Sawfinishing(25) = Visibility.Collapsed         ' TabLen
+      Sawfinishing(26) = Visibility.Collapsed         ' TabDist
+      Sawfinishing(27) = Visibility.Collapsed         ' TabHeight
+      Sawfinishing(28) = Visibility.Collapsed         ' TabAngle
+      Sawfinishing(29) = Visibility.Collapsed         ' LiTang
+      Sawfinishing(30) = Visibility.Collapsed         ' LiPerp
+      Sawfinishing(31) = Visibility.Collapsed         ' LiElev
+      Sawfinishing(32) = Visibility.Collapsed         ' LiCompLen
+      Sawfinishing(33) = Visibility.Collapsed         ' LoTang
+      Sawfinishing(34) = Visibility.Collapsed         ' LoPerp
+      Sawfinishing(35) = Visibility.Collapsed         ' LoElev
+      Sawfinishing(36) = Visibility.Collapsed         ' LoCompLen
+      Sawfinishing(37) = Visibility.Collapsed         ' StartAddLen
+      Sawfinishing(38) = Visibility.Collapsed         ' EndAddLen
+      Sawfinishing(39) = Visibility.Collapsed         ' StepExtArc
+      Sawfinishing(40) = Visibility.Collapsed         ' StepIntArc
+      Sawfinishing(41) = Visibility.Visible           ' SideStep
+      Sawfinishing(42) = Visibility.Visible           ' VertFeed
+      Sawfinishing(43) = Visibility.Visible           ' Name
+      Sawfinishing(44) = Visibility.Visible           ' Tool
+      Sawfinishing(45) = Visibility.Visible           ' DepthStr
+      Sawfinishing(46) = Visibility.Visible           ' UserNotes
+      Sawfinishing(47) = Visibility.Collapsed         ' OverLapStr
+      Sawfinishing(48) = Visibility.Collapsed         ' OffsetStr
+      Sawfinishing(49) = Visibility.Visible           ' SubType
 
    End Sub
 
diff --git a/Special/Doors.vb b/Special/Doors.vb
new file mode 100644
index 0000000..0344a72
--- /dev/null
+++ b/Special/Doors.vb
@@ -0,0 +1,68 @@
+'----------------------------------------------------------------------------
+'  EgalTech 2016-2016
+'----------------------------------------------------------------------------
+' File : Doors.vb       Data : 22.06.16        Versione : 1.6r10
+' Contenuto : Classe Doors (interfaccia per script Porte).
+'
+'
+'
+' Modifiche : 22.06.16 DS Creazione modulo.
+'
+'
+'----------------------------------------------------------------------------
+
+Imports Microsoft.VisualBasic
+Imports EgtUILib
+
+Public Module Doors
+
+   Function ExecDoors(ByRef scene As Scene) As Boolean
+      ' Direttorio corrente per file DDF
+      Dim sDir As String = String.Empty
+      GetPrivateProfileString(S_DOORS, K_DDFDIR, "", sDir)
+      ' Scelta file DDF
+      Dim OpenFileDialog As New System.Windows.Forms.OpenFileDialog
+      OpenFileDialog.Title = "Open DDF file"
+      OpenFileDialog.Filter = "Door Description Format(*.ddf)|*.ddf"
+      OpenFileDialog.FilterIndex = 1
+      OpenFileDialog.InitialDirectory = sDir
+      If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
+         Return True
+      End If
+      Dim sFile As String = OpenFileDialog.FileName
+      System.IO.Path.GetDirectoryName(sFile)
+      WritePrivateProfileString(S_DOORS, K_DDFDIR, System.IO.Path.GetDirectoryName(sFile))
+
+      ' Generazione porta
+      ' Cursore attesa
+      scene.Cursor = System.Windows.Forms.Cursors.WaitCursor
+      ' Creazione porta
+      Dim bOk As Boolean = CreateDoors(sFile, False)
+      ' Aggiorno la visualizzazione
+      EgtZoom(ZM.ALL)
+      ' Cursore standard
+      scene.Cursor = System.Windows.Forms.Cursors.Default
+
+      Return bOk
+   End Function
+
+   Function CreateDoors(ByRef sDdfFile As String, bNcGen As Boolean) As Boolean
+      ' Carico il file
+      Dim sExecPath As String = String.Empty
+      GetPrivateProfileString(S_DOORS, K_DDFEXEC, "", sExecPath)
+      If Not EgtLuaExecFile(sExecPath) Then Return False
+      ' Lancio la creazione
+      EgtLuaSetGlobStringVar("DGD.FILE", sDdfFile)
+      EgtLuaSetGlobBoolVar("DGD.NCGEN", bNcGen)
+      Dim sFunction As String = String.Empty
+      GetPrivateProfileString(S_DOORS, K_DDFFUNCTION, "", sFunction)
+      Dim bOk As Boolean = EgtLuaExecLine(sFunction)
+      Dim nErr As Integer = 999
+      If Not EgtLuaGetGlobIntVar("DGD.ERR", nErr) Or nErr <> 0 Then bOk = False
+      EgtOutLog("Err=" & nErr.ToString())
+      ' Cancello variabile globale
+      EgtLuaResetGlobVar("DGD")
+      Return bOk
+   End Function
+
+End Module
diff --git a/StatusBar/StatusBarView.xaml b/StatusBar/StatusBarView.xaml
index d96a838..af3dd5e 100644
--- a/StatusBar/StatusBarView.xaml
+++ b/StatusBar/StatusBarView.xaml
@@ -52,7 +52,10 @@
          <Button Command="{Binding StatusUnitsCommand}" Content="{Binding StatusUnitsText}" Width="35"/>
       </StatusBarItem>
       <StatusBarItem Grid.Column="8">
-         <ComboBox Height="20" Width="150"/>
+         <!--Combobox per selezionare la macchina corrente-->
+         <ComboBox ItemsSource="{Binding Path=MachinesList}" DisplayMemberPath="Name"
+            SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
+            Height="20" Width="150"/>
       </StatusBarItem>
    </StatusBar>
 </UserControl>
diff --git a/StatusBar/StatusBarViewModel.vb b/StatusBar/StatusBarViewModel.vb
index 2711fb4..e197321 100644
--- a/StatusBar/StatusBarViewModel.vb
+++ b/StatusBar/StatusBarViewModel.vb
@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
 
 Namespace EgtCAM5
 
@@ -107,6 +109,35 @@ Namespace EgtCAM5
          End Set
       End Property
 
+      ' Lista delle macchine disponibili nel programma
+      Private m_MachinesList As New ObservableCollection(Of Machine)
+      Public Property MachinesList As ObservableCollection(Of Machine)
+         Get
+            Return m_MachinesList
+         End Get
+         Set(value As ObservableCollection(Of Machine))
+            m_MachinesList = value
+         End Set
+      End Property
+      ' Macchina correntemente selezionata e quindi attiva
+      Private m_SelectedMachine As Machine
+      Public Property SelectedMachine As Machine
+         Get
+            Return m_SelectedMachine
+         End Get
+         Set(value As Machine)
+            If value IsNot m_SelectedMachine Then
+               m_SelectedMachine = value
+               EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
+               EgtSetCurrMachine(m_SelectedMachine.Name)
+               IniFile.m_sDbsCurrMachIniFilePath = m_SelectedMachine.MachineDirPath & "\" & m_SelectedMachine.Name & ".ini"
+               IniFile.m_sTdbCurrMachToolsDirPath = m_SelectedMachine.MachineDirPath & "\Tools"
+               Application.Msn.NotifyColleagues(Application.LOADSELECTEDMACHINE)
+               OnPropertyChanged("SelectedMachine")
+            End If
+         End Set
+      End Property
+
       ' Commands definition
       Private m_cmdStatusGrid As ICommand
       Private m_cmdCurrPosType As ICommand
@@ -146,7 +177,31 @@ Namespace EgtCAM5
          Application.Msn.Register(Application.STATUSSNAPPOINTTYPEBACKGROUND, Sub(Color As SolidColorBrush)
                                                                                 SnapPointTypeBackground = Color
                                                                              End Sub)
-
+         SearchMachine()
+         Application.Msn.Register(Application.LOADCURRENTMACHINE, Sub()
+                                                                     Dim CurrMach As String = String.Empty
+                                                                     GetPrivateProfileString(S_MACH, K_CURRMACH, String.Empty, CurrMach)
+                                                                     If Not String.IsNullOrEmpty(CurrMach) Then
+                                                                        Dim Temp As Boolean = False
+                                                                        For Each Mach In MachinesList
+                                                                           If Mach.Name = CurrMach Then
+                                                                              Temp = True
+                                                                              SelectedMachine = Mach
+                                                                              Exit For
+                                                                           End If
+                                                                        Next
+                                                                        If Not Temp And MachinesList.Count > 0 Then
+                                                                           SelectedMachine = MachinesList(0)
+                                                                        End If
+                                                                     Else
+                                                                        If MachinesList.Count > 0 Then
+                                                                           SelectedMachine = MachinesList(0)
+                                                                        End If
+                                                                     End If
+                                                                  End Sub)
+         Application.Msn.Register(Application.SAVECURRENTMACHINE, Sub()
+                                                                     WritePrivateProfileString(S_MACH, K_CURRMACH, SelectedMachine.Name)
+                                                                  End Sub)
       End Sub
 
 #End Region    ' Constructor
@@ -283,6 +338,38 @@ Namespace EgtCAM5
          EgtSetGridShow(bShowGrid, bShowGrid And bShowGridFrame)
       End Sub
 
+      ''' <summary>
+      ''' Method that search the machines in the correct folder and add to the MachinesList those valid.
+      ''' </summary>
+      Private Sub SearchMachine()
+         Dim TempArray As String() = Directory.GetDirectories(IniFile.m_sMachinesRoot)
+         For i As Integer = 0 To TempArray.Count - 1
+            Dim MachinePathIni As String = TempArray(i) & "\" & Path.GetFileName(TempArray(i)) & ".ini"
+            If File.Exists(MachinePathIni) Then
+               m_MachinesList.Add(New Machine With {.Name = Path.GetFileName(TempArray(i)), .MachineDirPath = TempArray(i)})
+            End If
+         Next
+      End Sub
+
+      ''' <summary>
+      ''' Class that create the association Name/IniPath for the machine's
+      ''' </summary>
+      Class Machine
+
+         Private m_sName As String
+         Public Property Name As String
+            Get
+               Return m_sName
+            End Get
+            Set(value As String)
+               m_sName = value
+            End Set
+         End Property
+
+         Friend MachineDirPath As String
+
+      End Class
+
 #End Region    ' Methods
 
    End Class
diff --git a/ToolsDbPage/ToolTreeView.vb b/ToolsDbPage/ToolTreeView.vb
index fd7c461..85d61bb 100644
--- a/ToolsDbPage/ToolTreeView.vb
+++ b/ToolsDbPage/ToolTreeView.vb
@@ -79,8 +79,8 @@ Public Class ToolTreeViewItem
             ' If Tool is selected, set it as current and notify all tool's property
             ' to refresh them values with those of the new selected tool
             If value Then
-               EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-               EgtTdbSetCurrTool(Me.Name)
+               Dim x = EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
+               Dim y = EgtTdbSetCurrTool(Me.Name)
                NotifyPropertyChanged("Corr")
                NotifyPropertyChanged("ExitPar")
                NotifyPropertyChanged("Type")
diff --git a/ToolsDbPage/ToolsDbView.xaml b/ToolsDbPage/ToolsDbView.xaml
index d2bab09..32dd30a 100644
--- a/ToolsDbPage/ToolsDbView.xaml
+++ b/ToolsDbPage/ToolsDbView.xaml
@@ -14,31 +14,30 @@
       <local:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
       <sys:Int32 x:Key="Corr">0</sys:Int32>
       <sys:Int32 x:Key="ExitPar">1</sys:Int32>
-      <sys:Int32 x:Key="Type">2</sys:Int32>
-      <sys:Int32 x:Key="Coolant">3</sys:Int32>
-      <sys:Int32 x:Key="CornRad">4</sys:Int32>
-      <sys:Int32 x:Key="Diam">5</sys:Int32>
-      <sys:Int32 x:Key="TotDiam">6</sys:Int32>
-      <sys:Int32 x:Key="Feed">7</sys:Int32>
-      <sys:Int32 x:Key="EndFeed">8</sys:Int32>
-      <sys:Int32 x:Key="StartFeed">9</sys:Int32>
-      <sys:Int32 x:Key="TipFeed">10</sys:Int32>
-      <sys:Int32 x:Key="Len">11</sys:Int32>
-      <sys:Int32 x:Key="TotLen">12</sys:Int32>
-      <sys:Int32 x:Key="MaxMat">13</sys:Int32>
-      <sys:Int32 x:Key="LonOffset">14</sys:Int32>
-      <sys:Int32 x:Key="RadOffset">15</sys:Int32>
-      <sys:Int32 x:Key="Speed">16</sys:Int32>
-      <sys:Int32 x:Key="SideAng">17</sys:Int32>
-      <sys:Int32 x:Key="MaxSpeed">18</sys:Int32>
-      <sys:Int32 x:Key="Thick">19</sys:Int32>
-      <sys:Int32 x:Key="MaxAbsorption">20</sys:Int32>
-      <sys:Int32 x:Key="MinFeed">21</sys:Int32>
-      <sys:Int32 x:Key="Draw">22</sys:Int32>
-      <sys:Int32 x:Key="Head">23</sys:Int32>
-      <sys:Int32 x:Key="NamePar">24</sys:Int32>
-      <sys:Int32 x:Key="UserNotes">25</sys:Int32>
-      <sys:Int32 x:Key="TcPos">26</sys:Int32>
+      <sys:Int32 x:Key="Coolant">2</sys:Int32>
+      <sys:Int32 x:Key="CornRad">3</sys:Int32>
+      <sys:Int32 x:Key="Diam">4</sys:Int32>
+      <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+      <sys:Int32 x:Key="Feed">6</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+      <sys:Int32 x:Key="Len">10</sys:Int32>
+      <sys:Int32 x:Key="TotLen">11</sys:Int32>
+      <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+      <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+      <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+      <sys:Int32 x:Key="Speed">15</sys:Int32>
+      <sys:Int32 x:Key="SideAng">16</sys:Int32>
+      <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+      <sys:Int32 x:Key="Thick">18</sys:Int32>
+      <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+      <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+      <sys:Int32 x:Key="Draw">21</sys:Int32>
+      <sys:Int32 x:Key="Head">22</sys:Int32>
+      <sys:Int32 x:Key="NamePar">23</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+      <sys:Int32 x:Key="TcPos">25</sys:Int32>
 
    </UserControl.Resources>
 
@@ -57,10 +56,10 @@
          </Grid.RowDefinitions>
 
 
-         <!--Combobox per selezionare la macchina corrente-->
+         <!--Combobox per selezionare la macchina corrente--><!--
          <ComboBox ItemsSource="{Binding Path=MachinesList}" DisplayMemberPath="Name"
             SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-            Height="30"/>
+            Height="30"/>-->
 
          <UniformGrid Grid.Row="1" Columns="3">
             <Button Content="New" Command="{Binding NewCommand}"
@@ -173,21 +172,23 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding CorrTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding NameParTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Corr}}"/>
-            <EgtWPFLib5:EgtTextBox Name="CorrTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Corr,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   ConverterParameter={StaticResource NamePar}}"/>
+            <EgtWPFLib5:EgtTextBox Name="NameParTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.NamePar,
+                                         ElementName=ToolsTreeView, Mode=TwoWay,
+                                         UpdateSourceTrigger=PropertyChanged,
+                                         ValidatesOnDataErrors=True}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Corr}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=CorrTxBx,
+                                               ConverterParameter={StaticResource NamePar}}"/>
+            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=NameParTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
+                        UpdateSourceTrigger=PropertyChanged}"/>
 
          </Grid>
 
@@ -201,25 +202,25 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding ExitParTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding MaxSpeedTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource ExitPar}}"/>
-            <EgtWPFLib5:EgtTextBox Name="ExitParTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.ExitPar,
+                                   ConverterParameter={StaticResource MaxSpeed}}"/>
+            <EgtWPFLib5:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.MaxSpeed,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource ExitPar}}"/>
+                                               ConverterParameter={StaticResource MaxSpeed}}"/>
             <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=ExitParTxBx,
+               Content="{Binding ElementName=MaxSpeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
          </Grid>
 
-         <!--<Grid Grid.Column="0" Grid.Row="2">
+         <Grid Grid.Column="0" Grid.Row="2">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -229,23 +230,23 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding TypeTxBl}"
+            <TextBlock Text="{Binding FeedTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Type}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TypeTxBx" Grid.Column="1"
-                                   Text="{Binding Path=SelectedItem.Type,
+                                   ConverterParameter={StaticResource Feed}}"/>
+            <EgtWPFLib5:EgtTextBox Name="FeedTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Feed,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Type}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TypeTxBx,
+                                               ConverterParameter={StaticResource Feed}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=FeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
 
-         </Grid>-->
+         </Grid>
 
          <Grid Grid.Column="0" Grid.Row="3">
             <Grid.ColumnDefinitions>
@@ -257,19 +258,19 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding CoolantTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding StartFeedTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Coolant}}"/>
-            <EgtWPFLib5:EgtTextBox Name="CoolantTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Coolant,
+                                   ConverterParameter={StaticResource StartFeed}}"/>
+            <EgtWPFLib5:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.StartFeed,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Coolant}}"/>
+                                               ConverterParameter={StaticResource StartFeed}}"/>
             <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=CoolantTxBx,
+               Content="{Binding ElementName=StartFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
@@ -285,237 +286,11 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding CornRadTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource CornRad}}"/>
-            <EgtWPFLib5:EgtTextBox Name="CornRadTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.CornRad,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource CornRad}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=CornRadTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding DiamTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Diam}}"/>
-            <EgtWPFLib5:EgtTextBox Name="DiamTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Diam,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
-                                         ValidatesOnDataErrors=True}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Diam}}"/>
-            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=DiamTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="6">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TotDiamTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource TotDiam}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TotDiamTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.TotDiam,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource TotDiam}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TotDiamTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="7">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding FeedTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Feed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="FeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Feed,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Feed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=FeedTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-
-         <Grid Grid.Column="0" Grid.Row="8">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding EndFeedTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource EndFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="EndFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.EndFeed,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource EndFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=EndFeedTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
- 
-         <Grid Grid.Column="0" Grid.Row="9">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding StartFeedTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource StartFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="StartFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.StartFeed,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource StartFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=StartFeedTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-         
-         <Grid Grid.Column="0" Grid.Row="10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TipFeedTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource TipFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TipFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.TipFeed,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource TipFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=TipFeedTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-  
-         <Grid Grid.Column="0" Grid.Row="11">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding LenTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Len}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Len,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
-                                         ValidatesOnDataErrors=True}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Len}}"/>
-            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=LenTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>
-
-         </Grid>
-         
-         <Grid Grid.Column="0" Grid.Row="12">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TotLenTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding TotLenTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
                                    ConverterParameter={StaticResource TotLen}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TotLenTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
+            <EgtWPFLib5:EgtTextBox Name="TotLenTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
                                    Text="{Binding Path=SelectedItem.TotLen,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
                                          ValidatesOnDataErrors=True}"
@@ -529,8 +304,8 @@
                         UpdateSourceTrigger=PropertyChanged}"/>
 
          </Grid>
-         
-         <Grid Grid.Column="0" Grid.Row="13">
+
+         <Grid Grid.Column="0" Grid.Row="5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -540,11 +315,68 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding MaxMatTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding TotDiamTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource TotDiam}}"/>
+            <EgtWPFLib5:EgtTextBox Name="TotDiamTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.TotDiam,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource TotDiam}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=TotDiamTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
+         <Grid Grid.Column="0" Grid.Row="6">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding ThickTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource Thick}}"/>
+            <EgtWPFLib5:EgtTextBox Name="ThickTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Thick,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
+                                         ValidatesOnDataErrors=True}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Thick}}"/>
+            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=ThickTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>
+
+         </Grid>
+
+         <Grid Grid.Column="0" Grid.Row="7">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding MaxMatTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
                                    ConverterParameter={StaticResource MaxMat}}"/>
-            <EgtWPFLib5:EgtTextBox Name="MaxMatTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
+            <EgtWPFLib5:EgtTextBox Name="MaxMatTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
                                    Text="{Binding Path=SelectedItem.MaxMat,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
                                          ValidatesOnDataErrors=True}"
@@ -559,7 +391,7 @@
 
          </Grid>
 
-         <Grid Grid.Column="1" Grid.Row="0">
+         <Grid Grid.Column="0" Grid.Row="8">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -569,11 +401,11 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding LonOffsetTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding LonOffsetTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
                                    ConverterParameter={StaticResource LonOffset}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LonOffsetTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
+            <EgtWPFLib5:EgtTextBox Name="LonOffsetTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
                                    Text="{Binding Path=SelectedItem.LonOffset,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
@@ -586,8 +418,8 @@
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
          </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="1">
+
+         <Grid Grid.Column="0" Grid.Row="9">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -597,195 +429,25 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding RadOffsetTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding HeadTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource RadOffset}}"/>
-            <EgtWPFLib5:EgtTextBox Name="RadOffsetTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.RadOffset,
+                                   ConverterParameter={StaticResource Head}}"/>
+            <EgtWPFLib5:EgtTextBox Name="HeadTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Head,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource RadOffset}}"/>
+                                               ConverterParameter={StaticResource Head}}"/>
             <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=RadOffsetTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding SpeedTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Speed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Speed,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
-                                         ValidatesOnDataErrors=True}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Speed}}"/>
-            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=SpeedTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>
-
-         </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding SideAngTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource SideAng}}"/>
-            <EgtWPFLib5:EgtTextBox Name="SideAngTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.SideAng,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource SideAng}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=SideAngTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="4">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding MaxSpeedTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource MaxSpeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.MaxSpeed,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource MaxSpeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=MaxSpeedTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding ThickTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Thick}}"/>
-            <EgtWPFLib5:EgtTextBox Name="ThickTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Thick,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
-                                         ValidatesOnDataErrors=True}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Thick}}"/>
-            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=ThickTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>
-
-         </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="6">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding MaxAbsorptionTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource MaxAbsorption}}"/>
-            <EgtWPFLib5:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.MaxAbsorption,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource MaxAbsorption}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=MaxAbsorptionTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="7">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding MinFeedTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource MinFeed}}"/>
-            <EgtWPFLib5:EgtTextBox Name="MinFeedTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.MinFeed,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource MinFeed}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=MinFeedTxBx,
+               Content="{Binding ElementName=HeadTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
          </Grid>
 
-         <Grid Grid.Column="1" Grid.Row="8">
+         <Grid Grid.Column="0" Grid.Row="10">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -795,11 +457,67 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding DrawTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding CorrTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource Corr}}"/>
+            <EgtWPFLib5:EgtTextBox Name="CorrTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Corr,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Corr}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=CorrTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
+         <Grid Grid.Column="0" Grid.Row="11">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding UserNotesTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource UserNotes}}"/>
+            <EgtWPFLib5:EgtTextBox Name="UserNotesTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.UserNotes,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource UserNotes}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=UserNotesTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="0">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding DrawTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
                                    ConverterParameter={StaticResource Draw}}"/>
-            <EgtWPFLib5:EgtTextBox Name="DrawTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
+            <EgtWPFLib5:EgtTextBox Name="DrawTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
                                    Text="{Binding Path=SelectedItem.Draw,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
                                          ValidatesOnDataErrors=True,
@@ -816,6 +534,233 @@
 
          </Grid>
 
+         <Grid Grid.Column="1" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding SpeedTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource Speed}}"/>
+            <EgtWPFLib5:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Speed,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
+                                         ValidatesOnDataErrors=True}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Speed}}"/>
+            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=SpeedTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding TipFeedTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource TipFeed}}"/>
+            <EgtWPFLib5:EgtTextBox Name="TipFeedTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.TipFeed,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource TipFeed}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=TipFeedTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="3">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding EndFeedTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource EndFeed}}"/>
+            <EgtWPFLib5:EgtTextBox Name="EndFeedTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.EndFeed,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource EndFeed}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=EndFeedTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="4">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding LenTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource Len}}"/>
+            <EgtWPFLib5:EgtTextBox Name="LenTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Len,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
+                                         ValidatesOnDataErrors=True}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Len}}"/>
+            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=LenTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="5">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding DiamTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource Diam}}"/>
+            <EgtWPFLib5:EgtTextBox Name="DiamTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Diam,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged,
+                                         ValidatesOnDataErrors=True}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Diam}}"/>
+            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=DiamTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="6">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding CornRadTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource CornRad}}"/>
+            <EgtWPFLib5:EgtTextBox Name="CornRadTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.CornRad,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource CornRad}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=CornRadTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="7">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding SideAngTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource SideAng}}"/>
+            <EgtWPFLib5:EgtTextBox Name="SideAngTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.SideAng,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource SideAng}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=SideAngTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="8">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding RadOffsetTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource RadOffset}}"/>
+            <EgtWPFLib5:EgtTextBox Name="RadOffsetTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.RadOffset,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource RadOffset}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=RadOffsetTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
          <Grid Grid.Column="1" Grid.Row="9">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
@@ -826,19 +771,19 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding HeadTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding ExitParTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource Head}}"/>
-            <EgtWPFLib5:EgtTextBox Name="HeadTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Head,
+                                   ConverterParameter={StaticResource ExitPar}}"/>
+            <EgtWPFLib5:EgtTextBox Name="ExitParTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.ExitPar,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource Head}}"/>
+                                               ConverterParameter={StaticResource ExitPar}}"/>
             <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=HeadTxBx,
+               Content="{Binding ElementName=ExitParTxBx,
                         Path=(Validation.Errors).CurrentItem,
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
@@ -854,69 +799,11 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding NameParTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource NamePar}}"/>
-            <EgtWPFLib5:EgtTextBox Name="NameParTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.NamePar,
-                                         ElementName=ToolsTreeView, Mode=TwoWay,
-                                         UpdateSourceTrigger=PropertyChanged,
-                                         ValidatesOnDataErrors=True}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource NamePar}}"/>
-            <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=NameParTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>
-
-         </Grid>
-
-         <Grid Grid.Column="1" Grid.Row="11">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding UserNotesTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
-                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
-                                   Converter={StaticResource ToolParamVisibilityConverter},
-                                   ConverterParameter={StaticResource UserNotes}}"/>
-            <EgtWPFLib5:EgtTextBox Name="UserNotesTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
-                                   Text="{Binding Path=SelectedItem.UserNotes,
-                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
-                                   Visibility="{Binding Path=SelectedItem.Type,
-                                               ElementName=ToolsTreeView,
-                                               Converter={StaticResource ToolParamVisibilityConverter},
-                                               ConverterParameter={StaticResource UserNotes}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
-               Content="{Binding ElementName=UserNotesTxBx,
-                        Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
-
-         </Grid>
-         
-         <Grid Grid.Column="1" Grid.Row="12">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Text="{Binding TcPosTxBl}" Style="{StaticResource EgtCAM5_ToolsTextBlock}"
+            <TextBlock Text="{Binding TcPosTxBl}" Style="{StaticResource ToolsTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
                                    Converter={StaticResource ToolParamVisibilityConverter},
                                    ConverterParameter={StaticResource TcPos}}"/>
-            <EgtWPFLib5:EgtTextBox Name="TcPosTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_ToolsTextBox}"
+            <EgtWPFLib5:EgtTextBox Name="TcPosTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
                                    Text="{Binding Path=SelectedItem.TcPos,
                                          ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
@@ -929,6 +816,90 @@
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
          </Grid>
+
+         <Grid Grid.Column="1" Grid.Row="12">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding MaxAbsorptionTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource MaxAbsorption}}"/>
+            <EgtWPFLib5:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.MaxAbsorption,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource MaxAbsorption}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=MaxAbsorptionTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+         
+         <Grid Grid.Column="0" Grid.Row="12">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding MinFeedTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource MinFeed}}"/>
+            <EgtWPFLib5:EgtTextBox Name="MinFeedTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.MinFeed,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource MinFeed}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=MinFeedTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+         <Grid Grid.Column="0" Grid.Row="13">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="{Binding CoolantTxBl}" Style="{StaticResource ToolsTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=ToolsTreeView,
+                                   Converter={StaticResource ToolParamVisibilityConverter},
+                                   ConverterParameter={StaticResource Coolant}}"/>
+            <EgtWPFLib5:EgtTextBox Name="CoolantTxBx" Grid.Column="1" Style="{StaticResource ToolsTextBox}"
+                                   Text="{Binding Path=SelectedItem.Coolant,
+                                         ElementName=ToolsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=ToolsTreeView,
+                                               Converter={StaticResource ToolParamVisibilityConverter},
+                                               ConverterParameter={StaticResource Coolant}}"/>
+            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=CoolantTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
+         </Grid>
+
       </Grid>
       <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
       <ContentControl Content="{Binding ToolSceneHost}" Grid.Column="2"/>
diff --git a/ToolsDbPage/ToolsDbViewModel.vb b/ToolsDbPage/ToolsDbViewModel.vb
index 1482e60..182b062 100644
--- a/ToolsDbPage/ToolsDbViewModel.vb
+++ b/ToolsDbPage/ToolsDbViewModel.vb
@@ -10,36 +10,6 @@ Namespace EgtCAM5
    Public Class ToolsDbViewModel
       Inherits TabViewModel
 
-      ' Lista delle macchine disponibili nel programma
-      Private m_MachinesList As New ObservableCollection(Of Machine)
-      Public Property MachinesList As ObservableCollection(Of Machine)
-         Get
-            Return m_MachinesList
-         End Get
-         Set(value As ObservableCollection(Of Machine))
-            m_MachinesList = value
-         End Set
-      End Property
-      ' Macchina correntemente selezionata e quindi attiva
-      Private m_SelectedMachine As Machine
-      Public Property SelectedMachine As Machine
-         Get
-            Return m_SelectedMachine
-         End Get
-         Set(value As Machine)
-            If value IsNot m_SelectedMachine Then
-               m_SelectedMachine = value
-               EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-               EgtSetCurrMachine(m_SelectedMachine.Name)
-               IniFile.m_sDbsCurrMachIniFilePath = m_SelectedMachine.MachineDirPath & "\" & m_SelectedMachine.Name & ".ini"
-               IniFile.m_sTdbCurrMachToolsDirPath = m_SelectedMachine.MachineDirPath & "\Tools"
-               m_ToolsList.Clear()
-               LoadSelectedMachineTools()
-               OnPropertyChanged("SelectedMachine")
-            End If
-         End Set
-      End Property
-
       ' Lista degli utensili
       Private m_ToolsList As New ObservableCollection(Of FamilyToolTreeViewItem)
       Public Property ToolsList As ObservableCollection(Of FamilyToolTreeViewItem)
@@ -253,7 +223,6 @@ Namespace EgtCAM5
          GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR, "", IniFile.m_sToolMakersDir)
 
          Me.sTabName = EgtMsg(MSG_MAINWINDOW + 3)
-         SearchMachine()
 
          Application.Msn.Register(Application.REMOVETOOL, Sub(ToolToRemove As ToolTreeViewItem)
                                                              Remove(ToolToRemove)
@@ -293,40 +262,13 @@ Namespace EgtCAM5
                                                                     Next
 
                                                                  End Sub)
+         Application.Msn.Register(Application.LOADSELECTEDMACHINE, Sub()
+                                                                      m_ToolsList.Clear()
+                                                                      LoadSelectedMachineTools()
+                                                                   End Sub)
+
       End Sub
 
-      ''' <summary>
-      ''' Method that search the machines in the correct folder and add to the MachinesList those valid.
-      ''' </summary>
-      Private Sub SearchMachine()
-         Dim TempArray As String() = Directory.GetDirectories(IniFile.m_sMachinesRoot)
-         For i As Integer = 0 To TempArray.Count - 1
-            Dim MachinePathIni As String = TempArray(i) & "\" & Path.GetFileName(TempArray(i)) & ".ini"
-            If File.Exists(MachinePathIni) Then
-               m_MachinesList.Add(New Machine With {.Name = Path.GetFileName(TempArray(i)), .MachineDirPath = TempArray(i)})
-            End If
-         Next
-      End Sub
-
-      ''' <summary>
-      ''' Class that create the association Name/IniPath for the machine's
-      ''' </summary>
-      Class Machine
-
-         Private m_sName As String
-         Public Property Name As String
-            Get
-               Return m_sName
-            End Get
-            Set(value As String)
-               m_sName = value
-            End Set
-         End Property
-
-         Friend MachineDirPath As String
-
-      End Class
-
       ''' <summary>
       ''' Method that search tools for the currently selected Machine and add it to the ToolsList.
       ''' </summary>
@@ -349,6 +291,7 @@ Namespace EgtCAM5
             ToolsList(0).IsSelected = True
             ToolsList(0).NotifyPropertyChanged("IsSelected")
          End If
+
       End Sub
 
       ''' <summary>
diff --git a/TopCommandBar/TopCommandBarView.xaml b/TopCommandBar/TopCommandBarView.xaml
index 94f0f1f..c5f056c 100644
--- a/TopCommandBar/TopCommandBarView.xaml
+++ b/TopCommandBar/TopCommandBarView.xaml
@@ -28,6 +28,8 @@
       <Button Command="{Binding ExecCommand}">
          <Image Source="/Resources/TopCommandBar/Exec.png" Stretch="Uniform"/>
       </Button>
+      <Button Content="DOORS" Command="{Binding DoorsCommand}"/>
+
    </StackPanel>
 
 </UserControl>
diff --git a/TopCommandBar/TopCommandBarViewModel.vb b/TopCommandBar/TopCommandBarViewModel.vb
index 0ba9dd8..a040d41 100644
--- a/TopCommandBar/TopCommandBarViewModel.vb
+++ b/TopCommandBar/TopCommandBarViewModel.vb
@@ -13,6 +13,7 @@
       Private m_cmdImport As ICommand
       Private m_cmdExport As ICommand
       Private m_cmdExec As ICommand
+      Private m_cmdDoors As ICommand
 
 #End Region    ' Fields & Properties
 
@@ -198,6 +199,36 @@
 
 #End Region ' ImportCommand
 
+#Region "DoorsCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Import.
+      ''' </summary>
+      Public ReadOnly Property DoorsCommand As ICommand
+         Get
+            If m_cmdDoors Is Nothing Then
+               m_cmdDoors = New RelayCommand(AddressOf Doors, AddressOf CanDoors)
+            End If
+            Return m_cmdDoors
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Import.  This method is invoked by the ImportCommand.
+      ''' </summary>
+      Public Sub Doors(ByVal param As Object)
+         Application.Msn.NotifyColleagues(Application.DOORSPROJECT)
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanDoors(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' DoorsCommand
+
 #Region "ExportCommand"
 
       ''' <summary>