From b251cc150a8fdca1057b4c696ed3c156846324e9 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Sun, 17 Jul 2016 18:34:54 +0000
Subject: [PATCH] EgtCAM5 : - Migliorie lavorazioni.

---
 EgtCAM5.vbproj                                |   8 -
 MachiningsDbPage/MachiningTreeView.vb         |   2 +-
 .../OptionPanel/DrawOptionPanelView.xaml      |   2 -
 .../OptionPanel/DrawOptionPanelViewModel.vb   |  33 +-
 .../OperationExpanderView.xaml                | 169 +++----
 .../OperationExpanderViewModel.vb             | 244 +++++++++-
 .../OperationExpander/OperationListBox.vb     | 441 +++++++++++++++++-
 7 files changed, 765 insertions(+), 134 deletions(-)

diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 802207d..c356b2a 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -172,10 +172,6 @@
     </Compile>
     <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderViewModel.vb" />
     <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBox.vb" />
-    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationPropertyExpander\OperationPropertyExpanderView.xaml.vb">
-      <DependentUpon>OperationPropertyExpanderView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationPropertyExpander\OperationPropertyExpanderViewModel.vb" />
     <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml.vb">
       <DependentUpon>SimulationExpanderView.xaml</DependentUpon>
     </Compile>
@@ -261,10 +257,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationPropertyExpander\OperationPropertyExpanderView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/MachiningsDbPage/MachiningTreeView.vb b/MachiningsDbPage/MachiningTreeView.vb
index b0b35ab..1abe7f9 100644
--- a/MachiningsDbPage/MachiningTreeView.vb
+++ b/MachiningsDbPage/MachiningTreeView.vb
@@ -279,7 +279,7 @@ Public Class MachiningTreeViewItem
             Case MCH_MY.SAWING
                m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAW_LI.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)), New IdNameStruct(MCH_SAW_LI.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)), New IdNameStruct(MCH_SAW_LI.OUT, EgtMsg(MSG_MACHININGSDBPAGE + 126)), New IdNameStruct(MCH_SAW_LI.EXT_CENT, EgtMsg(MSG_MACHININGSDBPAGE + 127)), New IdNameStruct(MCH_SAW_LI.EXT_OUT, EgtMsg(MSG_MACHININGSDBPAGE + 128))})
             Case MCH_MY.MILLING
-               m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)), New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)), New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))})
+               m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)), New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)), New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))})
             Case Else
                m_LeadInTypeList = Nothing
          End Select
diff --git a/ProjectPage/OptionPanel/DrawOptionPanelView.xaml b/ProjectPage/OptionPanel/DrawOptionPanelView.xaml
index 5a76aaf..94a09fc 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanelView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanelView.xaml
@@ -14,8 +14,6 @@
       <ContentPresenter Content="{Binding InfoExpander}"/>
       <!--ContentPresenter that contains the InputExpander-->
       <ContentPresenter Content="{Binding InputExpander}"/>
-      <!--ContentPresenter that contains the SimulationExpander-->
-      <ContentPresenter Content="{Binding SimulationExpander}"/>
    </StackPanel>
 
 </UserControl>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanelViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanelViewModel.vb
index 6221bc6..24481ce 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanelViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanelViewModel.vb
@@ -21,7 +21,6 @@ Namespace EgtCAM5
                OnPropertyChanged("ManageLayerExpander")
                OnPropertyChanged("InfoExpander")
                OnPropertyChanged("InputExpander")
-               OnPropertyChanged("SimulationExpander")
             End If
          End Set
       End Property
@@ -50,7 +49,6 @@ Namespace EgtCAM5
                OnPropertyChanged("ManageLayerExpander")
                OnPropertyChanged("InfoExpander")
                OnPropertyChanged("InputExpander")
-               OnPropertyChanged("SimulationExpander")
             End If
          End Set
       End Property
@@ -77,7 +75,7 @@ Namespace EgtCAM5
          End Get
       End Property
 
-      Private m_OperationPropertyExpander As OperationPropertyExpanderView
+      Private m_MachiningsTreeExpander As MachiningTreeExpanderView
       Private m_InfoExpander As InfoExpanderView
       Public ReadOnly Property InfoExpander As ContentControl
          Get
@@ -87,26 +85,6 @@ Namespace EgtCAM5
                   m_InfoExpander.DataContext = New InfoExpanderViewModel
                End If
                Return m_InfoExpander
-            Else
-               If IsNothing(m_OperationPropertyExpander) Then
-                  m_OperationPropertyExpander = New OperationPropertyExpanderView
-                  m_OperationPropertyExpander.DataContext = New OperationPropertyExpanderViewModel
-               End If
-               Return m_OperationPropertyExpander
-            End If
-         End Get
-      End Property
-
-      Private m_MachiningsTreeExpander As MachiningTreeExpanderView
-      Private m_InputExpander As InputExpanderView
-      Public ReadOnly Property InputExpander As ContentControl
-         Get
-            If m_DrawIsChecked Then
-               If IsNothing(m_InputExpander) Then
-                  m_InputExpander = New InputExpanderView
-                  m_InputExpander.DataContext = New InputExpanderViewModel
-               End If
-               Return m_InputExpander
             Else
                If IsNothing(m_MachiningsTreeExpander) Then
                   m_MachiningsTreeExpander = New MachiningTreeExpanderView
@@ -118,10 +96,15 @@ Namespace EgtCAM5
       End Property
 
       Private m_SimulationExpander As SimulationExpanderView
-      Public ReadOnly Property SimulationExpander As ContentControl
+      Private m_InputExpander As InputExpanderView
+      Public ReadOnly Property InputExpander As ContentControl
          Get
             If m_DrawIsChecked Then
-               Return Nothing
+               If IsNothing(m_InputExpander) Then
+                  m_InputExpander = New InputExpanderView
+                  m_InputExpander.DataContext = New InputExpanderViewModel
+               End If
+               Return m_InputExpander
             Else
                If IsNothing(m_SimulationExpander) Then
                   m_SimulationExpander = New SimulationExpanderView
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
index f50ed4c..8ee437b 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
@@ -48,132 +48,141 @@
             <StackPanel Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
                                         Converter={StaticResource OperationParamVisibilityConverter},
                                         ConverterParameter={StaticResource BaseParameters}}">
-            <UniformGrid Columns="2">
-                  <TextBlock Text="{Binding DepthTxBl}"/>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Depth}"/>
-            </UniformGrid>
-            <UniformGrid Columns="2">
-               <TextBlock Text="{Binding InvertTxBl}"/>
-                  <CheckBox HorizontalAlignment="Center" IsChecked="{Binding ElementName=OperationList, Path=SelectedItem.Invert}" />
-            </UniformGrid>
-            <UniformGrid Columns="2">
-               <TextBlock Text="WorkSide"/>
-                  <ComboBox ItemsSource="{Binding Path=SelectedItem.WorkSideList,
-                                         ElementName=OperationList, Mode=OneWay}"
-                         SelectedIndex="{Binding Path=SelectedItem.SelectedWorkSide,
-                                        ElementName=OperationList}"
-                         IsSynchronizedWithCurrentItem="True">
-               </ComboBox>
-            </UniformGrid>
+               <UniformGrid Columns="2">
+                     <TextBlock Text="{Binding DepthTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Depth}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding InvertTxBl}"/>
+                     <CheckBox HorizontalAlignment="Center" IsChecked="{Binding ElementName=OperationList, Path=SelectedItem.Invert}" />
+               </UniformGrid>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="WorkSide"/>
+                     <ComboBox ItemsSource="{Binding Path=SelectedItem.WorkSideList,
+                                            ElementName=OperationList, Mode=OneWay}"
+                            SelectedIndex="{Binding Path=SelectedItem.SelectedWorkSide,
+                                           ElementName=OperationList}"
+                            IsSynchronizedWithCurrentItem="True">
+                  </ComboBox>
+               </UniformGrid>
             </StackPanel>
+            <Button Height="30" Content="Reload Machining" Command="{Binding ReloadMachiningCommand}" />
             <Expander Header="Generic">
                <StackPanel>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="Step"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding StartPosTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartPos}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="StepType"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding OverLapTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.OverLap}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="SideAngle"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding ThrouAddLenTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.ThrouAddLen}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="StartPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding StepTypeTxBl}"/>
+                     <ComboBox ItemsSource="{Binding Path=SelectedItem.StepTypeList,
+                                            ElementName=OperationList, Mode=OneWay}"
+                            SelectedIndex="{Binding Path=SelectedItem.SelectedStepType,
+                                           ElementName=OperationList}"
+                            IsSynchronizedWithCurrentItem="True">
+                     </ComboBox>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding StepParTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StepPar}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="StartSlowLen"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding StartSlowLenTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartSlowLen}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="EndSlowLen"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding EndSlowLenTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.EndSlowLen}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="OffsetSr"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding SideAngleTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.SideAngle}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="OffsetSl"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding OffsetSrTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.OffsetSr}"/>
+                  </UniformGrid>
+                  <UniformGrid Columns="2">
+                     <TextBlock Text="{Binding OffsetSlTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.OffsetSl}"/>
                   </UniformGrid>
                </StackPanel>
             </Expander>
             <Expander>
                <Expander.Header>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="LeadInType"/>
-                     <ComboBox>
-                        <ComboBoxItem Content="None"/>
-                        <ComboBoxItem Content="Linear"/>
-                        <ComboBoxItem Content="Tangent" IsSelected="True"/>
-                        <ComboBoxItem Content="Helix"/>
+                     <TextBlock Text="{Binding LeadInTypeTxBl}"/>
+                     <ComboBox ItemsSource="{Binding Path=SelectedItem.LeadInTypeList,
+                                            ElementName=OperationList, Mode=OneWay}"
+                            SelectedIndex="{Binding Path=SelectedItem.SelectedLeadInType,
+                                           ElementName=OperationList}"
+                            IsSynchronizedWithCurrentItem="True">
                      </ComboBox>
                   </UniformGrid>
                </Expander.Header>
                <StackPanel>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="StartAddLen"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding StartAddLenTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartAddLen}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding LiTangTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiTang}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
-                  </UniformGrid>
-                  <TextBox />
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding LiPerpTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiPerp}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding LiElevTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiElev}"/>
+                  </UniformGrid>
+                  <UniformGrid Columns="2">
+                     <TextBlock Text="{Binding LiCompLenTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiCompLen}"/>
                   </UniformGrid>
                </StackPanel>
             </Expander>
             <Expander HorizontalAlignment="Left">
                <Expander.Header>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="LeadOutType"/>
-                     <ComboBox>
-                        <ComboBoxItem Content="None"/>
-                        <ComboBoxItem Content="Linear"/>
-                        <ComboBoxItem Content="Tangent" IsSelected="True"/>
-                        <ComboBoxItem Content="Helix"/>
+                     <TextBlock Text="{Binding LeadOutTypeTxBl}"/>
+                     <ComboBox ItemsSource="{Binding Path=SelectedItem.LeadOutTypeList,
+                                            ElementName=OperationList, Mode=OneWay}"
+                            SelectedIndex="{Binding Path=SelectedItem.SelectedLeadOutType,
+                                           ElementName=OperationList}"
+                            IsSynchronizedWithCurrentItem="True">
                      </ComboBox>
                   </UniformGrid>
                </Expander.Header>
                <StackPanel>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding EndAddLenTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.EndAddLen}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding LoTangTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoTang}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding LoPerpTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoPerp}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding LoElevTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoElev}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="ReturnPos"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding LoCompLenTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoCompLen}"/>
                   </UniformGrid>
                </StackPanel>
             </Expander>
@@ -206,24 +215,24 @@
             <Expander Header="Tool">
                <StackPanel>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="Speed"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding SpeedTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Speed}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="Feed"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding FeedTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Feed}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="StartFeed"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding TipFeedTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.TipFeed}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="EndFeed"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding StartFeedTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartFeed}"/>
                   </UniformGrid>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="TipFeed"/>
-                     <TextBox />
+                     <TextBlock Text="{Binding EndFeedTxBl}"/>
+                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.EndFeed}"/>
                   </UniformGrid>
                </StackPanel>
             </Expander>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index c624c35..2673d71 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -99,7 +99,6 @@ Namespace EgtCAM5
                Else
                   ' Imposto come corrente la lavorazione(operazione) selezionata
                   Dim x = EgtSetCurrMachining(value.Id)
-                  'value.NotifyPropertyChanged("Depth")
                   ' Evidenzio la lavorazione(operazione) selezionata
                   EgtSetMark(value.Id)
                   EgtDraw()
@@ -123,18 +122,6 @@ Namespace EgtCAM5
          End Set
       End Property
 
-      'Proprietà che richiama OperationPropertyExpander
-      Private m_OperationPropertyExpander As OperationPropertyExpanderView
-      Public ReadOnly Property OperationPropertyExpander As ContentControl
-         Get
-            If IsNothing(m_OperationPropertyExpander) Then
-               m_OperationPropertyExpander = New OperationPropertyExpanderView
-               m_OperationPropertyExpander.DataContext = New OperationPropertyExpanderViewModel
-            End If
-            Return m_OperationPropertyExpander
-         End Get
-      End Property
-
 #Region "Messaggi per parametri operazioni"
 
       Public ReadOnly Property InvertTxBl As String
@@ -145,7 +132,7 @@ Namespace EgtCAM5
 
       Public ReadOnly Property DepthTxBl As String
          Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 51)
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 99)
          End Get
       End Property
 
@@ -155,12 +142,175 @@ Namespace EgtCAM5
          End Get
       End Property
 
+      Public ReadOnly Property StartPosTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 73)
+         End Get
+      End Property
+
+      Public ReadOnly Property OverLapTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 101)
+         End Get
+      End Property
+
+      Public ReadOnly Property ThrouAddLenTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 76)
+         End Get
+      End Property
+
+      Public ReadOnly Property StepTypeTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 60)
+         End Get
+      End Property
+
+      Public ReadOnly Property StepParTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 77)
+         End Get
+      End Property
+
+      Public ReadOnly Property StartSlowLenTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 74)
+         End Get
+      End Property
+
+      Public ReadOnly Property EndSlowLenTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 75)
+         End Get
+      End Property
+
+      Public ReadOnly Property SideAngleTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 71)
+         End Get
+      End Property
+
+      Public ReadOnly Property OffsetSrTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 68)
+         End Get
+      End Property
+
+      Public ReadOnly Property OffsetSlTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 69)
+         End Get
+      End Property
+
+      Public ReadOnly Property LeadInTypeTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 56)
+         End Get
+      End Property
+
+      Public ReadOnly Property StartAddLenTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 91)
+         End Get
+      End Property
+
+      Public ReadOnly Property LiTangTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 83)
+         End Get
+      End Property
+
+      Public ReadOnly Property LiPerpTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 84)
+         End Get
+      End Property
+
+      Public ReadOnly Property LiElevTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 85)
+         End Get
+      End Property
+
+      Public ReadOnly Property LiCompLenTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 86)
+         End Get
+      End Property
+
+      Public ReadOnly Property LeadOutTypeTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 58)
+         End Get
+      End Property
+
+      Public ReadOnly Property EndAddLenTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 92)
+         End Get
+      End Property
+
+      Public ReadOnly Property LoTangTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 87)
+         End Get
+      End Property
+
+      Public ReadOnly Property LoPerpTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 88)
+         End Get
+      End Property
+
+      Public ReadOnly Property LoElevTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 89)
+         End Get
+      End Property
+
+      Public ReadOnly Property LoCompLenTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 90)
+         End Get
+      End Property
+
+      Public ReadOnly Property SpeedTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 63)
+         End Get
+      End Property
+
+      Public ReadOnly Property FeedTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 64)
+         End Get
+      End Property
+
+      Public ReadOnly Property TipFeedTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 67)
+         End Get
+      End Property
+
+      Public ReadOnly Property StartFeedTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 65)
+         End Get
+      End Property
+
+      Public ReadOnly Property EndFeedTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 66)
+         End Get
+      End Property
+
 #End Region
 
       ' Definizione comandi
       Private m_cmdNewMachining As ICommand
       Private m_cmdNewPositioning As ICommand
       Private m_cmdCancelOperation As ICommand
+      Private m_cmdReloadMachining As ICommand
 
       Sub New()
          Application.Msn.Register(Application.LOADOPERATIONLIST, Sub()
@@ -259,6 +409,10 @@ Namespace EgtCAM5
             NewMachining = False
          Else
             If Not IsNothing(SelectedOperation) Then
+               ' Smarco e deseleziono la geometria selezionata
+               EgtResetMark(m_LastMarkedOperationId)
+               EgtDeselectAll()
+               EgtDraw()
                ' Rimuovo l'operazione selezionata
                EgtRemoveOperation(SelectedOperation.Id)
                ' Ricarico la lista delle operazioni
@@ -276,6 +430,68 @@ Namespace EgtCAM5
 
 #End Region ' CancelOperationCommand
 
+#Region "ReloadMachiningCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Point.
+      ''' </summary>
+      Public ReadOnly Property ReloadMachiningCommand As ICommand
+         Get
+            If m_cmdReloadMachining Is Nothing Then
+               m_cmdReloadMachining = New RelayCommand(AddressOf ReloadMachining, AddressOf CanReloadMachining)
+            End If
+            Return m_cmdReloadMachining
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the PointCommand.
+      ''' </summary>
+      Public Sub ReloadMachining(ByVal param As Object)
+         ' Verifico se la geometria è cambiata
+         ' Parametro che indica se ci sono state modifiche
+         Dim ModifiedGeometry As Boolean = False
+         ' Carico tutta la geometria selezionata in una lista
+         Dim SelectedGeometry As New List(Of Integer)
+         Dim EntityIndex As Integer = EgtGetFirstSelectedObj()
+         While EntityIndex <> GDB_ID.NULL
+            SelectedGeometry.Add(EntityIndex)
+            EntityIndex = EgtGetNextSelectedObj()
+         End While
+         ' Carico un elemento della geometria di lavorazione
+         Dim CountIndex = 0
+         EntityIndex = 0
+         Dim SubEntityIndex As Integer = 0     ' Nell'interfaccia non si usa ma devo comunque definirla perchè la funzione la restituisce obbligatoriamente
+         While EgtGetMachiningGeometry(CountIndex, EntityIndex, SubEntityIndex)
+            If SubEntityIndex = GDB_ID.NULL Then
+               If SelectedGeometry.IndexOf(EntityIndex) < 0 Then
+                  ModifiedGeometry = True
+                  Exit While
+               End If
+            End If
+            CountIndex += 1
+         End While
+         If SelectedGeometry.Count <> CountIndex Then
+            ModifiedGeometry = True
+         End If
+         ' Imposto geometria selezionata come geometria di lavorazione
+         If ModifiedGeometry Then EgtSetMachiningGeometry(SelectedGeometry.ToArray)
+         ' Verifico se i parametri sono cambiati
+
+         ' Se necessario ricalcolo la lavorazione
+         EgtApplyMachining(ModifiedGeometry)
+         EgtDraw()
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanReloadMachining(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' ReloadMachiningCommand
+
 #End Region     ' Commands
 
 #Region "METHODS"
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
index ef05c2d..90e804c 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
@@ -55,7 +55,7 @@ Public Class OperationListBoxItem
    Public Property Invert As Boolean
       Get
          Dim bInvert As Boolean = False
-         Dim x = EgtGetMachiningParam(MCH_MP.INVERT, bInvert)
+         EgtGetMachiningParam(MCH_MP.INVERT, bInvert)
          Return bInvert
       End Get
       Set(value As Boolean)
@@ -70,7 +70,7 @@ Public Class OperationListBoxItem
          Return sDepth
       End Get
       Set(value As String)
-         EgtSetMachiningParam(MCH_MP.DEPTH, value)
+         EgtSetMachiningParam(MCH_MP.DEPTH_STR, value)
       End Set
    End Property
 
@@ -85,11 +85,444 @@ Public Class OperationListBoxItem
    Public Property SelectedWorkSide As Integer
       Get
          Dim nWorkSide As Integer = 0
-         EgtMdbGetCurrMachiningParam(MCH_MP.WORKSIDE, nWorkSide)
+         EgtGetMachiningParam(MCH_MP.WORKSIDE, nWorkSide)
          Return IdNameStruct.SearchToId(nWorkSide, WorkSideList)
       End Get
       Set(value As Integer)
-         EgtMdbSetCurrMachiningParam(MCH_MP.WORKSIDE, IdNameStruct.SearchFromId(value, WorkSideList))
+         EgtSetMachiningParam(MCH_MP.WORKSIDE, IdNameStruct.SearchFromId(value, WorkSideList))
+      End Set
+   End Property
+
+   Public Property StartPos As String
+      Get
+         Dim dStartPos As Double = 0
+         EgtGetMachiningParam(MCH_MP.STARTPOS, dStartPos)
+         Return LenToString(dStartPos, 3)
+      End Get
+      Set(value As String)
+         Dim dStartPos As Double = 0
+         StringToLen(value, dStartPos)
+         EgtSetMachiningParam(MCH_MP.STARTPOS, dStartPos)
+      End Set
+   End Property
+
+   Public Property OverLap As String
+      Get
+         Dim sOverLap As String = String.Empty
+         Dim x = EgtGetMachiningParam(MCH_MP.OVERLAP_STR, sOverLap)
+         Return sOverLap
+      End Get
+      Set(value As String)
+         EgtSetMachiningParam(MCH_MP.OVERLAP_STR, value)
+      End Set
+   End Property
+
+   Public Property ThrouAddLen As String
+      Get
+         Dim dThrouAddLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.THROUADDLEN, dThrouAddLen)
+         Return LenToString(dThrouAddLen, 3)
+      End Get
+      Set(value As String)
+         Dim dThrouAddLen As Double = 0
+         StringToLen(value, dThrouAddLen)
+         EgtSetMachiningParam(MCH_MP.THROUADDLEN, dThrouAddLen)
+      End Set
+   End Property
+
+   'ObservableCollection che contiene le variabili per il combobox StepType
+   Private m_StepTypeList As ObservableCollection(Of IdNameStruct)
+   Public ReadOnly Property StepTypeList As ObservableCollection(Of IdNameStruct)
+      Get
+         Select Case m_Type
+            Case MCH_MY.SAWING
+               m_StepTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAW_ST.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), New IdNameStruct(MCH_SAW_ST.ONEWAY, EgtMsg(MSG_MACHININGSDBPAGE + 143)), New IdNameStruct(MCH_SAW_ST.TOANDFROM, EgtMsg(MSG_MACHININGSDBPAGE + 145))})
+            Case MCH_MY.MILLING
+               m_StepTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_MIL_ST.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), New IdNameStruct(MCH_MIL_ST.ONEWAY, EgtMsg(MSG_MACHININGSDBPAGE + 143)), New IdNameStruct(MCH_MIL_ST.SPIRAL, EgtMsg(MSG_MACHININGSDBPAGE + 144))})
+            Case MCH_MY.SAWROUGHING, MCH_MY.SAWFINISHING
+               m_StepTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAWROU_ST.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), New IdNameStruct(MCH_SAWROU_ST.ONEWAY, EgtMsg(MSG_MACHININGSDBPAGE + 143))})
+            Case Else
+               m_StepTypeList = Nothing
+         End Select
+         Return m_StepTypeList
+      End Get
+   End Property
+   Private m_StepTypeGetError As Boolean = False
+   ' Proprietà che indica il StepType
+   Public Property SelectedStepType As Integer
+      Get
+         If Not IsNothing(m_StepTypeList) Then
+            Dim nStepType As Integer = 0
+            If EgtGetMachiningParam(MCH_MP.STEPTYPE, nStepType) Then
+               m_StepTypeGetError = True
+            Else
+               m_StepTypeGetError = False
+            End If
+            Return IdNameStruct.SearchToId(nStepType, m_StepTypeList)
+         Else
+            Return 0
+         End If
+      End Get
+      Set(value As Integer)
+         If Not IsNothing(m_StepTypeList) Then
+            If m_StepTypeGetError Then
+               EgtSetMachiningParam(MCH_MP.STEPTYPE, IdNameStruct.SearchFromId(value, m_StepTypeList))
+            End If
+         End If
+      End Set
+   End Property
+
+   Public Property StepPar As String
+      Get
+         Dim dStepPar As Double = 0
+         EgtGetMachiningParam(MCH_MP.STEP_, dStepPar)
+         Return LenToString(dStepPar, 3)
+      End Get
+      Set(value As String)
+         Dim dStepPar As Double = 0
+         StringToLen(value, dStepPar)
+         EgtSetMachiningParam(MCH_MP.STEP_, dStepPar)
+      End Set
+   End Property
+
+   Public Property StartSlowLen As String
+      Get
+         Dim dStartSlowLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.STARTSLOWLEN, dStartSlowLen)
+         Return LenToString(dStartSlowLen, 3)
+      End Get
+      Set(value As String)
+         Dim dStartSlowLen As Double = 0
+         StringToLen(value, dStartSlowLen)
+         EgtSetMachiningParam(MCH_MP.STARTSLOWLEN, dStartSlowLen)
+      End Set
+   End Property
+
+   Public Property EndSlowLen As String
+      Get
+         Dim dEndSlowLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.ENDSLOWLEN, dEndSlowLen)
+         Return LenToString(dEndSlowLen, 3)
+      End Get
+      Set(value As String)
+         Dim dEndSlowLen As Double = 0
+         StringToLen(value, dEndSlowLen)
+         EgtSetMachiningParam(MCH_MP.ENDSLOWLEN, dEndSlowLen)
+      End Set
+   End Property
+
+   Public Property SideAngle As String
+      Get
+         Dim dSideAngle As Double = 0
+         EgtGetMachiningParam(MCH_MP.SIDEANGLE, dSideAngle)
+         Return LenToString(dSideAngle, 3)
+      End Get
+      Set(value As String)
+         Dim dSideAngle As Double = 0
+         StringToLen(value, dSideAngle)
+         EgtSetMachiningParam(MCH_MP.SIDEANGLE, dSideAngle)
+      End Set
+   End Property
+
+   Public Property OffsetSr As String
+      Get
+         Dim dOffsetSr As Double = 0
+         EgtGetMachiningParam(MCH_MP.OFFSR, dOffsetSr)
+         Return LenToString(dOffsetSr, 3)
+      End Get
+      Set(value As String)
+         Dim dOffsetSr As Double = 0
+         StringToLen(value, dOffsetSr)
+         EgtSetMachiningParam(MCH_MP.OFFSR, dOffsetSr)
+      End Set
+   End Property
+
+   Public Property OffsetSl As String
+      Get
+         Dim dOffsetSl As Double = 0
+         EgtGetMachiningParam(MCH_MP.OFFSL, dOffsetSl)
+         Return LenToString(dOffsetSl, 3)
+      End Get
+      Set(value As String)
+         Dim dOffsetSl As Double = 0
+         StringToLen(value, dOffsetSl)
+         EgtSetMachiningParam(MCH_MP.OFFSL, dOffsetSl)
+      End Set
+   End Property
+
+   Public Property Speed As String
+      Get
+         Dim dSpeed As Double = 0
+         EgtGetMachiningParam(MCH_MP.SPEED, dSpeed)
+         Return LenToString(dSpeed, 3)
+      End Get
+      Set(value As String)
+         Dim dSpeed As Double = 0
+         StringToLen(value, dSpeed)
+         EgtSetMachiningParam(MCH_MP.SPEED, dSpeed)
+      End Set
+   End Property
+
+   Public Property Feed As String
+      Get
+         Dim dFeed As Double = 0
+         EgtGetMachiningParam(MCH_MP.FEED, dFeed)
+         Return LenToString(dFeed, 3)
+      End Get
+      Set(value As String)
+         Dim dFeed As Double = 0
+         StringToLen(value, dFeed)
+         EgtSetMachiningParam(MCH_MP.FEED, dFeed)
+      End Set
+   End Property
+
+   Public Property TipFeed As String
+      Get
+         Dim dTipFeed As Double = 0
+         EgtGetMachiningParam(MCH_MP.TIPFEED, dTipFeed)
+         Return LenToString(dTipFeed, 3)
+      End Get
+      Set(value As String)
+         Dim dTipFeed As Double = 0
+         StringToLen(value, dTipFeed)
+         EgtSetMachiningParam(MCH_MP.TIPFEED, dTipFeed)
+      End Set
+   End Property
+
+   Public Property StartFeed As String
+      Get
+         Dim dStartFeed As Double = 0
+         EgtGetMachiningParam(MCH_MP.STARTFEED, dStartFeed)
+         Return LenToString(dStartFeed, 3)
+      End Get
+      Set(value As String)
+         Dim dStartFeed As Double = 0
+         StringToLen(value, dStartFeed)
+         EgtSetMachiningParam(MCH_MP.STARTFEED, dStartFeed)
+      End Set
+   End Property
+
+   Public Property EndFeed As String
+      Get
+         Dim dEndFeed As Double = 0
+         EgtGetMachiningParam(MCH_MP.ENDFEED, dEndFeed)
+         Return LenToString(dEndFeed, 3)
+      End Get
+      Set(value As String)
+         Dim dEndFeed As Double = 0
+         StringToLen(value, dEndFeed)
+         EgtSetMachiningParam(MCH_MP.ENDFEED, dEndFeed)
+      End Set
+   End Property
+
+
+   'ObservableCollection che contiene le variabili per il combobox LeadInType
+   Private m_LeadInTypeList As ObservableCollection(Of IdNameStruct)
+   Public ReadOnly Property LeadInTypeList As ObservableCollection(Of IdNameStruct)
+      Get
+         Select Case m_Type
+            Case MCH_MY.SAWING
+               m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAW_LI.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)), New IdNameStruct(MCH_SAW_LI.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)), New IdNameStruct(MCH_SAW_LI.OUT, EgtMsg(MSG_MACHININGSDBPAGE + 126)), New IdNameStruct(MCH_SAW_LI.EXT_CENT, EgtMsg(MSG_MACHININGSDBPAGE + 127)), New IdNameStruct(MCH_SAW_LI.EXT_OUT, EgtMsg(MSG_MACHININGSDBPAGE + 128))})
+            Case MCH_MY.MILLING
+               m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)), New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)), New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))})
+            Case Else
+               m_LeadInTypeList = Nothing
+         End Select
+         Return m_LeadInTypeList
+      End Get
+   End Property
+   Private m_LeadInTypeGetError As Boolean = False
+   ' Proprietà che indica il LeadInType
+   Public Property SelectedLeadInType As Integer
+      Get
+         If Not IsNothing(m_LeadInTypeList) Then
+            Dim nLeadInType As Integer = 0
+            If EgtGetMachiningParam(MCH_MP.LEADINTYPE, nLeadInType) Then
+               m_LeadInTypeGetError = True
+            Else
+               m_LeadInTypeGetError = False
+            End If
+            Return IdNameStruct.SearchToId(nLeadInType, m_LeadInTypeList)
+         Else
+            Return 0
+         End If
+      End Get
+      Set(value As Integer)
+         If Not IsNothing(m_LeadInTypeList) Then
+            If m_LeadInTypeGetError Then
+               EgtSetMachiningParam(MCH_MP.LEADINTYPE, IdNameStruct.SearchFromId(value, m_LeadInTypeList))
+            End If
+         End If
+      End Set
+   End Property
+
+   Public Property StartAddLen As String
+      Get
+         Dim dStartAddLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.STARTADDLEN, dStartAddLen)
+         Return LenToString(dStartAddLen, 3)
+      End Get
+      Set(value As String)
+         Dim dStartAddLen As Double = 0
+         StringToLen(value, dStartAddLen)
+         EgtSetMachiningParam(MCH_MP.STARTADDLEN, dStartAddLen)
+      End Set
+   End Property
+
+   Public Property LiTang As String
+      Get
+         Dim dLiTang As Double = 0
+         EgtGetMachiningParam(MCH_MP.LITANG, dLiTang)
+         Return LenToString(dLiTang, 3)
+      End Get
+      Set(value As String)
+         Dim dLiTang As Double = 0
+         StringToLen(value, dLiTang)
+         EgtSetMachiningParam(MCH_MP.LITANG, dLiTang)
+      End Set
+   End Property
+
+   Public Property LiPerp As String
+      Get
+         Dim dLiPerp As Double = 0
+         EgtGetMachiningParam(MCH_MP.LIPERP, dLiPerp)
+         Return LenToString(dLiPerp, 3)
+      End Get
+      Set(value As String)
+         Dim dLiPerp As Double = 0
+         StringToLen(value, dLiPerp)
+         EgtSetMachiningParam(MCH_MP.LIPERP, dLiPerp)
+      End Set
+   End Property
+
+   Public Property LiElev As String
+      Get
+         Dim dLiElev As Double = 0
+         EgtGetMachiningParam(MCH_MP.LIELEV, dLiElev)
+         Return LenToString(dLiElev, 3)
+      End Get
+      Set(value As String)
+         Dim dLiElev As Double = 0
+         StringToLen(value, dLiElev)
+         EgtSetMachiningParam(MCH_MP.LIELEV, dLiElev)
+      End Set
+   End Property
+
+   Public Property LiCompLen As String
+      Get
+         Dim dLiCompLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.LICOMPLEN, dLiCompLen)
+         Return LenToString(dLiCompLen, 3)
+      End Get
+      Set(value As String)
+         Dim dLiCompLen As Double = 0
+         StringToLen(value, dLiCompLen)
+         EgtSetMachiningParam(MCH_MP.LICOMPLEN, dLiCompLen)
+      End Set
+   End Property
+
+   'ObservableCollection che contiene le variabili per il combobox LeadOutType
+   Private m_LeadOutTypeList As ObservableCollection(Of IdNameStruct)
+   Public ReadOnly Property LeadOutTypeList As ObservableCollection(Of IdNameStruct)
+      Get
+         Select Case m_Type
+            Case MCH_MY.SAWING
+               m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAW_LO.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)), New IdNameStruct(MCH_SAW_LO.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)), New IdNameStruct(MCH_SAW_LO.EXT, EgtMsg(MSG_MACHININGSDBPAGE + 123))})
+            Case MCH_MY.MILLING
+               m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)), New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)), New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_MACHININGSDBPAGE + 137))})
+            Case Else
+               m_LeadOutTypeList = Nothing
+         End Select
+         Return m_LeadOutTypeList
+      End Get
+   End Property
+   Private m_LeadOutTypeGetError As Boolean = False
+   ' Proprietà che indica il LeadOutType
+   Public Property SelectedLeadOutType As Integer
+      Get
+         If Not IsNothing(m_LeadOutTypeList) Then
+            Dim nLeadOutType As Integer = 0
+            If EgtGetMachiningParam(MCH_MP.LEADOUTTYPE, nLeadOutType) Then
+               m_LeadOutTypeGetError = True
+            Else
+               m_LeadOutTypeGetError = False
+            End If
+            Return IdNameStruct.SearchToId(nLeadOutType, m_LeadOutTypeList)
+         Else
+            Return 0
+         End If
+      End Get
+      Set(value As Integer)
+         If Not IsNothing(m_LeadOutTypeList) Then
+            If m_LeadOutTypeGetError Then
+               EgtSetMachiningParam(MCH_MP.LEADOUTTYPE, IdNameStruct.SearchFromId(value, m_LeadOutTypeList))
+            End If
+         End If
+      End Set
+   End Property
+
+   Public Property EndAddLen As String
+      Get
+         Dim dEndAddLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.ENDADDLEN, dEndAddLen)
+         Return LenToString(dEndAddLen, 3)
+      End Get
+      Set(value As String)
+         Dim dEndAddLen As Double = 0
+         StringToLen(value, dEndAddLen)
+         EgtSetMachiningParam(MCH_MP.ENDADDLEN, dEndAddLen)
+      End Set
+   End Property
+
+   Public Property LoTang As String
+      Get
+         Dim dLoTang As Double = 0
+         EgtGetMachiningParam(MCH_MP.LOTANG, dLoTang)
+         Return LenToString(dLoTang, 3)
+      End Get
+      Set(value As String)
+         Dim dLoTang As Double = 0
+         StringToLen(value, dLoTang)
+         EgtSetMachiningParam(MCH_MP.LOTANG, dLoTang)
+      End Set
+   End Property
+
+   Public Property LoPerp As String
+      Get
+         Dim dLoPerp As Double = 0
+         EgtGetMachiningParam(MCH_MP.LOPERP, dLoPerp)
+         Return LenToString(dLoPerp, 3)
+      End Get
+      Set(value As String)
+         Dim dLoPerp As Double = 0
+         StringToLen(value, dLoPerp)
+         EgtSetMachiningParam(MCH_MP.LOPERP, dLoPerp)
+      End Set
+   End Property
+
+   Public Property LoElev As String
+      Get
+         Dim dLoElev As Double = 0
+         EgtGetMachiningParam(MCH_MP.LOELEV, dLoElev)
+         Return LenToString(dLoElev, 3)
+      End Get
+      Set(value As String)
+         Dim dLoElev As Double = 0
+         StringToLen(value, dLoElev)
+         EgtSetMachiningParam(MCH_MP.LOELEV, dLoElev)
+      End Set
+   End Property
+
+   Public Property LoCompLen As String
+      Get
+         Dim dLoCompLen As Double = 0
+         EgtGetMachiningParam(MCH_MP.LOCOMPLEN, dLoCompLen)
+         Return LenToString(dLoCompLen, 3)
+      End Get
+      Set(value As String)
+         Dim dLoCompLen As Double = 0
+         StringToLen(value, dLoCompLen)
+         EgtSetMachiningParam(MCH_MP.LOCOMPLEN, dLoCompLen)
       End Set
    End Property