From 2f0c121fc45b75ebc428cdbb30c087521072065e Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 7 Nov 2016 12:11:48 +0000
Subject: [PATCH] EgtCAM5 : - Divisi parametri operazioni tra lavorazioni e
 disposizioni. - Iniziata implementazione movimento ventose, riferimenti e
 grezzi nelle disposizioni.

---
 Application.xaml.vb                           |   1 +
 EgtCAM5.vbproj                                |  22 +-
 EgtCAM5Resources.xaml                         |   4 +
 IniFile.vb                                    |   1 +
 .../DispositionParameterExpanderView.xaml     | 108 +++
 .../DispositionParameterExpanderView.xaml.vb  |   3 +
 .../DispositionParameterExpanderViewModel.vb  | 821 ++++++++++++++++++
 .../MachiningParameterExpanderView.xaml       | 392 +++++++++
 .../MachiningParameterExpanderView.xaml.vb    |   3 +
 .../MachiningParameterExpanderViewModel.vb}   | 415 +++++++--
 .../OperationExpanderView.xaml                | 400 +--------
 .../OperationExpanderView.xaml.vb             |  44 +-
 .../OperationExpanderViewModel.vb             | 422 +++------
 .../DispositionOpListBoxItem.vb               |   0
 .../MachiningOpListBoxItem.vb                 |  95 ++
 .../OperationListBoxItem.vb                   |   0
 ProjectPage/ProjectViewModel.vb               | 281 ++++--
 17 files changed, 2142 insertions(+), 870 deletions(-)
 create mode 100644 ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml
 create mode 100644 ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb
 create mode 100644 ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb
 create mode 100644 ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml
 create mode 100644 ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb
 rename ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/{MachiningOpListBoxItem.vb => MachiningParameterExpander/MachiningParameterExpanderViewModel.vb} (73%)
 rename ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/{ => OperationListBoxItem}/DispositionOpListBoxItem.vb (100%)
 create mode 100644 ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
 rename ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/{ => OperationListBoxItem}/OperationListBoxItem.vb (100%)

diff --git a/Application.xaml.vb b/Application.xaml.vb
index 8622518..a283098 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -49,6 +49,7 @@ Class Application
    Friend Const MMUNITSCHANGED As String = "MmUnitsChanged"
    Friend Const SETSCENESELMODE As String = "SetSceneSelMode"
    Friend Const SETSCENESELTYPE As String = "SetSceneSelType"
+   Friend Const SETMOVEINDISPOSITION As String = "SetMoveInDisposition"
 
    ' ShowPanel messages
    Friend Const WIREFRAME As String = "Wireframe"
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index b4ad86e..a5f284e 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -183,8 +183,16 @@
     <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml.vb">
       <DependentUpon>MachiningTreeExpanderView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionOpListBoxItem.vb" />
-    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\DispositionOpListBoxItem.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderView.xaml.vb">
+      <DependentUpon>DispositionParameterExpanderView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\MachiningOpListBoxItem.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderView.xaml.vb">
+      <DependentUpon>MachiningParameterExpanderView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\OperationListBoxItem.vb" />
     <Compile Include="ProjectPage\PopUpGridPanel\PopUpGridPanelView.xaml.vb">
       <DependentUpon>PopUpGridPanelView.xaml</DependentUpon>
     </Compile>
@@ -225,7 +233,7 @@
       <DependentUpon>OperationExpanderView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderViewModel.vb" />
-    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\MachiningOpListBoxItem.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderViewModel.vb" />
     <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml.vb">
       <DependentUpon>SimulationExpanderView.xaml</DependentUpon>
     </Compile>
@@ -322,6 +330,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\DispositionParameterExpander\DispositionParameterExpanderView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\MachiningParameterExpander\MachiningParameterExpanderView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ProjectPage\PopUpGridPanel\PopUpGridPanelView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index f349d9b..1fc5d21 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -54,6 +54,10 @@
    <SolidColorBrush x:Key="EgaltechGray" Color="#FF58585B" />
    <SolidColorBrush x:Key="EgaltechLightGray" Color="LightGray" />
 
+   <!--Risorsa che toglie le animazioni dai menù popup per evitare che i menù mru di scelta dei file rimangano aperti se il file è grosso -->
+   <!--o viene eseguito un lua che non aggiorna l'interfaccia-->
+   <PopupAnimation x:Key="{x:Static SystemParameters.MenuPopupAnimationKey}">None</PopupAnimation>
+
    <!-- Button Style -->
 
    <Style x:Key="FocusVisual">
diff --git a/IniFile.vb b/IniFile.vb
index ad3e97f..bd667fe 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -22,6 +22,7 @@ Module IniFile
       MACHINING = 1
       FIXTURE = 2
       RAWPART = 3
+      RAWPARTWITHFIXTURE = 4
       ALL = 99
    End Enum
 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml
new file mode 100644
index 0000000..faed606
--- /dev/null
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml
@@ -0,0 +1,108 @@
+<UserControl x:Class="DispositionParameterExpanderView"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+   <UserControl.Resources>
+      <sys:Int32 x:Key="TL">1</sys:Int32>
+      <sys:Int32 x:Key="TR">2</sys:Int32>
+      <sys:Int32 x:Key="BL">3</sys:Int32>
+      <sys:Int32 x:Key="BR">4</sys:Int32>
+   </UserControl.Resources>
+   
+   <StackPanel>
+
+      <Expander Header="RawPart" IsExpanded="{Binding RawPartIsExpanded}"
+         Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+         <StackPanel>
+            <CheckBox Content="Move with Fixture" IsChecked="{Binding MoveWithFixture, Mode=TwoWay}"/>
+         </StackPanel>
+      </Expander>
+
+      <Expander Header="Part" IsExpanded="{Binding PartIsExpanded}"
+         Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+         
+      </Expander>
+
+      <Expander Header="Fixture" IsExpanded="{Binding FixtureIsExpanded}"
+         Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+         <StackPanel>
+            <UniformGrid Columns="2">
+               <Button Content="Add"/>
+               <Button Content="Remove"/>
+            </UniformGrid>
+         </StackPanel>
+      </Expander>
+
+      <UniformGrid Columns="2">
+         <RadioButton Content="Move" IsChecked="{Binding MoveIsChecked}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="30"/>
+         <RadioButton Content="Rotate"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="30"/>
+      </UniformGrid>
+
+      <Grid Margin="0,5,0,5" Visibility="{Binding RawRefGroupVisibility}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+
+         <TextBlock Grid.ColumnSpan="4" Text="Move Raw Reference"/>
+         <RadioButton Grid.Column="1" Grid.Row="1" Command="{Binding CheckedRawRefCommand}"
+            CommandParameter="{StaticResource TL}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="5,5,0,0"
+               Height="30" Width="30"/>
+         </RadioButton>
+         <RadioButton Grid.Column="2" Grid.Row="1" Command="{Binding CheckedRawRefCommand}"
+            CommandParameter="{StaticResource TR}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="0,5,5,0"
+               Height="30" Width="30"/>
+         </RadioButton>
+         <RadioButton Grid.Column="1" Grid.Row="2" Command="{Binding CheckedRawRefCommand}"
+            CommandParameter="{StaticResource BL}" IsChecked="{Binding BLIsChecked,Mode=OneWay}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="5,0,0,5"
+               Height="30" Width="30"/>
+         </RadioButton>
+         <RadioButton Grid.Column="2" Grid.Row="2" Command="{Binding CheckedRawRefCommand}"
+            CommandParameter="{StaticResource BR}"
+            Style="{StaticResource {x:Type ToggleButton}}" Height="40" Width="40">
+            <Border BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="0,0,5,5"
+               Height="30" Width="30"/>
+         </RadioButton>
+
+      </Grid>
+
+      <TextBlock Text="{Binding InputMsg,Mode=OneWay}" Margin="5,5,0,5"/>
+      <TextBox Text="{Binding InputValue,UpdateSourceTrigger=PropertyChanged}" Margin="5,0,5,5">
+         <TextBox.InputBindings>
+            <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
+            <!--<KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>-->
+         </TextBox.InputBindings>
+      </TextBox>
+      <TextBlock Text="{Binding InputErrorMsg,Mode=OneWay}" Margin="5,5,5,5"
+         Style="{StaticResource ValidationErrorTextBlock}"/>
+
+      <Grid Margin="5,0,5,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <!--<Button Command="{Binding ShowCommand}" Visibility="{Binding ShowBtnVisibility}"
+               Content="{Binding ShowMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>-->
+         <Button Command="{Binding DoneCommand}" Grid.Column="1"
+               Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+      </Grid>
+
+   </StackPanel>
+   
+</UserControl>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb
new file mode 100644
index 0000000..d405710
--- /dev/null
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderView.xaml.vb
@@ -0,0 +1,3 @@
+Public Class DispositionParameterExpanderView
+
+End Class
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb
new file mode 100644
index 0000000..2f30fdc
--- /dev/null
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderViewModel.vb
@@ -0,0 +1,821 @@
+Imports EgtUILib
+
+Namespace EgtCAM5
+
+   Public Class DispositionParameterExpanderViewModel
+      Inherits ViewModelBase
+
+      Public Enum ObjectType As Integer
+         RAWPART = 1
+         PART = 2
+         FIXTURE = 3
+      End Enum
+
+      Private m_ActiveObject As ObjectType
+      Public Property ActiveObject As ObjectType
+         Get
+            Return m_ActiveObject
+         End Get
+         Set(value As ObjectType)
+            If value <> m_ActiveObject Then
+               Select Case value
+                  Case ObjectType.RAWPART
+                     RawPartIsExpanded = True
+                  Case ObjectType.PART
+                     PartIsExpanded = True
+                  Case ObjectType.FIXTURE
+                     FixtureIsExpanded = True
+               End Select
+               m_ActiveObject = value
+            End If
+            m_ActiveObject = value
+         End Set
+      End Property
+
+      Friend m_Id As Integer
+      Public ReadOnly Property Id As Integer
+         Get
+            Return m_Id
+         End Get
+      End Property
+
+      Private m_Name As String
+      Public Property Name As String
+         Get
+            Return m_Name
+         End Get
+         Set(value As String)
+            m_Name = value
+         End Set
+      End Property
+
+      Private m_RawPartIsExpanded As Boolean
+      Public Property RawPartIsExpanded As Boolean
+         Get
+            Return m_RawPartIsExpanded
+         End Get
+         Set(value As Boolean)
+            If value <> m_RawPartIsExpanded Then
+               If value Then
+                  ' Chiudo Part e Fixture
+                  PartIsExpanded = False
+                  FixtureIsExpanded = False
+                  ' Abilito la selezione dei RawPart
+                  Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.RAWPART)
+                  If m_MoveIsChecked Then
+                     m_RawRefGroupVisibility = Visibility.Visible
+                     OnPropertyChanged("RawRefGroupVisibility")
+                  End If
+               Else
+                  ' Nascondo i bottoni per impostare la posizione di riferimento del grezzo
+                  m_RawRefGroupVisibility = Visibility.Collapsed
+                  OnPropertyChanged("RawRefGroupVisibility")
+                  ' smarco la prima entità selezionata
+                  EgtResetMark(EgtGetFirstSelectedObj)
+                  EgtDeselectAll()
+                  EgtDraw()
+               End If
+               m_RawPartIsExpanded = value
+               ActiveObject = ObjectType.RAWPART
+               OnPropertyChanged("RawPartIsExpanded")
+            End If
+         End Set
+      End Property
+
+      Private m_PartIsExpanded As Boolean
+      Public Property PartIsExpanded As Boolean
+         Get
+            Return m_PartIsExpanded
+         End Get
+         Set(value As Boolean)
+            If value <> m_PartIsExpanded Then
+               If value Then
+                  ' Chiudo RawPart e Fixture
+                  RawPartIsExpanded = False
+                  FixtureIsExpanded = False
+               Else
+                  ' smarco la prima entità selezionata
+                  EgtResetMark(EgtGetFirstSelectedObj)
+                  EgtDeselectAll()
+                  EgtDraw()
+               End If
+               m_PartIsExpanded = value
+               ActiveObject = ObjectType.PART
+               OnPropertyChanged("PartIsExpanded")
+            End If
+         End Set
+      End Property
+
+      Private m_FixtureIsExpanded As Boolean
+      Public Property FixtureIsExpanded As Boolean
+         Get
+            Return m_FixtureIsExpanded
+         End Get
+         Set(value As Boolean)
+            If value <> m_FixtureIsExpanded Then
+               If value Then
+                  ' Chiudo RawPart e Part
+                  RawPartIsExpanded = False
+                  PartIsExpanded = False
+                  ' Abilito la selezione delle Fixture
+                  Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.FIXTURE)
+               Else
+                  ' smarco la prima entità selezionata
+                  EgtResetMark(EgtGetFirstSelectedObj)
+                  ' deseleziono tutto ed aggiorno la visualizzazione
+                  EgtDeselectAll()
+                  EgtDraw()
+               End If
+               m_FixtureIsExpanded = value
+               ActiveObject = ObjectType.FIXTURE
+               OnPropertyChanged("FixtureIsExpanded")
+            End If
+         End Set
+      End Property
+
+      Private m_MoveIsChecked As Boolean
+      Public Property MoveIsChecked As Boolean
+         Get
+            Return m_MoveIsChecked
+         End Get
+         Set(value As Boolean)
+            If value <> m_MoveIsChecked Then
+               Application.Msn.NotifyColleagues(Application.SETMOVEINDISPOSITION, value)
+               InputValue = String.Empty
+               OnPropertyChanged("InputValue")
+               If value Then
+                  If m_RawPartIsExpanded Then
+                     m_RawRefGroupVisibility = Visibility.Visible
+                     OnPropertyChanged("RawRefGroupVisibility")
+                  Else
+                     m_RawRefGroupVisibility = Visibility.Collapsed
+                     OnPropertyChanged("RawRefGroupVisibility")
+                  End If
+                  m_InputMsg = "Move to:"
+               Else
+                  m_RawRefGroupVisibility = Visibility.Collapsed
+                  OnPropertyChanged("RawRefGroupVisibility")
+                  m_InputMsg = "Rotate of:"
+               End If
+               OnPropertyChanged("InputMsg")
+               m_MoveIsChecked = value
+            End If
+         End Set
+      End Property
+
+      Private m_MoveWithFixture As Boolean = False
+      Public Property MoveWithFixture As Boolean
+         Get
+            Return m_MoveWithFixture
+         End Get
+         Set(value As Boolean)
+            If value <> m_MoveWithFixture Then
+               If value Then
+                  ' Abilito la selezione di RawPart con autoselezione delle sue ventose
+                  Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.RAWPARTWITHFIXTURE)
+               Else
+                  ' Abilito la selezione di RawPart
+                  Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.RAWPART)
+               End If
+               m_MoveWithFixture = value
+               OnPropertyChanged("MoveWithFixture")
+            End If
+         End Set
+      End Property
+
+      Private m_InputValue As String
+      Public Property InputValue As String
+         Get
+            Return m_InputValue
+         End Get
+         Set(value As String)
+            If Not String.IsNullOrEmpty(m_InputErrorMsg) Then
+               m_InputErrorMsg = String.Empty
+               OnPropertyChanged("InputErrorMsg")
+            End If
+            m_InputValue = value
+         End Set
+      End Property
+
+      Private m_BLIsChecked As Boolean = True
+      Public ReadOnly Property BLIsChecked As Boolean
+         Get
+            Return m_BLIsChecked
+         End Get
+      End Property
+
+      Private m_RawRefPosition As MCH_CR = MCH_CR.BL
+
+      Private m_RawRefGroupVisibility As Visibility
+      Public ReadOnly Property RawRefGroupVisibility As Visibility
+         Get
+            Return m_RawRefGroupVisibility
+         End Get
+      End Property
+
+#Region "Messages"
+
+      Private m_InputMsg As String
+      Public ReadOnly Property InputMsg As String
+         Get
+            Return m_InputMsg
+         End Get
+      End Property
+
+      Private m_InputErrorMsg As String
+      Public ReadOnly Property InputErrorMsg As String
+         Get
+            Return m_InputErrorMsg
+         End Get
+      End Property
+
+#End Region    ' Messages
+
+      ' Definizione comandi
+      Private m_cmdDone As ICommand
+      Private m_cmdCheckedRawRef As ICommand
+
+#Region "CONSTRUCTOR"
+
+      Sub New(ByRef OpenDispositionFunction As Action(Of Boolean))
+         OpenDispositionFunction = AddressOf OpenDispositionParameters
+         MoveIsChecked = True
+         m_BLIsChecked = True
+         OnPropertyChanged("BLIsChecked")
+         m_RawRefPosition = MCH_CR.BL
+      End Sub
+
+#End Region
+
+#Region "METHODS"
+
+      Public Sub OpenDispositionParameters(bFirst As Boolean)
+         If bFirst Then
+            ActiveObject = ObjectType.RAWPART
+         Else
+            ActiveObject = ObjectType.FIXTURE
+         End If
+         Select Case m_ActiveObject
+            Case ObjectType.RAWPART
+               ' Abilito la selezione delle Fixture
+               Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.RAWPART)
+            Case ObjectType.FIXTURE
+               ' Abilito la selezione delle Fixture
+               Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.FIXTURE)
+         End Select
+         m_MoveWithFixture = False
+         OnPropertyChanged("MoveWithFixture")
+      End Sub
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#Region "DoneCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Done.
+      ''' </summary>
+      Public ReadOnly Property DoneCommand As ICommand
+         Get
+            If m_cmdDone Is Nothing Then
+               m_cmdDone = New RelayCommand(AddressOf Done)
+            End If
+            Return m_cmdDone
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the DoneCommand.
+      ''' </summary>
+      Public Sub Done(ByVal param As Object)
+         ' Verifico la validità del punto in Input
+         If Not String.IsNullOrEmpty(m_InputValue) Then
+            If m_MoveIsChecked Then
+               Dim InputPoint As New Point3d(0, 0, 0)
+               Dim Values() As String = m_InputValue.Split(","c)
+               If Values.Count = 2 Then
+                  StringToLen(Values(0), InputPoint.x)
+                  StringToLen(Values(1), InputPoint.y)
+               Else
+                  m_InputErrorMsg = "Il valore non è una cordinata XY"
+                  OnPropertyChanged("InputErrorMsg")
+                  Return
+               End If
+               ' Vettore di movimento
+               Dim vtMove As Vector3d
+               ' lo imposto a seconda del tipo del primo elemento selezionato
+               Dim nFirstSelectedId As Integer = EgtGetFirstSelectedObj()
+               If EgtVerifyRawPartCurrPhase(nFirstSelectedId) Then
+                  Dim bboxRawPart As New BBox3d
+                  ' recupero il solido del grezzo dal primo elemento selezionato
+                  Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nFirstSelectedId, RAWSOLID)
+                  ' ne calcolo il BBox
+                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.STANDARD, bboxRawPart)
+                  ' imposto il riferimento della tavola
+                  Dim ptTableRef As Point3d
+                  EgtGetTableRef(1, ptTableRef)
+                  ' calcolo i punti min e max del bbox riferiti alla tavola
+                  Dim ptBBoxRawPartMin As New Point3d(bboxRawPart.Min)
+                  Dim ptBBoxRawPartMax As New Point3d(bboxRawPart.Max)
+                  ptBBoxRawPartMin.ToLoc(New Frame3d(ptTableRef))
+                  ptBBoxRawPartMax.ToLoc(New Frame3d(ptTableRef))
+                  ' dal box e dal tipo di punto di riferimento selezionato ricavo le coordinate del punto di riferimento
+                  Dim ptRawRefPoint As Point3d
+                  Select Case m_RawRefPosition
+                     Case MCH_CR.TL
+                        ptRawRefPoint.x = ptBBoxRawPartMin.x
+                        ptRawRefPoint.y = ptBBoxRawPartMax.y
+                     Case MCH_CR.TR
+                        ptRawRefPoint.x = ptBBoxRawPartMax.x
+                        ptRawRefPoint.y = ptBBoxRawPartMax.y
+                     Case MCH_CR.BL
+                        ptRawRefPoint.x = ptBBoxRawPartMin.x
+                        ptRawRefPoint.y = ptBBoxRawPartMin.y
+                     Case MCH_CR.BR
+                        ptRawRefPoint.x = ptBBoxRawPartMax.x
+                        ptRawRefPoint.y = ptBBoxRawPartMin.y
+                  End Select
+                  ptRawRefPoint.z = ptBBoxRawPartMin.z
+                  ' creo un punto con le coordinate di input espresse rispetto alla tavola
+                  Dim TableRefInputPoint As New Point3d(InputPoint)
+                  TableRefInputPoint.LocToLoc(EgtGetGridFrame(), New Frame3d(ptTableRef))
+                  ' calcolo il vettore di spostamento del grezzo
+                  vtMove = TableRefInputPoint - ptRawRefPoint
+               ElseIf EgtVerifyFixture(nFirstSelectedId) Then
+                  Dim SelObjFrame3d As New Frame3d(Frame3d.GLOB)
+                  EgtGetGroupGlobFrame(nFirstSelectedId, SelObjFrame3d)
+                  SelObjFrame3d.ToLoc(EgtGetGridFrame())
+                  Dim FixturePoint As New Point3d(SelObjFrame3d.Orig)
+                  ' Ricavo il vettore di movimento (tengo solo XY)
+                  vtMove = InputPoint - FixturePoint
+                  vtMove.z = 0
+               End If
+               ' Muovo tutti gli oggetti selezionati
+               MoveRawPartPartAndFixture(GDB_ID.SEL, vtMove)
+
+
+
+
+
+
+
+
+
+               '' flag che indica se è il primo oggetto selezionato
+               'Dim bFirstRawId As Boolean = True
+               'Dim bFirstFixtId As Boolean = True
+               '' Vettore di movimento
+               'Dim vtRawPartMove As Vector3d
+               'Dim vtFixtureMove As Vector3d
+               'Dim nSelId As Integer = EgtGetFirstSelectedObj()
+               'While nSelId <> GDB_ID.NULL
+               '   Select Case m_ActiveObject
+               '      Case ObjectType.RAWPART
+               '         If bFirstRawId Then
+               '            Dim bboxRawPart As New BBox3d
+               '            EgtGetBBox(nSelId, GDB_BB.STANDARD, bboxRawPart)
+               '            Dim ptRawRefPoint As Point3d
+               '            Select Case m_RawRefPosition
+               '               Case MCH_CR.TL
+               '                  ptRawRefPoint.x = bboxRawPart.Min.x
+               '                  ptRawRefPoint.y = bboxRawPart.Max.y
+               '               Case MCH_CR.TR
+               '                  ptRawRefPoint.x = bboxRawPart.Max.x
+               '                  ptRawRefPoint.y = bboxRawPart.Max.y
+               '               Case MCH_CR.BL
+               '                  ptRawRefPoint.x = bboxRawPart.Min.x
+               '                  ptRawRefPoint.y = bboxRawPart.Min.y
+               '               Case MCH_CR.BR
+               '                  ptRawRefPoint.x = bboxRawPart.Max.x
+               '                  ptRawRefPoint.y = bboxRawPart.Min.y
+               '            End Select
+               '            ptRawRefPoint.z = bboxRawPart.Min.z
+               '            Dim TableRefInputPoint As New Point3d(InputPoint)
+               '            Dim ptTableRef As Point3d
+               '            EgtGetTableRef(1, ptTableRef)
+               '            TableRefInputPoint.LocToLoc(EgtGetGridFrame(), New Frame3d(ptTableRef))
+               '            vtRawPartMove = TableRefInputPoint - ptRawRefPoint
+               '            bFirstRawId = False
+               '         End If
+               '         Dim bboxCurrRawPart As New BBox3d
+               '         EgtGetBBox(nSelId, GDB_BB.STANDARD, bboxCurrRawPart)
+               '         Dim ptCurrRawRefPoint As Point3d
+               '         Select Case m_RawRefPosition
+               '            Case MCH_CR.TL
+               '               ptCurrRawRefPoint.x = bboxCurrRawPart.Min.x
+               '               ptCurrRawRefPoint.y = bboxCurrRawPart.Max.y
+               '            Case MCH_CR.TR
+               '               ptCurrRawRefPoint.x = bboxCurrRawPart.Max.x
+               '               ptCurrRawRefPoint.y = bboxCurrRawPart.Max.y
+               '            Case MCH_CR.BL
+               '               ptCurrRawRefPoint.x = bboxCurrRawPart.Min.x
+               '               ptCurrRawRefPoint.y = bboxCurrRawPart.Min.y
+               '            Case MCH_CR.BR
+               '               ptCurrRawRefPoint.x = bboxCurrRawPart.Max.x
+               '               ptCurrRawRefPoint.y = bboxCurrRawPart.Min.y
+               '         End Select
+               '         ptCurrRawRefPoint.z = bboxCurrRawPart.Min.z
+               '         Dim bErrorMoving As Boolean = False
+               '         If Not EgtMoveToCornerRawPart(nSelId, ptCurrRawRefPoint + vtRawPartMove, m_RawRefPosition) Then
+               '            bErrorMoving = True
+               '         ElseIf Not DispositionParameterExpanderViewModel.VerifyRawPartFixturePos(nSelId) Then
+               '            EgtMoveToCornerRawPart(nSelId, ptCurrRawRefPoint, m_RawRefPosition)
+               '            bErrorMoving = True
+               '         End If
+               '         If bErrorMoving Then
+               '            m_InputErrorMsg = "Impossibile muovere il grezzo fuori dalla tavola"
+               '            OnPropertyChanged("InputErrorMsg")
+               '         End If
+               '      Case ObjectType.PART
+               '         'EgtMove...
+               '      Case ObjectType.FIXTURE
+               '         If bFirstFixtId Then
+               '            Dim SelObjFrame3d As New Frame3d(Frame3d.GLOB)
+               '            EgtGetGroupGlobFrame(nSelId, SelObjFrame3d)
+               '            SelObjFrame3d.ToLoc(EgtGetGridFrame())
+               '            Dim FixturePoint As New Point3d(SelObjFrame3d.Orig)
+               '            ' Ricavo il vettore di movimento (tengo solo XY)
+               '            vtFixtureMove = InputPoint - FixturePoint
+               '            vtFixtureMove.z = 0
+               '            bFirstFixtId = False
+               '         End If
+               '         Dim nErrorMoving As Integer = 0
+               '         If Not EgtMoveFixture(nSelId, vtFixtureMove) Then
+               '            nSelId = EgtGetPrevSelectedObj()
+               '            nErrorMoving = 1
+               '         ElseIf Not DispositionParameterExpanderViewModel.VerifyRawPartFixturePos(nSelId) Then
+               '            nErrorMoving = 2
+               '         End If
+               '         If nErrorMoving <> 0 Then
+               '            If nErrorMoving = 1 Then
+               '               m_InputErrorMsg = "Impossibile muovere una ventosa fuori dalla tavola"
+               '            ElseIf nErrorMoving = 2 Then
+               '               m_InputErrorMsg = "Posizione già occupata da un'altra ventosa"
+               '            End If
+               '            OnPropertyChanged("InputErrorMsg")
+               '            While nSelId <> GDB_ID.NULL
+               '               If EgtVerifyFixture(nSelId) Then
+               '                  EgtMoveFixture(nSelId, -vtFixtureMove)
+               '               ElseIf EgtVerifyRawPartCurrPhase(nSelId) Then
+               '                  EgtMoveRawPart(nSelId, -vtFixtureMove)
+               '               End If
+               '               nSelId = EgtGetPrevSelectedObj()
+               '            End While
+               '         End If
+               '   End Select
+               'nSelId = EgtGetNextSelectedObj()
+               'End While
+            Else
+               Dim InputAngle As Double = 0
+               If Not StringToDouble(m_InputValue, InputAngle) Then
+                  m_InputErrorMsg = "Il valore non è un angolo valido"
+                  OnPropertyChanged("InputErrorMsg")
+                  Return
+               End If
+               Dim nSelId As Integer = EgtGetFirstSelectedObj()
+               While nSelId <> GDB_ID.NULL
+                  Select Case m_ActiveObject
+                     Case ObjectType.RAWPART
+                        'if not EgtRotateRawPart(nSelId, InputAngle) then
+                        '   m_InputErrorMsg = "Impossibile ruotare il grezzo."
+                        'End If
+                     Case ObjectType.PART
+                        'EgtMove...
+                     Case ObjectType.FIXTURE
+                        If Not EgtRotateFixture(nSelId, InputAngle) Then
+                           m_InputErrorMsg = "Impossibile ruotare la ventosa"
+                           OnPropertyChanged("InputErrorMsg")
+                        End If
+                  End Select
+                  nSelId = EgtGetNextSelectedObj()
+               End While
+            End If
+            EgtDraw()
+         End If
+      End Sub
+
+      Public Shared Function MoveRawPartPartAndFixture(nMoveId As Integer, vtMove As Vector3d) As Boolean
+         Dim bErrorMoving As Boolean = False
+         ' Muovo gli oggetti selezionati se consentito
+         If nMoveId = GDB_ID.SEL Then
+            Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
+            While nSelObjId <> GDB_ID.NULL
+               If EgtVerifyFixture(nSelObjId) Then
+                  If Not EgtMoveFixture(nSelObjId, vtMove) Then
+                     bErrorMoving = True
+                     nSelObjId = EgtGetPrevSelectedObj()
+                     While nSelObjId <> GDB_ID.NULL
+                        If EgtVerifyFixture(nSelObjId) Then
+                           EgtMoveFixture(nSelObjId, -vtMove)
+                        Else
+                           EgtMoveRawPart(nSelObjId, -vtMove)
+                        End If
+                        nSelObjId = EgtGetPrevSelectedObj()
+                     End While
+                     Exit While
+                  End If
+                  nSelObjId = EgtGetNextSelectedObj()
+               Else
+                  If Not EgtMoveRawPart(nSelObjId, vtMove) Then
+                     bErrorMoving = True
+                     nSelObjId = EgtGetPrevSelectedObj()
+                     While nSelObjId <> GDB_ID.NULL
+                        If EgtVerifyFixture(nSelObjId) Then
+                           EgtMoveFixture(nSelObjId, -vtMove)
+                        Else
+                           EgtMoveRawPart(nSelObjId, -vtMove)
+                        End If
+                        nSelObjId = EgtGetPrevSelectedObj()
+                     End While
+                     Exit While
+                  End If
+                  nSelObjId = EgtGetNextSelectedObj()
+               End If
+            End While
+         Else
+            If EgtVerifyFixture(nMoveId) Then
+               If Not EgtMoveFixture(nMoveId, vtMove) Then
+                  bErrorMoving = True
+               End If
+            Else
+               If Not EgtMoveRawPart(nMoveId, vtMove) Then
+                  bErrorMoving = True
+               End If
+            End If
+         End If
+         ' Se non ci sono stati errori nel movimento
+         Dim bErrorVerify As Boolean = False
+         If Not bErrorMoving Then
+            ' Verifico che gli spostamenti effettuati siano validi
+            If nMoveId = GDB_ID.SEL Then
+               Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
+               While nSelObjId <> GDB_ID.NULL
+                  If Not DispositionParameterExpanderViewModel.VerifyRawPartFixturePos(nSelObjId) Then
+                     bErrorVerify = True
+                     Exit While
+                  End If
+                  nSelObjId = EgtGetNextSelectedObj()
+               End While
+            Else
+               If Not DispositionParameterExpanderViewModel.VerifyRawPartFixturePos(nMoveId) Then
+                  bErrorVerify = True
+               End If
+            End If
+         End If
+         ' Se c'è almeno uno spostamento non valido
+         If bErrorVerify Then
+            ' ripristino la situazione iniziale annullando tutti i movimenti
+            If nMoveId = GDB_ID.SEL Then
+               Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
+               While nSelObjId <> GDB_ID.NULL
+                  If EgtVerifyFixture(nSelObjId) Then
+                     EgtMoveFixture(nSelObjId, -vtMove)
+                  Else
+                     EgtMoveRawPart(nSelObjId, -vtMove)
+                  End If
+                  nSelObjId = EgtGetNextSelectedObj()
+               End While
+            Else
+               If EgtVerifyFixture(nMoveId) Then
+                  EgtMoveFixture(nMoveId, -vtMove)
+               Else
+                  EgtMoveRawPart(nMoveId, -vtMove)
+               End If
+            End If
+            ' ritorno falso
+            Return False
+         End If
+         Return True
+      End Function
+
+      Public Shared Function VerifyRawPartFixturePos(nMovedObjId As Integer) As Boolean
+         ' Verifico quale sia il tipo dell'oggetto mosso
+         If EgtVerifyFixture(nMovedObjId) Then
+            Return VerifyFixturePosition(nMovedObjId)
+         ElseIf EgtVerifyRawPartCurrPhase(nMovedObjId) Then
+            Return VerifyRawPosition(nMovedObjId)
+         Else
+            Return False
+         End If
+      End Function
+
+      Private Shared Function VerifyFixturePosition(nMovedFixtureId As Integer) As Boolean
+         ' Definisco il box della ventosa mossa
+         Dim bboxMovedFixture As New BBox3d
+         EgtGetBBoxGlob(nMovedFixtureId, GDB_BB.STANDARD, bboxMovedFixture)
+         Dim bboxFixture As New BBox3d
+         ' Ciclo sui sottopezzi correnti per verificare le collisioni con il sottopezzo spostato
+         Dim nFixtureId As Integer = EgtGetFirstFixture()
+         While nFixtureId <> GDB_ID.NULL
+            If EgtVerifyFixture(nFixtureId) AndAlso nFixtureId <> nMovedFixtureId Then
+               ' ne calcolo il BBox
+               EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
+               ' verifico se c'è sovrapposizione
+               If bboxMovedFixture.OverlapsXY(bboxFixture) Then
+                  ' se c'è restituisco falso perchè i sottopezzi non si possono sovrapporre
+                  Return False
+               End If
+            End If
+            nFixtureId = EgtGetNextFixture(nFixtureId)
+         End While
+         Return VerifyFixtureWithRaw(nMovedFixtureId)
+      End Function
+
+      Private Shared Function VerifyFixtureWithRaw(nFixtureId As Integer) As Boolean
+         ' Tengo da parte il riferimento della tavola
+         Dim ptTableRef As Point3d
+         EgtGetTableRef(1, ptTableRef)
+         Dim TableFrame As New Frame3d(ptTableRef)
+         ' Definisco il box della ventosa mossa
+         Dim bboxFixture As New BBox3d
+         EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
+         Dim bboxRawPart As New BBox3d
+         ' Ciclo sui grezzi della fase corrente per verificare le collisioni con il sottopezzo mosso
+         Dim nRawPartId As Integer = EgtGetFirstRawPart()
+         While nRawPartId <> GDB_ID.NULL
+            If EgtVerifyRawPartCurrPhase(nRawPartId) Then
+               ' recupero il solido del grezzo
+               Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nRawPartId, RAWSOLID)
+               ' ne calcolo il BBox
+               EgtGetBBoxGlob(nRawSolidId, GDB_BB.STANDARD, bboxRawPart)
+               ' verifico se c'è sovrapposizione
+               If bboxFixture.OverlapsXY(bboxRawPart) Then
+                  ' se c'è devo verificare che l'altezza del grezzo sia uguale a quella della ventosa
+                  ' recupero altezza ventosa
+                  Dim dFixtureHeight As Double = 0
+                  EgtGetInfo(nFixtureId, "H", dFixtureHeight)
+                  ' recupero altezza grezzo riferita alla tavola
+                  Dim dRawPartMin As Point3d = bboxRawPart.Min
+                  dRawPartMin.ToLoc(TableFrame)
+                  ' se l'altezza grezzo è diversa da quella della ventosa, lo sposto alla stessa altezza
+                  If dRawPartMin.z <> dFixtureHeight Then
+                     Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
+                     EgtMoveRawPart(nRawPartId, vtMove)
+                     ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
+                     EgtGetBBoxGlob(nRawSolidId, GDB_BB.STANDARD, bboxRawPart)
+                  End If
+                  ' se non c'è sovrapposizione devo verificare il grezzo con tutti gli altri sottopezzi per sapere se ho tolto l'ultimo e quindi devo abbassarlo
+               Else
+                  ' Variabile che dice se c'è almeno una ventosa sotto il grezzo
+                  Dim bIsFixtureUnderRawPart As Boolean = False
+                  Dim nOtherFixtureId As Integer = EgtGetFirstFixture()
+                  While nOtherFixtureId <> GDB_ID.NULL
+                     ' evito di rifare la verifica sul sottopezzo mosso
+                     If nOtherFixtureId <> nFixtureId Then
+                        ' calcolo il BBox del sottopezzo
+                        Dim bboxOtherFixture As New BBox3d
+                        EgtGetBBoxGlob(nOtherFixtureId, GDB_BB.STANDARD, bboxOtherFixture)
+                        If bboxRawPart.OverlapsXY(bboxOtherFixture) Then
+                           bIsFixtureUnderRawPart = True
+                        End If
+                     End If
+                     nOtherFixtureId = EgtGetNextFixture(nOtherFixtureId)
+                  End While
+                  ' se non ci sono ventose sotto il grezzo
+                  If Not bIsFixtureUnderRawPart Then
+                     ' recupero altezza grezzo riferita alla tavola
+                     Dim dRawPartMin As Point3d = bboxRawPart.Min
+                     dRawPartMin.ToLoc(TableFrame)
+                     ' verifico che il grezzo sia ad altezza tavola
+                     If dRawPartMin.z <> 0 Then
+                        Dim vtMove As New Vector3d(0, 0, -dRawPartMin.z)
+                        EgtMoveRawPart(nRawPartId, vtMove)
+                     End If
+                  End If
+               End If
+            End If
+            nRawPartId = EgtGetNextRawPart(nRawPartId)
+         End While
+         Return True
+      End Function
+
+      Private Shared Function VerifyRawPosition(nMovedRawId As Integer) As Boolean
+         ' Recupero il solido del grezzo
+         Dim nMovedRawSolidId As Integer = EgtGetFirstNameInGroup(nMovedRawId, RAWSOLID)
+         ' definisco il box del solido del grezzo
+         Dim bboxMovedRawPart As New BBox3d
+         EgtGetBBoxGlob(nMovedRawSolidId, GDB_BB.STANDARD, bboxMovedRawPart)
+         Dim bboxRawPart As New BBox3d
+         ' Ciclo sui grezzi della fase corrente per verificare le collisioni con il grezzo spostato
+         Dim nRawPartId As Integer = EgtGetFirstRawPart()
+         While nRawPartId <> GDB_ID.NULL
+            If EgtVerifyRawPartCurrPhase(nRawPartId) AndAlso nRawPartId <> nMovedRawId Then
+               ' recupero il solido del grezzo
+               Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nRawPartId, RAWSOLID)
+               ' ne calcolo il BBox
+               EgtGetBBoxGlob(nRawSolidId, GDB_BB.STANDARD, bboxRawPart)
+               ' verifico se c'è sovrapposizione
+               If bboxMovedRawPart.OverlapsXY(bboxRawPart) Then
+                  ' se c'è restituisco falso perchè i grezzi non si possono sovrapporre
+                  Return False
+               End If
+            End If
+            nRawPartId = EgtGetNextRawPart(nRawPartId)
+         End While
+         ' verifico le interferenze tra il grezzo spostato e le ventose
+         Return VerifyRawWithFixture(nMovedRawId)
+      End Function
+
+      Private Shared Function VerifyRawWithFixture(nRawId As Integer) As Boolean
+         ' Tengo da parte il riferimento della tavola
+         Dim ptTableRef As Point3d
+         EgtGetTableRef(1, ptTableRef)
+         Dim TableFrame As New Frame3d(ptTableRef)
+         ' Recupero il solido del grezzo
+         Dim nMovedRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
+         ' definisco il box del solido del grezzo
+         Dim bboxRawPartId As New BBox3d
+         EgtGetBBoxGlob(nMovedRawSolidId, GDB_BB.STANDARD, bboxRawPartId)
+         ' Variabile che dice se c'è almeno una ventosa sotto il grezzo
+         Dim bIsFixtureUnderRawPart As Boolean = False
+         Dim bboxFixture As New BBox3d
+         ' Ciclo sulle ventose presenti per verificare le collisioni con il grezzo
+         Dim nFixtureId As Integer = EgtGetFirstFixture()
+         While nFixtureId <> GDB_ID.NULL
+            ' calcolo il BBox della ventosa
+            EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
+            ' verifico se c'è sovrapposizione
+            If bboxRawPartId.OverlapsXY(bboxFixture) Then
+               ' recupero altezza ventosa
+               Dim dFixtureHeight As Double = 0
+               EgtGetInfo(nFixtureId, "H", dFixtureHeight)
+               ' recupero altezza grezzo riferita alla tavola
+               Dim dRawPartMin As Point3d = bboxRawPartId.Min
+               dRawPartMin.ToLoc(TableFrame)
+               ' se l'altezza grezzo è diversa da quella della ventosa, lo sposto alla stessa altezza
+               If dRawPartMin.z <> dFixtureHeight Then
+                  Dim vtMove As New Vector3d(0, 0, dFixtureHeight - dRawPartMin.z)
+                  EgtMoveRawPart(nRawId, vtMove)
+                  ' recupero il solido del grezzo
+                  Dim nRawSolidId As Integer = EgtGetFirstNameInGroup(nRawId, RAWSOLID)
+                  ' ricalcolo il BBox del solido del grezzo per averlo aggiornato con la nuova Z
+                  EgtGetBBoxGlob(nRawSolidId, GDB_BB.STANDARD, bboxRawPartId)
+               End If
+               bIsFixtureUnderRawPart = True
+            End If
+            nFixtureId = EgtGetNextFixture(nFixtureId)
+         End While
+         ' se non ci sono ventose sotto il grezzo
+         If Not bIsFixtureUnderRawPart Then
+            ' recupero altezza grezzo riferita alla tavola
+            Dim dRawPartMin As Point3d = bboxRawPartId.Min
+            dRawPartMin.ToLoc(TableFrame)
+            ' verifico che il grezzo sia ad altezza tavola
+            If dRawPartMin.z <> 0 Then
+               Dim vtMove As New Vector3d(0, 0, -dRawPartMin.z)
+               EgtMoveRawPart(nRawId, vtMove)
+            End If
+         End If
+         Return True
+      End Function
+
+      Friend Shared Function FixtureType(nFixtureId As Integer) As FIX_TYPE
+         Dim sFitureType As String = String.Empty
+         EgtGetInfo(nFixtureId, EgtUILib.FIX_TYPE, sFitureType)
+         Select Case sFitureType
+            Case FIX_VAC
+               Return FIX_TYPE.VACUUM
+            Case FIX_REF
+               Return FIX_TYPE.REFERENCE
+         End Select
+         Return FIX_TYPE.NULL
+      End Function
+
+      Friend Enum FIX_TYPE As Integer
+         NULL = 0
+         VACUUM = 1
+         REFERENCE = 2
+      End Enum
+
+#End Region ' DoneCommand
+
+#Region "CheckedRawRefCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Done.
+      ''' </summary>
+      Public ReadOnly Property CheckedRawRefCommand As ICommand
+         Get
+            If m_cmdCheckedRawRef Is Nothing Then
+               m_cmdCheckedRawRef = New RelayCommand(AddressOf CheckedRawRef)
+            End If
+            Return m_cmdCheckedRawRef
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the DoneCommand.
+      ''' </summary>
+      Public Sub CheckedRawRef(ByVal param As Object)
+         Dim nRawRef As MCH_CR = DirectCast(param, MCH_CR)
+         m_RawRefPosition = nRawRef
+      End Sub
+
+#End Region ' CheckedRawRefCommand
+
+#End Region
+
+   End Class
+
+End Namespace
\ No newline at end of file
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml
new file mode 100644
index 0000000..b56cb2b
--- /dev/null
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml
@@ -0,0 +1,392 @@
+<UserControl x:Class="MachiningParameterExpanderView"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+
+   <UserControl.Resources>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</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>
+
+      <StackPanel Name="OperationParametersStackPanel">
+         <StackPanel Name="OperationFirstParametersStackPanel">
+            <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                          Converter={StaticResource OperationParamVisibilityConverter},
+                                                          ConverterParameter={StaticResource DepthStr}}">
+               <TextBlock Text="{Binding DepthMsg}"/>
+               <EgtWPFLib5:EgtTextBox Text="{Binding Depth,
+                                                     Converter={StaticResource DepthUnitConverter}}"/>
+            </UniformGrid>
+            <UniformGrid Columns="2" Height="20" Visibility="{Binding Type,
+                                                                         Converter={StaticResource OperationParamVisibilityConverter},
+                                                                         ConverterParameter={StaticResource Invert}}">
+               <TextBlock Text="{Binding InvertMsg}"/>
+               <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center"
+                     IsChecked="{Binding Invert}"/>
+            </UniformGrid>
+            <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource HeadSide}}">
+               <TextBlock Text="{Binding HeadSideMsg}"/>
+               <ComboBox ItemsSource="{Binding HeadSideList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedHeadSide}"
+                            IsSynchronizedWithCurrentItem="True">
+               </ComboBox>
+            </UniformGrid>
+            <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource WorkSide}}">
+               <TextBlock Text="{Binding WorkSideMsg}"/>
+               <ComboBox ItemsSource="{Binding WorkSideList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedWorkSide}"
+                            IsSynchronizedWithCurrentItem="True">
+               </ComboBox>
+            </UniformGrid>
+            <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource UserNotes}}">
+               <TextBlock Text="{Binding UserNotesMsg}"/>
+               <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes}">
+                  <EgtWPFLib5:EgtTextBox.ToolTip>
+                     <TextBlock Text="{Binding UserNotesTooltip}"/>
+                  </EgtWPFLib5:EgtTextBox.ToolTip>
+               </EgtWPFLib5:EgtTextBox>
+            </UniformGrid>
+         </StackPanel>
+         <Expander Header="{Binding GenericExpanderHeader}" Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <StackPanel>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                                Converter={StaticResource OperationParamVisibilityConverter},
+                                                                ConverterParameter={StaticResource StartPos}}">
+                  <TextBlock Text="{Binding StartPosMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding StartPos}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                                Converter={StaticResource OperationParamVisibilityConverter},
+                                                                ConverterParameter={StaticResource ReturnPos}}">
+                  <TextBlock Text="{Binding ReturnPosMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding ReturnPos}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource OverLapStr}}">
+                  <TextBlock Text="{Binding OverLapMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OverLap}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource ThrouAddLen}}">
+                  <TextBlock Text="{Binding ThrouAddLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding ThrouAddLen}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource StepType}}">
+                  <TextBlock Text="{Binding StepTypeMsg}"/>
+                  <ComboBox ItemsSource="{Binding StepTypeList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedStepType}"
+                            IsSynchronizedWithCurrentItem="True">
+                  </ComboBox>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource StepPar}}">
+                  <TextBlock Text="{Binding StepParMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding StepPar}"/>
+               </UniformGrid>
+            <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource StartSlowLen}}">
+                  <TextBlock Text="{Binding StartSlowLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding StartSlowLen}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource EndSlowLen}}">
+                  <TextBlock Text="{Binding EndSlowLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding EndSlowLen}"/>
+               </UniformGrid>
+            <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource SideAngle}}">
+                  <TextBlock Text="{Binding SideAngleMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding SideAngle}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource OffSr}}">
+                  <TextBlock Text="{Binding OffsetSrMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OffsetSr}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource OffSl}}">
+                  <TextBlock Text="{Binding OffsetSlMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OffsetSl}"/>
+               </UniformGrid>
+            </StackPanel>
+         </Expander>
+         <Expander Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource LeadInType}}"
+               Style="{StaticResource ExpanderStyle}">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding LeadInTypeMsg}" Margin="0,0,5,0"/>
+                  <ComboBox ItemsSource="{Binding LeadInTypeList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedLeadInType}"
+                            IsSynchronizedWithCurrentItem="True">
+                  </ComboBox>
+               </UniformGrid>
+            </Expander.Header>
+            <StackPanel>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource StartAddLen}}">
+                  <TextBlock Text="{Binding StartAddLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding StartAddLen}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LiTang}}">
+                  <TextBlock Text="{Binding LiTangMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LiTang}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LiPerp}}">
+                  <TextBlock Text="{Binding LiPerpMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LiPerp}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LiElev}}">
+                  <TextBlock Text="{Binding LiElevMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LiElev}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LiCompLen}}">
+                  <TextBlock Text="{Binding LiCompLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LiCompLen}"/>
+               </UniformGrid>
+            </StackPanel>
+         </Expander>
+
+         <Expander 
+               Visibility="{Binding Type,
+                                    Converter={StaticResource OperationParamVisibilityConverter},
+                                    ConverterParameter={StaticResource LeadOutType}}"
+               Style="{StaticResource ExpanderStyle}">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding LeadOutTypeMsg}" Margin="0,0,5,0"
+                        VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding LeadOutTypeList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedLeadOutType}"
+                            IsSynchronizedWithCurrentItem="True">
+                  </ComboBox>
+               </UniformGrid>
+            </Expander.Header>
+            <StackPanel Margin="2">
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource EndAddLen}}">
+                  <TextBlock Text="{Binding EndAddLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding EndAddLen}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LoTang}}">
+                  <TextBlock Text="{Binding LoTangMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LoTang}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LoPerp}}">
+                  <TextBlock Text="{Binding LoPerpMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LoPerp}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LoElev}}">
+                  <TextBlock Text="{Binding LoElevMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LoElev}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource LoCompLen}}">
+                  <TextBlock Text="{Binding LoCompLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding LoCompLen}"/>
+               </UniformGrid>
+            </StackPanel>
+         </Expander>
+         <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                       Converter={StaticResource OperationParamVisibilityConverter},
+                                                       ConverterParameter={StaticResource ExtLinkType}}">
+            <TextBlock Text="{Binding ExtLinkTypeMsg}"/>
+            <ComboBox ItemsSource="{Binding ExtLinkTypeList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedExtLinkType}"
+                            IsSynchronizedWithCurrentItem="True">
+            </ComboBox>
+         </UniformGrid>
+         <Expander Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource CurveUse}}"
+               Style="{StaticResource ExpanderStyle}">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding CurveUseMsg}" Margin="0,0,5,0"
+                        VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding CurveUseList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedCurveUse}"
+                            IsSynchronizedWithCurrentItem="True">
+                  </ComboBox>
+               </UniformGrid>
+            </Expander.Header>
+            <StackPanel Margin="2">
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource Approx}}">
+                  <TextBlock Text="{Binding ApproxMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding Approx}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource StepExtArc}}">
+                  <TextBlock Text="{Binding StepExtArcMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding StepExtArc}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource StepIntArc}}">
+                  <TextBlock Text="{Binding StepIntArcMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding StepIntArc}"/>
+               </UniformGrid>
+            </StackPanel>
+         </Expander>
+         <Expander Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource LeaveTab}}"
+               Style="{StaticResource ExpanderStyle}">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding LeaveTabMsg}"/>
+                  <CheckBox HorizontalAlignment="Center" IsChecked="{Binding LeaveTab}" />
+               </UniformGrid>
+            </Expander.Header>
+            <StackPanel>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource TabLen}}">
+                  <TextBlock Text="{Binding TabLenMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding TabLen}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource TabHeight}}">
+                  <TextBlock Text="{Binding TabHeightMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding TabHeight}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource TabAngle}}">
+                  <TextBlock Text="{Binding TabAngleMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding TabAngle}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource TabDist}}">
+                  <TextBlock Text="{Binding TabDistMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding TabDist}"/>
+               </UniformGrid>
+            </StackPanel>
+         </Expander>
+         <Expander Style="{StaticResource ExpanderStyle}">
+            <Expander.Header>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
+            </Expander.Header>
+            <StackPanel>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding SpeedMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding Speed}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding FeedMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding Feed}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding TipFeedMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding TipFeed}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding StartFeedMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding StartFeed}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding EndFeedMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding EndFeed}"/>
+               </UniformGrid>
+            </StackPanel>
+         </Expander>
+         <Button Name="ApplyMachBtn" Height="30" Content="{Binding ApplyMachiningBtnContent}"
+            Command="{Binding ReloadMachiningCommand}" />
+         <Interactivity:Interaction.Behaviors>
+            <EgtCAM5:AutomaticCloseExpander/>
+         </Interactivity:Interaction.Behaviors>
+      </StackPanel>
+   
+</UserControl>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb
new file mode 100644
index 0000000..d1edbb9
--- /dev/null
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml.vb
@@ -0,0 +1,3 @@
+Public Class MachiningParameterExpanderView
+
+End Class
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningOpListBoxItem.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb
similarity index 73%
rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningOpListBoxItem.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb
index d5642d0..a668e47 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningOpListBoxItem.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb
@@ -2,55 +2,23 @@
 Imports System.Collections.ObjectModel
 Imports EgtUILib
 
-Public Class MachiningOpListBoxItem
-   Inherits OperationListBoxItem
+Public Class MachiningParameterExpanderViewModel
+   Implements INotifyPropertyChanged
 
-   Private m_Status As Boolean
-   Public Property Status As Boolean
+   Friend m_Type As Integer
+   Public ReadOnly Property Type As Integer
       Get
-         Return m_Status
+         EgtGetMachiningParam(MCH_MP.TYPE, m_Type)
+         Return m_Type
       End Get
-      Set(value As Boolean)
-         If value <> m_Status Then
-            If m_Type = MCH_OY.NONE Or m_Type = MCH_OY.DISP Then
-               m_Status = True
-            Else
-               m_Status = value
-               EgtSetOperationMode(Id, m_Status)
-               EgtDraw()
-            End If
-         End If
-      End Set
-   End Property
-
-   Private m_Image As String
-   Public Property Image As String
-      Get
-         Return m_Image
-      End Get
-      Set(value As String)
-         m_Image = value
-      End Set
-   End Property
-
-   Private m_Info As String
-   Public Property Info As String
-      Get
-         Return m_Info
-      End Get
-      Set(value As String)
-         m_Info = value
-      End Set
    End Property
 
    Private m_Tool As String
-   Public Property Tool As String
+   Public ReadOnly Property Tool As String
       Get
+         EgtGetMachiningParam(MCH_MP.TOOL, m_Tool)
          Return m_Tool
       End Get
-      Set(value As String)
-         m_Tool = value
-      End Set
    End Property
 
    Public Property Invert As Boolean
@@ -742,20 +710,353 @@ Public Class MachiningOpListBoxItem
       End Set
    End Property
 
-   Sub New(nId As Integer, bStatus As Boolean, sName As String, nType As Integer, sTool As String, sMach As String)
-      m_Id = nId
-      Me.Status = bStatus
-      Me.Name = sName
-      m_Type = nType
-      Me.Image = ConvertTypeToImage(Type)
-      If Type = MCH_OY.DISP Then
-         Me.Info = String.Empty
-         Me.Tool = String.Empty
-      Else
-         Me.Info = "(" & If(Not String.IsNullOrEmpty(sTool), sTool, String.Empty) & ", " &
-                   If(Not String.IsNullOrEmpty(sMach), sMach, String.Empty) & ")"
-         Me.Tool = If(Not String.IsNullOrEmpty(sTool), "(" & sTool & ")", String.Empty)
-      End If
+#Region "Messages"
+
+   Public ReadOnly Property InvertMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 51)
+      End Get
+   End Property
+
+   Public ReadOnly Property DepthMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 99)
+      End Get
+   End Property
+
+   Public ReadOnly Property HeadSideMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 55)
+      End Get
+   End Property
+
+   Public ReadOnly Property WorkSideMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 54)
+      End Get
+   End Property
+
+   Public ReadOnly Property UserNotesMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 100)
+      End Get
+   End Property
+
+   Private m_UserNotesTooltip As String
+   Public ReadOnly Property UserNotesTooltip As String
+      Get
+         Return UserNotes
+      End Get
+   End Property
+
+   Public ReadOnly Property StartPosMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 73)
+      End Get
+   End Property
+
+   Public ReadOnly Property ReturnPosMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 78)
+      End Get
+   End Property
+
+   Public ReadOnly Property OverLapMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 101)
+      End Get
+   End Property
+
+   Public ReadOnly Property ThrouAddLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 76)
+      End Get
+   End Property
+
+   Public ReadOnly Property StepTypeMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 60)
+      End Get
+   End Property
+
+   Public ReadOnly Property StepParMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 77)
+      End Get
+   End Property
+
+   Public ReadOnly Property StartSlowLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 74)
+      End Get
+   End Property
+
+   Public ReadOnly Property EndSlowLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 75)
+      End Get
+   End Property
+
+   Public ReadOnly Property SideAngleMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 71)
+      End Get
+   End Property
+
+   Public ReadOnly Property OffsetSrMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 68)
+      End Get
+   End Property
+
+   Public ReadOnly Property OffsetSlMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 69)
+      End Get
+   End Property
+
+   Public ReadOnly Property LeadInTypeMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 56)
+      End Get
+   End Property
+
+   Public ReadOnly Property StartAddLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 91)
+      End Get
+   End Property
+
+   Public ReadOnly Property LiTangMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 83)
+      End Get
+   End Property
+
+   Public ReadOnly Property LiPerpMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 84)
+      End Get
+   End Property
+
+   Public ReadOnly Property LiElevMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 85)
+      End Get
+   End Property
+
+   Public ReadOnly Property LiCompLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 86)
+      End Get
+   End Property
+
+   Public ReadOnly Property LeadOutTypeMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 58)
+      End Get
+   End Property
+
+   Public ReadOnly Property EndAddLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 92)
+      End Get
+   End Property
+
+   Public ReadOnly Property LoTangMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 87)
+      End Get
+   End Property
+
+   Public ReadOnly Property LoPerpMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 88)
+      End Get
+   End Property
+
+   Public ReadOnly Property LoElevMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 89)
+      End Get
+   End Property
+
+   Public ReadOnly Property LoCompLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 90)
+      End Get
+   End Property
+
+   Public ReadOnly Property ExtLinkTypeMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 57)
+      End Get
+   End Property
+
+   Public ReadOnly Property LeaveTabMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 52)
+      End Get
+   End Property
+
+   Public ReadOnly Property TabLenMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 79)
+      End Get
+   End Property
+
+   Public ReadOnly Property TabHeightMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 80)
+      End Get
+   End Property
+
+   Public ReadOnly Property TabAngleMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 81)
+      End Get
+   End Property
+
+   Public ReadOnly Property TabDistMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 82)
+      End Get
+   End Property
+
+   Public ReadOnly Property CurveUseMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 59)
+      End Get
+   End Property
+
+   Public ReadOnly Property ApproxMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 72)
+      End Get
+   End Property
+
+   Public ReadOnly Property StepExtArcMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 93)
+      End Get
+   End Property
+
+   Public ReadOnly Property StepIntArcMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 94)
+      End Get
+   End Property
+
+   Public ReadOnly Property SpeedMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 63)
+      End Get
+   End Property
+
+   Public ReadOnly Property FeedMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 64)
+      End Get
+   End Property
+
+   Public ReadOnly Property TipFeedMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 67)
+      End Get
+   End Property
+
+   Public ReadOnly Property StartFeedMsg 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
+
+   Public ReadOnly Property OperationListHeader As String
+      Get
+         Return EgtMsg(MSG_OPERATION + 1)
+      End Get
+   End Property
+
+   Public ReadOnly Property ApplyMachiningBtnContent As String
+      Get
+         Return EgtMsg(MSG_OPERATION + 3)
+      End Get
+   End Property
+
+   Public ReadOnly Property GenericExpanderHeader As String
+      Get
+         Return EgtMsg(MSG_OPERATION + 7)
+      End Get
+   End Property
+
+   Public ReadOnly Property ToolExpanderHeader As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 98) & " " & m_Tool
+      End Get
+   End Property
+
+#End Region
+
+   Private Sub UpdateParamValues()
+      NotifyPropertyChanged("Type")
+      NotifyPropertyChanged("Tool")
+      NotifyPropertyChanged("Invert")
+      NotifyPropertyChanged("Depth")
+      NotifyPropertyChanged("SelectedHeadSide")
+      NotifyPropertyChanged("SelectedWorkSide")
+      NotifyPropertyChanged("UserNotes")
+      NotifyPropertyChanged("StartPos")
+      NotifyPropertyChanged("ReturnPos")
+      NotifyPropertyChanged("OverLap")
+      NotifyPropertyChanged("ThrouAddLen")
+      NotifyPropertyChanged("StepTypeList")
+      NotifyPropertyChanged("SelectedStepType")
+      NotifyPropertyChanged("StepPar")
+      NotifyPropertyChanged("StartSlowLen")
+      NotifyPropertyChanged("EndSlowLen")
+      NotifyPropertyChanged("SideAngle")
+      NotifyPropertyChanged("OffsetSr")
+      NotifyPropertyChanged("OffsetSl")
+      NotifyPropertyChanged("LeaveTab")
+      NotifyPropertyChanged("TabLen")
+      NotifyPropertyChanged("TabHeight")
+      NotifyPropertyChanged("TabAngle")
+      NotifyPropertyChanged("TabDist")
+      NotifyPropertyChanged("LeadInTypeList")
+      NotifyPropertyChanged("SelectedLeadInType")
+      NotifyPropertyChanged("StartAddLen")
+      NotifyPropertyChanged("LiTang")
+      NotifyPropertyChanged("LiPerp")
+      NotifyPropertyChanged("LiElev")
+      NotifyPropertyChanged("LiCompLen")
+      NotifyPropertyChanged("LeadOutTypeList")
+      NotifyPropertyChanged("SelectedLeadOutType")
+      NotifyPropertyChanged("EndAddLen")
+      NotifyPropertyChanged("LoTang")
+      NotifyPropertyChanged("LoPerp")
+      NotifyPropertyChanged("LoElev")
+      NotifyPropertyChanged("LoCompLen")
+      NotifyPropertyChanged("SelectedExtLinkType")
+      NotifyPropertyChanged("CurveUseList")
+      NotifyPropertyChanged("SelectedCurveUse")
+      NotifyPropertyChanged("Approx")
+      NotifyPropertyChanged("StepExtArc")
+      NotifyPropertyChanged("StepIntArc")
+      NotifyPropertyChanged("Speed")
+      NotifyPropertyChanged("Feed")
+      NotifyPropertyChanged("TipFeed")
+      NotifyPropertyChanged("StartFeed")
+      NotifyPropertyChanged("EndFeed")
+   End Sub
+
+   Sub New(ByRef m_UpdateParamValues As Action)
+      m_UpdateParamValues = AddressOf UpdateParamValues
    End Sub
 
    Private Function ConvertTypeToImage(Type As Integer) As String
@@ -781,6 +1082,12 @@ Public Class MachiningOpListBoxItem
       End Select
    End Function
 
+   Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged
+
+   Public Sub NotifyPropertyChanged(propName As String)
+      RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName))
+   End Sub
+
 End Class
 
 ''' <summary>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
index de56a07..b352ffb 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
@@ -6,61 +6,6 @@
    xmlns:EgtCAM5="clr-namespace:EgtCAM5"
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
-   <UserControl.Resources>
-      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
-      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-      <sys:Int32 x:Key="Invert">0</sys:Int32>
-      <sys:Int32 x:Key="LeaveTab">1</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>
-
    <StackPanel Name="OperationExpanderViewStackPanel">
 
       <Expander Header="{Binding OperationListHeader}" IsExpanded="{Binding ListIsExpanded}" Name="OperationsListExpander"
@@ -135,347 +80,10 @@
             <TextBlock Text="{Binding ParametersExpanderName}"/>
          </Expander.Header>
 
-         <StackPanel Name="OperationParametersStackPanel">
-            <StackPanel Name="OperationFirstParametersStackPanel">
-               <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource DepthStr}}">
-                  <TextBlock Text="{Binding DepthTxBl}"/>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Depth,
-                                                        Converter={StaticResource DepthUnitConverter}}"/>
-               </UniformGrid>
-               <UniformGrid Columns="2" Height="20" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                                         Converter={StaticResource OperationParamVisibilityConverter},
-                                                                         ConverterParameter={StaticResource Invert}}">
-                  <TextBlock Text="{Binding InvertTxBl}"/>
-                  <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center"
-                     IsChecked="{Binding ElementName=OperationList, Path=SelectedItem.Invert}"/>
-               </UniformGrid>
-               <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource HeadSide}}">
-                  <TextBlock Text="{Binding HeadSideTxBl}"/>
-                  <ComboBox ItemsSource="{Binding Path=SelectedItem.HeadSideList,
-                                            ElementName=OperationList, Mode=OneWay}"
-                            SelectedIndex="{Binding Path=SelectedItem.SelectedHeadSide,
-                                           ElementName=OperationList}"
-                            IsSynchronizedWithCurrentItem="True">
-                  </ComboBox>
-               </UniformGrid>
-               <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource WorkSide}}">
-                  <TextBlock Text="{Binding WorkSideTxBl}"/>
-                  <ComboBox ItemsSource="{Binding Path=SelectedItem.WorkSideList,
-                                            ElementName=OperationList, Mode=OneWay}"
-                            SelectedIndex="{Binding Path=SelectedItem.SelectedWorkSide,
-                                           ElementName=OperationList}"
-                            IsSynchronizedWithCurrentItem="True">
-                  </ComboBox>
-               </UniformGrid>
-               <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource UserNotes}}">
-                  <TextBlock Text="{Binding UserNotesTxBl}"/>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.UserNotes}">
-                     <EgtWPFLib5:EgtTextBox.ToolTip>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
-                     </EgtWPFLib5:EgtTextBox.ToolTip>
-                  </EgtWPFLib5:EgtTextBox>
-               </UniformGrid>
-            </StackPanel>
-            <Expander Header="{Binding GenericExpanderHeader}" Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-               <StackPanel>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                                Converter={StaticResource OperationParamVisibilityConverter},
-                                                                ConverterParameter={StaticResource StartPos}}">
-                     <TextBlock Text="{Binding StartPosTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartPos}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                                Converter={StaticResource OperationParamVisibilityConverter},
-                                                                ConverterParameter={StaticResource ReturnPos}}">
-                     <TextBlock Text="{Binding ReturnPosTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.ReturnPos}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource OverLapStr}}">
-                     <TextBlock Text="{Binding OverLapTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.OverLap}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource ThrouAddLen}}">
-                     <TextBlock Text="{Binding ThrouAddLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.ThrouAddLen}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource StepType}}">
-                     <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" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource StepPar}}">
-                     <TextBlock Text="{Binding StepParTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StepPar}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource StartSlowLen}}">
-                     <TextBlock Text="{Binding StartSlowLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartSlowLen}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource EndSlowLen}}">
-                     <TextBlock Text="{Binding EndSlowLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.EndSlowLen}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource SideAngle}}">
-                     <TextBlock Text="{Binding SideAngleTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.SideAngle}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource OffSr}}">
-                     <TextBlock Text="{Binding OffsetSrTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.OffsetSr}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource OffSl}}">
-                     <TextBlock Text="{Binding OffsetSlTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.OffsetSl}"/>
-                  </UniformGrid>
-               </StackPanel>
-            </Expander>
-            <Expander Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource LeadInType}}"
-               Style="{StaticResource ExpanderStyle}">
-               <Expander.Header>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding LeadInTypeTxBl}" Margin="0,0,5,0"/>
-                     <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" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource StartAddLen}}">
-                     <TextBlock Text="{Binding StartAddLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartAddLen}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LiTang}}">
-                     <TextBlock Text="{Binding LiTangTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiTang}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LiPerp}}">
-                     <TextBlock Text="{Binding LiPerpTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiPerp}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LiElev}}">
-                     <TextBlock Text="{Binding LiElevTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiElev}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LiCompLen}}">
-                     <TextBlock Text="{Binding LiCompLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LiCompLen}"/>
-                  </UniformGrid>
-               </StackPanel>
-            </Expander>
-            
-            <Expander 
-               Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                    Converter={StaticResource OperationParamVisibilityConverter},
-                                    ConverterParameter={StaticResource LeadOutType}}"
-               Style="{StaticResource ExpanderStyle}">
-               <Expander.Header>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding LeadOutTypeTxBl}" Margin="0,0,5,0"
-                        VerticalAlignment="Center"/>
-                     <ComboBox ItemsSource="{Binding Path=SelectedItem.LeadOutTypeList,
-                                            ElementName=OperationList, Mode=OneWay}"
-                            SelectedIndex="{Binding Path=SelectedItem.SelectedLeadOutType,
-                                           ElementName=OperationList}"
-                            IsSynchronizedWithCurrentItem="True">
-                     </ComboBox>
-                  </UniformGrid>
-               </Expander.Header>
-               <StackPanel Margin="2">
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource EndAddLen}}">
-                     <TextBlock Text="{Binding EndAddLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.EndAddLen}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LoTang}}">
-                     <TextBlock Text="{Binding LoTangTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoTang}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LoPerp}}">
-                     <TextBlock Text="{Binding LoPerpTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoPerp}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LoElev}}">
-                     <TextBlock Text="{Binding LoElevTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoElev}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource LoCompLen}}">
-                     <TextBlock Text="{Binding LoCompLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.LoCompLen}"/>
-                  </UniformGrid>
-               </StackPanel>
-            </Expander>
-            <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource ExtLinkType}}">
-               <TextBlock Text="{Binding ExtLinkTypeTxBl}"/>
-               <ComboBox ItemsSource="{Binding Path=SelectedItem.ExtLinkTypeList,
-                                            ElementName=OperationList, Mode=OneWay}"
-                            SelectedIndex="{Binding Path=SelectedItem.SelectedExtLinkType,
-                                           ElementName=OperationList}"
-                            IsSynchronizedWithCurrentItem="True">
-               </ComboBox>
-            </UniformGrid>
-            <Expander Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource CurveUse}}"
-               Style="{StaticResource ExpanderStyle}">
-               <Expander.Header>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding CurveUseTxBl}" Margin="0,0,5,0"
-                        VerticalAlignment="Center"/>
-                     <ComboBox ItemsSource="{Binding Path=SelectedItem.CurveUseList,
-                                            ElementName=OperationList, Mode=OneWay}"
-                            SelectedIndex="{Binding Path=SelectedItem.SelectedCurveUse,
-                                           ElementName=OperationList}"
-                            IsSynchronizedWithCurrentItem="True">
-                     </ComboBox>
-                  </UniformGrid>
-               </Expander.Header>
-               <StackPanel Margin="2">
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource Approx}}">
-                     <TextBlock Text="{Binding ApproxTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Approx}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource StepExtArc}}">
-                     <TextBlock Text="{Binding StepExtArcTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StepExtArc}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource StepIntArc}}">
-                     <TextBlock Text="{Binding StepIntArcTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StepIntArc}"/>
-                  </UniformGrid>
-               </StackPanel>
-            </Expander>
-            <Expander Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                        Converter={StaticResource OperationParamVisibilityConverter},
-                                        ConverterParameter={StaticResource LeaveTab}}"
-               Style="{StaticResource ExpanderStyle}">
-               <Expander.Header>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding LeaveTabTxBl}"/>
-                     <CheckBox HorizontalAlignment="Center" IsChecked="{Binding ElementName=OperationList, Path=SelectedItem.LeaveTab}" />
-                  </UniformGrid>
-               </Expander.Header>
-               <StackPanel>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource TabLen}}">
-                     <TextBlock Text="{Binding TabLenTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.TabLen}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource TabHeight}}">
-                     <TextBlock Text="{Binding TabHeightTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.TabHeight}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource TabAngle}}">
-                     <TextBlock Text="{Binding TabAngleTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.TabAngle}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                             Converter={StaticResource OperationParamVisibilityConverter},
-                                                             ConverterParameter={StaticResource TabDist}}">
-                     <TextBlock Text="{Binding TabDistTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.TabDist}"/>
-                  </UniformGrid>
-               </StackPanel>
-            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
-               <Expander.Header>
-                  <TextBlock Text="{Binding ToolExpanderHeader}"/>
-               </Expander.Header>
-               <StackPanel>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding SpeedTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Speed}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding FeedTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.Feed}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding TipFeedTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.TipFeed}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding StartFeedTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.StartFeed}"/>
-                  </UniformGrid>
-                  <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding EndFeedTxBl}"/>
-                     <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.EndFeed}"/>
-                  </UniformGrid>
-               </StackPanel>
-            </Expander>
-            <Button Name="ApplyMachBtn" Height="30" Content="{Binding ApplyMachiningBtnContent}" Command="{Binding ReloadMachiningCommand}" />
-            <Interactivity:Interaction.Behaviors>
-               <EgtCAM5:AutomaticCloseExpander/>
-            </Interactivity:Interaction.Behaviors>
-         </StackPanel>
-      </Expander>
+         <!--ContentPresenter that contains the OperationParameters-->
+         <ContentPresenter Content="{Binding OperationParameters,Mode=OneWay}"/>
+
+      </Expander> 
 
    </StackPanel>
 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
index 90fbf17..ba6137d 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
@@ -39,12 +39,12 @@ Public Class OperationExpanderView
 
    Private Sub OperationExpanderTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
       CalculateOperationParametersStackPanelMaxHeight()
-      For Each Expander In OperationParametersStackPanel.Children
-         If TypeOf Expander Is Expander Then
-            Dim CurrExpander As Expander = DirectCast(Expander, Expander)
-            CurrExpander.IsExpanded = False
-         End If
-      Next
+      'For Each Expander In OperationParametersStackPanel.Children
+      '   If TypeOf Expander Is Expander Then
+      '      Dim CurrExpander As Expander = DirectCast(Expander, Expander)
+      '      CurrExpander.IsExpanded = False
+      '   End If
+      'Next
    End Sub
 
    Private Sub CalculateOperationParametersStackPanelMaxHeight()
@@ -72,22 +72,22 @@ Public Class OperationExpanderView
          OperationsListExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
          OccupiedHeight += (OperationsListExpander.ActualHeight - OperationsListExpanderContent.DesiredSize.Height)
       End If
-      If Not OperationParametersExpander.IsExpanded Then
-         OccupiedHeight += OperationParametersExpander.ActualHeight
-      Else
-         Dim OperationParametersExpanderContent As FrameworkElement = DirectCast(OperationParametersExpander.Content, FrameworkElement)
-         OperationParametersExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
-         OccupiedHeight += (OperationParametersExpander.ActualHeight - OperationParametersExpanderContent.DesiredSize.Height)
-      End If
-      ' Aggiungo altezza contenuto OperationParameters che però è fuori dallo Stackpanel
-      OperationFirstParametersStackPanel.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
-      If OperationFirstParametersStackPanel.DesiredSize.Height <> 0 Then
-         OccupiedHeight += OperationFirstParametersStackPanel.DesiredSize.Height
-      Else
-         ' aggiungo il valore calcolato provando se non viene calcolato dal sistema al momento
-         OccupiedHeight += 10
-      End If
-      OperationParametersStackPanel.MaxHeight = OptionPanelViewStackPanel.MaxHeight - OccupiedHeight
+      'If Not OperationParametersExpander.IsExpanded Then
+      '   OccupiedHeight += OperationParametersExpander.ActualHeight
+      'Else
+      '   Dim OperationParametersExpanderContent As FrameworkElement = DirectCast(OperationParametersExpander.Content, FrameworkElement)
+      '   OperationParametersExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+      '   OccupiedHeight += (OperationParametersExpander.ActualHeight - OperationParametersExpanderContent.DesiredSize.Height)
+      'End If
+      '' Aggiungo altezza contenuto OperationParameters che però è fuori dallo Stackpanel
+      'OperationFirstParametersStackPanel.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+      'If OperationFirstParametersStackPanel.DesiredSize.Height <> 0 Then
+      '   OccupiedHeight += OperationFirstParametersStackPanel.DesiredSize.Height
+      'Else
+      '   ' aggiungo il valore calcolato provando se non viene calcolato dal sistema al momento
+      '   OccupiedHeight += 10
+      'End If
+      'OperationParametersStackPanel.MaxHeight = OptionPanelViewStackPanel.MaxHeight - OccupiedHeight
    End Sub
 
    ' Funzione che permette di trovare il primo contenitore di tipo T di un elemento grafico dependencyObject 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index 42d42a7..1462bf2 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -103,45 +103,82 @@ Namespace EgtCAM5
                m_ParametersIsExpanded = value
                If value Then
                   If m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONLIST Then
-                     If SelectedOperation.Type <> MCH_OY.DISP Then
-                        ListIsExpanded = False
-                     Else
-                        m_ParametersIsExpanded = False
-                        ListIsExpanded = True
-                        Return
-                     End If
+                     ListIsExpanded = False
                   ElseIf m_CurrExpandedExpander = MachiningOptionPanelExpander.SIMULATION Then
                      m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
                      Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_SET_ISEXPANDED, False)
                   End If
                   ParametersExpanderName = m_SelectedOperation.Name
                   m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
-                  ' Leggo il tipo di operazione per impostare il tipo di selezione
-                  Dim OperationType As Integer = -1
-                  EgtGetMachiningParam(MCH_MP.TYPE, OperationType)
-                  ' Abilito la selezione delle lavorazioni
-                  Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.MACHINING)
-                  ' Abilito la selezione dei giusti tipi di geometria
-                  Select Case OperationType
-                     Case MCH_OY.SAWING
-                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomSawing)
-                     Case MCH_OY.DRILLING
-                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomDrilling)
-                     Case MCH_OY.MILLING
-                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomMilling)
-                     Case MCH_OY.POCKETING
-                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomPocketing)
-                     Case MCH_OY.MORTISING
-                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomMortising)
-                     Case MCH_OY.SAWROUGHING
-                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomSawRoughing)
-                     Case MCH_OY.SAWFINISHING
-                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomSawFinishing)
+                  Select Case SelectedOperation.m_Type
+                     Case MCH_OY.DISP
+                        ' Abilito la selezione di tutti i tipi di geometria
+                        Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, SceneSelModeOpt.ALL)
+                        ' Verifico se c'è un grezzo nella disposizione corrente
+                        Dim bFirstRaw As Boolean = True
+                        Dim nCurrPhase As Integer = EgtGetCurrPhase()
+                        Dim nRawPartId As Integer = EgtGetFirstRawPart()
+                        While nRawPartId <> GDB_ID.NULL
+                           If EgtVerifyRawPartPhase(nRawPartId, nCurrPhase) Then
+                              bFirstRaw = False
+                              Exit While
+                           End If
+                           nRawPartId = EgtGetNextRawPart(nRawPartId)
+                        End While
+                        ' Lancio funzione che inizializza la disposizione
+                        m_OpenDispositionFunction(bFirstRaw)
+                        ' Nascondo tutte le lavorazioni
+                        Dim nOpId As Integer = EgtGetFirstOperation()
+                        While nOpId <> GDB_ID.NULL
+                           Dim nOpType As Integer = EgtGetOperationType(nOpId)
+                           If nOpType = MCH_OY.DRILLING OrElse nOpType = MCH_OY.SAWING OrElse nOpType = MCH_OY.MILLING OrElse nOpType = MCH_OY.POCKETING OrElse nOpType = MCH_OY.MORTISING _
+                              OrElse nOpType = MCH_OY.SAWROUGHING OrElse nOpType = MCH_OY.SAWFINISHING Then
+                              EgtSetStatus(nOpId, GDB_ST.OFF)
+                           End If
+                           nOpId = EgtGetNextOperation(nOpId)
+                        End While
+                        EgtDraw()
+                     Case MCH_OY.DRILLING, MCH_OY.SAWING, MCH_OY.MILLING, MCH_OY.MORTISING, MCH_OY.POCKETING, MCH_OY.SAWROUGHING, MCH_OY.SAWFINISHING
+                        ' Leggo il tipo di operazione per impostare il tipo di selezione
+                        Dim OperationType As Integer = -1
+                        EgtGetMachiningParam(MCH_MP.TYPE, OperationType)
+                        ' Abilito la selezione delle lavorazioni
+                        Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.MACHINING)
+                        ' Abilito la selezione dei giusti tipi di geometria
+                        Select Case OperationType
+                           Case MCH_OY.SAWING
+                              Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomSawing)
+                           Case MCH_OY.DRILLING
+                              Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomDrilling)
+                           Case MCH_OY.MILLING
+                              Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomMilling)
+                           Case MCH_OY.POCKETING
+                              Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomPocketing)
+                           Case MCH_OY.MORTISING
+                              Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomMortising)
+                           Case MCH_OY.SAWROUGHING
+                              Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomSawRoughing)
+                           Case MCH_OY.SAWFINISHING
+                              Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, m_SelGeomSawFinishing)
+                        End Select
                   End Select
                Else
                   If m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONLIST Then
                      ListIsExpanded = True
                   End If
+                  If SelectedOperation.m_Type = MCH_OY.DISP Then
+                     ' Riattivo tutte le lavorazioni
+                     Dim nOpId As Integer = EgtGetFirstOperation()
+                     While nOpId <> GDB_ID.NULL
+                        Dim nOpType As Integer = EgtGetOperationType(nOpId)
+                        If nOpType = MCH_OY.DRILLING OrElse nOpType = MCH_OY.SAWING OrElse nOpType = MCH_OY.MILLING OrElse nOpType = MCH_OY.POCKETING OrElse nOpType = MCH_OY.MORTISING _
+                           OrElse nOpType = MCH_OY.SAWROUGHING OrElse nOpType = MCH_OY.SAWFINISHING Then
+                           EgtSetStatus(nOpId, GDB_ST.ON_)
+                        End If
+                        nOpId = EgtGetNextOperation(nOpId)
+                     End While
+                     EgtDraw()
+                  End If
                   ParametersExpanderName = String.Empty
                   ' Disabilito la selezione delle lavorazioni
                   Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.NULL)
@@ -215,15 +252,15 @@ Namespace EgtCAM5
                   End If
                   ' Verifico se l'operazione è una disposizione
                   If EgtGetOperationType(value.Id) = MCH_OY.DISP Then
-                     ' Abilito la selezione delle Fixture
-                     Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.FIXTURE)
-                     ' Abilito la selezione di tutti i tipi di geometria
-                     Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, SceneSelModeOpt.ALL)
+                     '' Abilito la selezione delle Fixture
+                     'Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.FIXTURE)
+                     '' Abilito la selezione di tutti i tipi di geometria
+                     'Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, SceneSelModeOpt.ALL)
 
                      ' L'operazione è una lavorazione
                   Else
-                     ' Disabilito la selezione di qualunque cosa
-                     Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.NULL)
+                     '' Disabilito la selezione di qualunque cosa
+                     'Application.Msn.NotifyColleagues(Application.SETSCENESELTYPE, SceneSelTypeOpt.NULL)
 
                      ' Imposto come corrente la lavorazione(operazione) selezionata
                      EgtSetCurrMachining(value.Id)
@@ -242,290 +279,46 @@ Namespace EgtCAM5
                      ' La salvo come ultima operazione selezionata
                      m_LastMarkedOperationId = value.Id
                   End If
+                  m_SelectedOperation = value
+                  ' Notifico al contentcontrol OperationParameter di aggiornarsi
+                  OnPropertyChanged("OperationParameters")
                   ' Notifico l'operazione selezionata all'expander con l'albero delle lavorazioni aggiungibili
                   Application.Msn.NotifyColleagues(Application.SELECTEDOPERATION, value)
                   ' Aggiorno visualizzazione
                   EgtDraw()
                End If
-               m_SelectedOperation = value
             End If
-            OnPropertyChanged("ToolExpanderHeader")
+            'OnPropertyChanged("ToolExpanderHeader")
             OnPropertyChanged("SelectedOperation")
          End Set
       End Property
 
-#Region "Messages"
+      ' Actions
+      Private m_UpdateParamValues As Action
+      Private m_OpenDispositionFunction As Action(Of Boolean)
 
-      Public ReadOnly Property InvertTxBl As String
+      Private m_MachiningParameterExpander As MachiningParameterExpanderView
+      Private m_DispositionParameterExpander As DispositionParameterExpanderView
+      Public ReadOnly Property OperationParameters As ContentControl
          Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 51)
-         End Get
-      End Property
-
-      Public ReadOnly Property DepthTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 99)
-         End Get
-      End Property
-
-      Public ReadOnly Property HeadSideTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 55)
-         End Get
-      End Property
-
-      Public ReadOnly Property WorkSideTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 54)
-         End Get
-      End Property
-
-      Public ReadOnly Property UserNotesTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 100)
-         End Get
-      End Property
-
-      Private m_UserNotesTooltip As String
-      Public ReadOnly Property UserNotesTooltip As String
-         Get
-            If SelectedOperation.Type <> MCH_OY.DISP Then
-               Dim TempSelectedOperation As MachiningOpListBoxItem = DirectCast(SelectedOperation, MachiningOpListBoxItem)
-               If Not String.IsNullOrEmpty(TempSelectedOperation.UserNotes) Then
-                  Return TempSelectedOperation.UserNotes
+            If m_SelectedOperation.m_Type = MCH_OY.DISP Then
+               If IsNothing(m_DispositionParameterExpander) Then
+                  m_DispositionParameterExpander = New DispositionParameterExpanderView
+                  m_DispositionParameterExpander.DataContext = New DispositionParameterExpanderViewModel(m_OpenDispositionFunction)
                End If
+               Return m_DispositionParameterExpander
+            Else
+               If IsNothing(m_MachiningParameterExpander) Then
+                  m_MachiningParameterExpander = New MachiningParameterExpanderView
+                  m_MachiningParameterExpander.DataContext = New MachiningParameterExpanderViewModel(m_UpdateParamValues)
+               End If
+               m_UpdateParamValues()
+               Return m_MachiningParameterExpander
             End If
-            Return Nothing
          End Get
       End Property
 
-      Public ReadOnly Property StartPosTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 73)
-         End Get
-      End Property
-
-      Public ReadOnly Property ReturnPosTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 78)
-         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 ExtLinkTypeTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 57)
-         End Get
-      End Property
-
-      Public ReadOnly Property LeaveTabTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 52)
-         End Get
-      End Property
-
-      Public ReadOnly Property TabLenTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 79)
-         End Get
-      End Property
-
-      Public ReadOnly Property TabHeightTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 80)
-         End Get
-      End Property
-
-      Public ReadOnly Property TabAngleTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 81)
-         End Get
-      End Property
-
-      Public ReadOnly Property TabDistTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 82)
-         End Get
-      End Property
-
-      Public ReadOnly Property CurveUseTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 59)
-         End Get
-      End Property
-
-      Public ReadOnly Property ApproxTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 72)
-         End Get
-      End Property
-
-      Public ReadOnly Property StepExtArcTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 93)
-         End Get
-      End Property
-
-      Public ReadOnly Property StepIntArcTxBl As String
-         Get
-            Return EgtMsg(MSG_MACHININGSDBPAGE + 94)
-         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
+#Region "Messages"
 
       Public ReadOnly Property OperationListHeader As String
          Get
@@ -533,12 +326,6 @@ Namespace EgtCAM5
          End Get
       End Property
 
-      Public ReadOnly Property ApplyMachiningBtnContent As String
-         Get
-            Return EgtMsg(MSG_OPERATION + 3)
-         End Get
-      End Property
-
       Public ReadOnly Property NewMachiningBtnContent As String
          Get
             Return EgtMsg(MSG_OPERATION + 4)
@@ -557,31 +344,18 @@ Namespace EgtCAM5
          End Get
       End Property
 
-      Public ReadOnly Property GenericExpanderHeader As String
-         Get
-            Return EgtMsg(MSG_OPERATION + 7)
-         End Get
-      End Property
-
-      Public ReadOnly Property ToolExpanderHeader As String
-         Get
-            If SelectedOperation.Type <> MCH_OY.DISP Then
-               Dim TempSelectedOperation As MachiningOpListBoxItem = DirectCast(SelectedOperation, MachiningOpListBoxItem)
-               Return EgtMsg(MSG_MACHININGSDBPAGE + 98) & " " & TempSelectedOperation.Tool
-            End If
-            Return String.Empty
-         End Get
-      End Property
       Public ReadOnly Property MoveUpMsg As String
          Get
             Return EgtMsg(MSG_OPERATION + 8)
          End Get
       End Property
+
       Public ReadOnly Property MoveDownMsg As String
          Get
             Return EgtMsg(MSG_OPERATION + 9)
          End Get
       End Property
+
       Public ReadOnly Property UpdateMsg As String
          Get
             Return EgtMsg(MSG_OPERATION + 10)
@@ -806,9 +580,7 @@ Namespace EgtCAM5
       ''' Execute the Point.  This method is invoked by the PointCommand.
       ''' </summary>
       Public Sub OperationListDoubleClick()
-         If SelectedOperation.Type <> MCH_OY.DISP Then
-            ParametersIsExpanded = True
-         End If
+         ParametersIsExpanded = True
       End Sub
 
 #End Region ' OperationListDoubleClickCommand
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionOpListBoxItem.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb
similarity index 100%
rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionOpListBoxItem.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/DispositionOpListBoxItem.vb
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
new file mode 100644
index 0000000..468e6f0
--- /dev/null
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
@@ -0,0 +1,95 @@
+Imports System.ComponentModel
+Imports System.Collections.ObjectModel
+Imports EgtUILib
+
+Public Class MachiningOpListBoxItem
+   Inherits OperationListBoxItem
+
+   Private m_Status As Boolean
+   Public Property Status As Boolean
+      Get
+         Return m_Status
+      End Get
+      Set(value As Boolean)
+         If value <> m_Status Then
+            If m_Type = MCH_OY.NONE Or m_Type = MCH_OY.DISP Then
+               m_Status = True
+            Else
+               m_Status = value
+               EgtSetOperationMode(Id, m_Status)
+               EgtDraw()
+            End If
+         End If
+      End Set
+   End Property
+
+   Private m_Image As String
+   Public Property Image As String
+      Get
+         Return m_Image
+      End Get
+      Set(value As String)
+         m_Image = value
+      End Set
+   End Property
+
+   Private m_Info As String
+   Public Property Info As String
+      Get
+         Return m_Info
+      End Get
+      Set(value As String)
+         m_Info = value
+      End Set
+   End Property
+
+   Private m_Tool As String
+   Public Property Tool As String
+      Get
+         Return m_Tool
+      End Get
+      Set(value As String)
+         m_Tool = value
+      End Set
+   End Property
+
+   Sub New(nId As Integer, bStatus As Boolean, sName As String, nType As Integer, sTool As String, sMach As String)
+      m_Id = nId
+      Me.Status = bStatus
+      Me.Name = sName
+      m_Type = nType
+      Me.Image = ConvertTypeToImage(Type)
+      If Type = MCH_OY.DISP Then
+         Me.Info = String.Empty
+         Me.Tool = String.Empty
+      Else
+         Me.Info = "(" & If(Not String.IsNullOrEmpty(sTool), sTool, String.Empty) & ", " &
+                   If(Not String.IsNullOrEmpty(sMach), sMach, String.Empty) & ")"
+         Me.Tool = If(Not String.IsNullOrEmpty(sTool), "(" & sTool & ")", String.Empty)
+      End If
+   End Sub
+
+   Private Function ConvertTypeToImage(Type As Integer) As String
+      Select Case Type
+         Case MCH_OY.DISP
+            Return ""
+         Case MCH_OY.DRILLING
+            Return ""
+         Case MCH_OY.SAWING
+            Return ""
+         Case MCH_OY.MILLING
+            Return ""
+         Case MCH_OY.POCKETING
+            Return ""
+         Case MCH_OY.MORTISING
+            Return ""
+         Case MCH_OY.SAWROUGHING
+            Return ""
+         Case MCH_OY.SAWFINISHING
+            Return ""
+         Case Else
+            Return String.Empty
+      End Select
+   End Function
+
+End Class
\ No newline at end of file
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb
similarity index 100%
rename from ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/OperationListBoxItem.vb
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index 6f7602e..a120fed 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -22,6 +22,9 @@ Namespace EgtCAM5
 
       Private m_bLoaded As Boolean = False
 
+      ' Variabile che contiene il Frame di disegno per poterlo ripristinare dopo essere passato dalla lavorazioneù
+      Private m_GridDrawFrame3d As Frame3d = New Frame3d(New Point3d(0, 0, 0))
+
       'PROJECT PAGE'S SCENE FIELDS AND PROPERTIES
       ' Reference to the ProjectScene
       Private WithEvents m_ProjectScene As New Scene
@@ -78,10 +81,18 @@ Namespace EgtCAM5
          RegisterStatusBarCommands()
          ' Cambio impostazioni griglia a seconda che sia in modalità Draw o Machining
          Application.Msn.Register(Application.MACHININGMODE_ISCHECKED, Sub()
+                                                                          ' Salvo il Frame3d di disegno
+                                                                          m_GridDrawFrame3d = EgtGetGridFrame()
+                                                                          ' sposto la griglia sulla tavola di lavorazione
+                                                                          Dim TableRef As Point3d
+                                                                          EgtGetTableRef(1, TableRef)
+                                                                          EgtSetGridFrame(New Frame3d(TableRef))
                                                                           m_ProjectScene.GetObjFilterForSel(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
                                                                           Application.Msn.NotifyColleagues(Application.UPDATESTATUSGRID, New UpdateStatusGridParam(IniFile.m_bMachiningShowGrid, IniFile.m_bShowGridFrame))
                                                                        End Sub)
          Application.Msn.Register(Application.DRAWMODE_ISCHECKED, Sub()
+                                                                     ' Ripristino il riferimento della griglia di disegno
+                                                                     EgtSetGridFrame(m_GridDrawFrame3d)
                                                                      m_ProjectScene.SetObjFilterForSel(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
                                                                      Application.Msn.NotifyColleagues(Application.UPDATESTATUSGRID, New UpdateStatusGridParam(IniFile.m_bDrawShowGrid, IniFile.m_bShowGridFrame))
                                                                   End Sub)
@@ -91,6 +102,9 @@ Namespace EgtCAM5
          Application.Msn.Register(Application.SETSCENESELTYPE, Sub(nSceneSelType As SceneSelTypeOpt)
                                                                   Me.SceneSelType = nSceneSelType
                                                                End Sub)
+         Application.Msn.Register(Application.SETMOVEINDISPOSITION, Sub(bMoveInDisposition As Boolean)
+                                                                       Me.bMoveInDisposition = bMoveInDisposition
+                                                                    End Sub)
       End Sub
 
 #End Region
@@ -806,89 +820,216 @@ Namespace EgtCAM5
          m_Controller.MouseDeselectedAll()
       End Sub
 
-      Private m_bFixtureDrag As Boolean
+      ' Identificativi per elemento da selezionare/deselezionare
+      Private m_nIdToSel As Integer = GDB_ID.NULL
+      Private m_nIdToDesel As Integer = GDB_ID.NULL
+      'Private m_nFirstRawPartId As Integer = GDB_ID.NULL
+
+      ' Dati per Drag
+      Private m_nRestRadius As Integer = 3
+      Private m_bDrag As Boolean = False
+      Private m_bDragToStart As Boolean = False
+      Private m_bDragging As Boolean = False
+      Private m_locPrev As System.Drawing.Point
       Private m_ptPrev As Point3d
 
       Private Sub OnMouseDown(ByVal sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_ProjectScene.OnMouseDownScene
-         ' Se in modalità Draw accetto tutto
+         ' Se in modalità Draw esco
          If IniFile.m_ProjectMode = ProjectModeOpt.DRAW Then Return
          ' Sono in modalità Machining
-         If e.Button = Forms.MouseButtons.Left Then
-            Dim nSel As Integer
-            EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
-            Dim nId As Integer = EgtGetFirstObjInSelWin()
-            While nId <> GDB_ID.NULL
-               Select Case m_SceneSelType
-                  Case SceneSelTypeOpt.FIXTURE
-                     Dim nFixtureId As Integer = EgtGetParent(EgtGetParent(nId))
-                     If IsPartInFixture(nFixtureId) Then
-                        If EgtIsSelectedObj(nFixtureId) Then
-                           EgtDeselectObj(nFixtureId)
-                        Else
-                           EgtSelectObj(nFixtureId)
-                           If EgtUnProjectPoint(e.Location, m_ptPrev) Then
-                              m_bFixtureDrag = True
-                           End If
-                        End If
-                        EgtDraw()
-                        Exit Sub
+         If m_SceneSelType = SceneSelTypeOpt.NULL Then Return
+         ' Si può selezionare solo con il tasto sinistro se la selezione non è impostata a NULL
+         If e.Button <> Forms.MouseButtons.Left OrElse m_SceneSelType = SceneSelTypeOpt.NULL Then Return
+         ' Per default no drag
+         m_bDrag = False
+         Dim nSel As Integer
+         EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
+         Dim nId As Integer = EgtGetFirstObjInSelWin()
+         While nId <> GDB_ID.NULL
+            Select Case m_SceneSelType
+               Case SceneSelTypeOpt.FIXTURE
+                  Dim nFixtureId As Integer = EgtGetParent(EgtGetParent(nId))
+                  If EgtVerifyFixture(nFixtureId) Then
+                     ' Se già selezionato 
+                     If EgtIsSelectedObj(nFixtureId) Then
+                        ' Memorizzo Id da deselezionare
+                        m_nIdToDesel = nFixtureId
+                     Else
+                        ' Memorizzo Id da selezionare
+                        m_nIdToSel = nFixtureId
                      End If
-                  Case SceneSelTypeOpt.RAWPART
-
-               End Select
-
-               nId = EgtGetNextObjInSelWin()
-            End While
-         End If
+                     ' Drag possibile
+                     m_bDrag = True
+                     Exit While
+                  End If
+               Case SceneSelTypeOpt.RAWPART, SceneSelTypeOpt.RAWPARTWITHFIXTURE
+                  Dim nRawPartId As Integer = EgtGetParent(nId)
+                  If EgtVerifyRawPartCurrPhase(nRawPartId) Then
+                     ' Se già selezionato 
+                     If EgtIsSelectedObj(nRawPartId) Then
+                        ' Memorizzo Id da deselezionare
+                        m_nIdToDesel = nRawPartId
+                     Else
+                        ' Memorizzo Id da selezionare
+                        m_nIdToSel = nRawPartId
+                     End If
+                     ' Drag possibile
+                     m_bDrag = True
+                     Exit While
+                  End If
+            End Select
+            nId = EgtGetNextObjInSelWin()
+         End While
+         ' Dati per drag
+         m_locPrev = e.Location
+         Dim TableRef As Point3d
+         EgtGetTableRef(1, TableRef)
+         m_bDrag = m_bDrag AndAlso EgtGetPlaneSnapPoint(e.Location, Vector3d.Z_AX, TableRef.z, m_ptPrev)
+         m_bDragToStart = m_bDrag
       End Sub
 
       Private Sub OnMyMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_ProjectScene.OnMouseMoveScene
-         ' Se in modalità Draw accetto tutto
+         ' Se in modalità Draw esco
          If IniFile.m_ProjectMode = ProjectModeOpt.DRAW Then Return
          ' Sono in modalità Machining
-         ' Verifico di essere in modalità drag
-         If Not m_bFixtureDrag Then Return
+         ' Si può selezionare solo con il tasto sinistro se la selezione non è impostata a NULL
+         If e.Button <> Forms.MouseButtons.Left OrElse m_SceneSelType = SceneSelTypeOpt.NULL Then Return
+         ' se non sono in modalità muovi esco
+         If Not m_bMoveInDisposition Then Return
+         ' Se drag non abilitato o già in esecuzione, esco
+         If Not m_bDrag Or m_bDragging Then Return
+         ' Se primo movimento di drag, verifico di aver superato la soglia di movimento in pixel
+         If m_bDragToStart Then
+            If Math.Abs(e.Location.X - m_locPrev.X) < m_nRestRadius And
+               Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
+               Return
+            End If
+            m_bDragToStart = False
+         End If
+         ' Determino cosa muovere
+         Dim nMoveId = If(m_nIdToSel <> GDB_ID.NULL, m_nIdToSel, GDB_ID.SEL)
+         ' Inizio esecuzione di drag
+         m_bDragging = True
          ' Ricavo il punto corrente in coordinate mondo
          Dim ptCurr As Point3d
-         EgtUnProjectPoint(e.Location, ptCurr)
+         Dim TableRef As Point3d
+         EgtGetTableRef(1, TableRef)
+         EgtGetPlaneSnapPoint(e.Location, Vector3d.Z_AX, TableRef.z, ptCurr)
          ' Ricavo il vettore di movimento (tengo solo XY)
          Dim vtMove As Vector3d = ptCurr - m_ptPrev
          vtMove.z = 0
-         ' Eseguo modifica
-         ' '' ''Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
-         ' '' ''While nSelObjId <> GDB_ID.NULL
-         ' '' ''   EgtMoveFixture(nSelObjId, vtMove)
-         ' '' ''   nSelObjId = EgtGetNextSelectedObj()
-         ' '' ''End While
-
-         ' '' ''EgtDraw()
-
-         'Select Case m_SceneSelType
-         '   Case SceneSelTypeOpt.FIXTURE
-         '      MoveFixture(ptCurr)
-         'End Select
+         ' Muovo gli oggetti selezionati se consentito
+         DispositionParameterExpanderViewModel.MoveRawPartPartAndFixture(nMoveId, vtMove)
+         EgtDraw()
          ' Aggiorno il punto precedente
          m_ptPrev = ptCurr
+         ' Terminata esecuzione di drag
+         m_bDragging = False
       End Sub
 
-      'Private Sub MoveFixture(ptCurr As Point3d)
-      '   ' Muovo il grezzo
-      '   If EgtMoveFixture(m_CurrProjPage.m_nRawId, vtMove) Then
-      '      EgtDraw()
-      '      '' Aggiorno gli offset
-      '      'm_RawOffsX += vtMove.x
-      '      'm_RawOffsY += vtMove.y
-      '      'OffsetXTxBx.Text = LenToString(m_RawOffsX, 2)
-      '      'OffsetYTxBx.Text = LenToString(m_RawOffsY, 2)
-      '   End If
-      'End Sub
-
       Private Sub OnMyMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_ProjectScene.OnMouseUpScene
          ' Se in modalità Draw accetto tutto
          If IniFile.m_ProjectMode = ProjectModeOpt.DRAW Then Return
          ' Sono in modalità Machining
-         ' Disabilito drag
-         m_bFixtureDrag = False
+         ' Se eseguito drag
+         If Not m_bDragToStart Then
+            ' Basta reset alla fine
+            ' Se selezione da eseguire
+         ElseIf m_nIdToSel <> GDB_ID.NULL Then
+            ' se sono in modalità sottopezzi
+            If m_SceneSelType = SceneSelTypeOpt.FIXTURE Then
+               ' verifico se il sottopezzo da selezionare è un riferimento
+               If DispositionParameterExpanderViewModel.FixtureType(m_nIdToSel) = DispositionParameterExpanderViewModel.FIX_TYPE.REFERENCE _
+                  AndAlso EgtGetSelectedObjCount() > 0 Then
+                  ' se ci sono altri oggetti selezionati resetto lo stato di selezione ed esco
+                  m_bDrag = False
+                  m_nIdToSel = GDB_ID.NULL
+                  m_nIdToDesel = GDB_ID.NULL
+                  EgtDraw()
+                  Return
+               Else
+                  ' altrimenti verifico il tipo del primo oggetto selezionato
+                  Dim nFirstSelId As Integer = EgtGetFirstSelectedObj()
+                  If DispositionParameterExpanderViewModel.FixtureType(nFirstSelId) = DispositionParameterExpanderViewModel.FIX_TYPE.REFERENCE Then
+                     ' se è un riferimento resetto lo stato di selezione ed esco
+                     m_bDrag = False
+                     m_nIdToSel = GDB_ID.NULL
+                     m_nIdToDesel = GDB_ID.NULL
+                     EgtDraw()
+                     Return
+                  End If
+               End If
+            End If
+            ' marco il primo elemento se questo è il secondo
+            If EgtGetSelectedObjCount() = 1 Then
+               ' marco il primo tra i selezionati
+               Dim nFirstSelObj As Integer = EgtGetFirstSelectedObj()
+               EgtSetMark(nFirstSelObj)
+            End If
+            ' se sono in modalità grezzo con relativi sottopezzi
+            If m_SceneSelType = SceneSelTypeOpt.RAWPARTWITHFIXTURE Then
+               ' calcolo il BBox del grezzo
+               Dim bboxRawPart As New BBox3d
+               EgtGetBBoxGlob(m_nIdToSel, GDB_BB.STANDARD, bboxRawPart)
+               ' ciclo sulle ventose
+               Dim bboxFixture As New BBox3d
+               Dim nFixtureId As Integer = EgtGetFirstFixture()
+               While nFixtureId <> GDB_ID.NULL
+                  EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
+                  ' verifico quali sono sotto il grezzo selezionato
+                  If bboxRawPart.OverlapsXY(bboxFixture) Then
+                     ' Eseguo la selezione
+                     EgtSelectObj(nFixtureId)
+                  End If
+                  nFixtureId = EgtGetNextFixture(nFixtureId)
+               End While
+            End If
+            ' Eseguo la selezione
+            EgtSelectObj(m_nIdToSel)
+            ' Se deselezione da eseguire
+         ElseIf m_nIdToDesel <> GDB_ID.NULL Then
+            ' se l'elemento da deselezionare è marcato
+            Dim bMarked As Boolean = False
+            EgtGetMark(m_nIdToDesel, bMarked)
+            If bMarked Then
+               ' smarco l'oggetto deselezionato
+               EgtResetMark(m_nIdToDesel)
+            End If
+            ' se sono in modalità ventose o grezzi
+            If m_SceneSelType = SceneSelTypeOpt.RAWPARTWITHFIXTURE Then
+               ' calcolo il BBox del grezzo
+               Dim bboxRawPart As New BBox3d
+               EgtGetBBoxGlob(m_nIdToDesel, GDB_BB.STANDARD, bboxRawPart)
+               ' ciclo sulle ventose
+               Dim bboxFixture As New BBox3d
+               Dim nFixtureId As Integer = EgtGetFirstFixture()
+               While nFixtureId <> GDB_ID.NULL
+                  EgtGetBBoxGlob(nFixtureId, GDB_BB.STANDARD, bboxFixture)
+                  ' verifico quali sono sotto il grezzo selezionato
+                  If bboxRawPart.OverlapsXY(bboxFixture) Then
+                     ' Eseguo la deselezione
+                     EgtDeselectObj(nFixtureId)
+                  End If
+                  nFixtureId = EgtGetNextFixture(nFixtureId)
+               End While
+            End If
+            ' Eseguo la deselezione
+            EgtDeselectObj(m_nIdToDesel)
+            If EgtGetSelectedObjCount() > 1 Then
+               ' marco il primo 
+               Dim nFirstSelObj As Integer = EgtGetFirstSelectedObj()
+               EgtSetMark(nFirstSelObj)
+            Else
+               ' smarco il primo ed unico oggetto selezionato
+               Dim nFirstSelObj As Integer = EgtGetFirstSelectedObj()
+               EgtResetMark(nFirstSelObj)
+            End If
+         End If
+         ' Reset
+         m_bDrag = False
+         m_nIdToSel = GDB_ID.NULL
+         m_nIdToDesel = GDB_ID.NULL
+         EgtDraw()
       End Sub
 
       Private Sub OnMouseSelectingObj(ByVal sender As Object, ByVal nId As Integer, ByRef bOk As Boolean) Handles m_ProjectScene.OnMouseSelectingObj
@@ -1241,6 +1382,17 @@ Namespace EgtCAM5
          End Set
       End Property
 
+      Private m_bMoveInDisposition As Boolean
+      Public Property bMoveInDisposition As Boolean
+         Get
+            Return m_bMoveInDisposition
+         End Get
+         Set(value As Boolean)
+            m_bMoveInDisposition = value
+         End Set
+      End Property
+
+
       Friend Function IsPartInRaw(nSearchedPartId As Integer) As Boolean
          Dim nRawId As Integer = EgtGetFirstRawPart()
          While nRawId <> GDB_ID.NULL
@@ -1256,17 +1408,6 @@ Namespace EgtCAM5
          Return False
       End Function
 
-      Friend Function IsPartInFixture(nSearchedPartId As Integer) As Boolean
-         Dim nFixtureId As Integer = EgtGetFirstFixture()
-         While nFixtureId <> GDB_ID.NULL
-            If nFixtureId = nSearchedPartId Then
-               Return True
-            End If
-            nFixtureId = EgtGetNextFixture(nFixtureId)
-         End While
-         Return False
-      End Function
-
 #End Region    ' Scene selection
 
    End Class