Merge remote-tracking branch 'origin/master' into feature/ManageNote

EgtCAM5 2.6e1 :
- ricompilazione con cambio versione.
2024-05-06 16:12:13 +02:00 · 2024-05-03 15:03:29 +02:00 · 2024-04-26 17:52:37 +02:00 · 2024-04-19 17:57:22 +02:00 · 2024-04-19 11:28:50 +02:00 · 2024-04-16 20:54:04 +02:00
135 changed files with 7185 additions and 4970 deletions
@@ -16,3 +16,4 @@
 /bin
 /obj
 /.vs
 /packages
@@ -4,10 +4,7 @@ Public Class AboutBoxWndV
   Private Sub AboutBoxWD_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
      DescriptionLbl.Text = My.Application.Info.Description.ToString()
-      VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
+      VersionLbl.Text = "Version : " & GetProgramVersion()
                                 "." & My.Application.Info.Version.Minor.ToString() &
                                 (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
                                 My.Application.Info.Version.Revision.ToString()
      CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
      Dim sInfo As String = String.Empty
      Dim sKey As String = String.Empty
@@ -17,17 +14,29 @@ Public Class AboutBoxWndV
      Dim sLeftDays As String = ""
      Dim nLeftDays As Integer 
      if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
      Dim sAssStatus As String = " discontinued"
      Dim nAssLeftDays As Integer
      If EgtGetKeyAssLeftDays( nAssLeftDays) And nAssLeftDays >= 0 Then
         If nAssLeftDays > 30 then
            sAssStatus = "expires within " & nAssLeftDays.ToString() & " days"
         Else If nAssLeftDays > 0 then
            sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days"
         Else  
            sAssStatus = "to be renewed by today"
         End If
      End If
      sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") 
      sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
-                       " (" & IniFile.m_nInstance.ToString() & ")" & Environment.NewLine
+               "  Inst" & IniFile.m_nInstance.ToString() &
               " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" &  Map.refMainWindowVM.DebugLevel().ToString() & Environment.NewLine
      sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
      sInfo &= "SupportPlane " & sAssStatus & Environment.NewLine
      sInfo &= "DataRoot " & IniFile.m_sDataRoot & Environment.NewLine
      If IniFile.m_ProjectMode <> ProjectModeOpt.ONLYDRAW Then
         sInfo &= "MachinesRoot " & IniFile.m_sMachinesRoot & Environment.NewLine
      Else
         sInfo &= "Only Draw Mode" & Environment.NewLine
      End If
      If IniFile.IsActiveDoors() Then sInfo &= "Doors " & IniFile.m_sDoorsDirPath & Environment.NewLine
      Dim sOpSys As String = String.Empty
      EgtGetOsInfo( sOpSys)
      sInfo &= sOpSys & Environment.NewLine
@@ -40,6 +49,34 @@ Public Class AboutBoxWndV
      Dim sScene As String = String.Empty
      EgtGetSceneInfo(sScene)
      sInfo &= sScene
      ' Extensions
      sInfo &= Environment.NewLine & "Extensions :"
      Dim bExtensions As Boolean = False
      If IniFile.IsActiveBeam() Then
         bExtensions = True
         Dim sVersion As String = "---"
         IniFile.GetSpecialLuaVersion( IniFile.m_sBeamDirPath, sVersion)
         sInfo &= Environment.NewLine & "Beam ver. " & sVersion & "   " & IniFile.m_sBeamDirPath
      End If
      If IniFile.IsActiveWall() Then
         bExtensions = True
         Dim sVersion As String = "---"
         IniFile.GetSpecialLuaVersion( IniFile.m_sWallDirPath, sVersion) 
         sInfo &= Environment.NewLine & "Wall ver. " & sVersion & "   " & IniFile.m_sWallDirPath
      End If
      If IniFile.IsActiveDoors() Then
         bExtensions = True
         Dim sVersion As String = "---"
         IniFile.GetSpecialLuaVersion( IniFile.m_sDoorsDirPath, sVersion) 
         sInfo &= Environment.NewLine & "Doors ver. " & sVersion & "   " & IniFile.m_sDoorsDirPath
      End If
      If IniFile.IsActiveGunStock() Then
         bExtensions = True
         Dim sVersion As String = "---"
         IniFile.GetSpecialLuaVersion( IniFile.m_sGunstockDirPath, sVersion) 
         sInfo &= Environment.NewLine & "Gunstock ver. " & sVersion & "   " & IniFile.m_sGunstockDirPath
      End If
      If Not bExtensions Then sInfo &= Environment.NewLine & "---"
      InfoLbl.Text = sInfo
      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
   End Sub
@@ -107,6 +107,7 @@ Class Application
   Friend Const SWEPT As String = "Swept"
   Friend Const MERGESURF As String = "MergeSurf"
   Friend Const EXPLODESURF As String = "ExplodeSurf"
   Friend Const APPROXSURF As String = "ApproxSurf"
   Friend Const INVERTSURF As String = "InvertSurf"
   Friend Const DELETE As String = "Delete"
   Friend Const CHANGELAYER As String = "ChangeLayer"
@@ -1,4 +1,6 @@
-Public Class BeamMachiningsWindowV
+Imports EgtWPFLib5
 Public Class BeamMachiningsWindowV
   Private WithEvents m_BeamMachiningsWindowVM As BeamMachiningsWindowVM
@@ -1,543 +0,0 @@
 Imports System.IO
 Imports System.Collections.ObjectModel
 Imports EgtUILib
 Public Class BeamMachiningsWindowVM
   Inherits VMBase
 #Region "FIELDS & PROPERTIES"
   Private Const MACH_CUT As String = "Cut"
   Private Const MACH_DRILL As String = "Drill"
   Private Const MACH_MILLING As String = "Milling"
   Private Const MACH_POCKETING As String = "Pocketing"
   Private Const MACH_SAWING As String = "Sawing"
   Private Const MACH_SURFACING As String = "Surfacing"
   Private Const ONCONST As String = "On"
   Private Const NAME As String = "Name"
   Private Const TYPE As String = "Type"
   Private Const DATETIME As String = "%DATE_TIME%"
   Private Const TABLENAME As String = "%TABLE_NAME%"
   Friend Event m_CloseWindow(bDialogResult As Boolean)
   Private m_MachiningList As New ObservableCollection(Of String)({MACH_CUT, MACH_DRILL, MACH_MILLING, MACH_POCKETING, MACH_SAWING})
   Public ReadOnly Property MachiningList As ObservableCollection(Of String)
      Get
         Return m_MachiningList
      End Get
   End Property
   Private m_SelMachining As String
   Public Property SelMachining As String
      Get
         Return m_SelMachining
      End Get
      Set(value As String)
         ' verifico se pagina precedente modificata
         Dim TableModified As Boolean = False
         For Each Line In m_TableRowList
            If Line.IsModified Then
               TableModified = True
               Exit For
            End If
         Next
         ' se modificata, chiedo se salvare
         If TableModified Then
            ' Salvare le modifiche apportate? - Salva
            Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
               Case MessageBoxResult.Yes
                  Save()
               Case MessageBoxResult.No
                  ' non devo fare nulla
            End Select
         End If
         m_SelMachining = value
         LoadMachiningList()
         LoadTypeList()
         ReadTableFile()
         NotifyPropertyChanged("SelMachining")
      End Set
   End Property
   Private Sub SetSelMachining(value As String)
      m_SelMachining = value
      LoadMachiningList()
      LoadTypeList()
      ReadTableFile()
      NotifyPropertyChanged("SelMachining")
   End Sub
   Private m_TableRowList As ObservableCollection(Of GridLine)
   Public Property TableRowList As ObservableCollection(Of GridLine)
      Get
         Return m_TableRowList
      End Get
      Set(value As ObservableCollection(Of GridLine))
         m_TableRowList = value
      End Set
   End Property
   Private m_SelRowIndex As Integer = -1
   Public Property SelRowIndex As Integer
      Get
         Return m_SelRowIndex
      End Get
      Set(value As Integer)
         m_SelRowIndex = value
      End Set
   End Property
   Private m_sTitle As String
   Private m_BaseDir As String
   Private m_MachTypeFilePath As String
   Private m_TableTemplateFilePath As String
   Private m_IsBeam As Boolean = True
 #Region "Messages"
   Public ReadOnly Property Title As String
      Get
         Return m_sTitle
      End Get
   End Property
   Public ReadOnly Property OnHdr As String
      Get
         Return EgtMsg( 9001)               'On
      End Get
   End Property
   Public ReadOnly Property NameHdr As String
      Get
         Return EgtMsg( 9002)               'Nome
      End Get
   End Property
   Public ReadOnly Property TypeHdr As String
      Get
         Return EgtMsg( 9003)               'Tipo
      End Get
   End Property
   Public ReadOnly Property AddRowMsg As String
      Get
         Return EgtMsg( 9004)               'Aggiungi
      End Get
   End Property
   Public ReadOnly Property DeleteRowMsg As String
      Get
         Return EgtMsg( 9005)               'Elimina
      End Get
   End Property
   Public ReadOnly Property SaveMsg As String
      Get
         Return EgtMsg( 9006)               'Salva
      End Get
   End Property
 #End Region    ' Messages
   ' Definizione comandi
   Private m_cmdMoveRowUp As ICommand
   Private m_cmdMoveRowDown As ICommand
   Private m_cmdAddRow As ICommand
   Private m_cmdDeleteRow As ICommand
   Private m_cmdSave As ICommand
   Private m_cmdClose As ICommand
 #End Region    ' FIELDS & PROPERTIES
 #Region "CONSTRUCTOR"
   Sub New( sTitle As String, sBaseDir As String, sMachTypePath As String, sTabTemplPath As String, Optional bIsBeam As Boolean = True)
      ' Titolo del dialogo
      m_sTitle = sTitle
      ' Imposto direttorio base e nomi dei file
      m_BaseDir = sBaseDir
      m_MachTypeFilePath = sMachTypePath
      m_TableTemplateFilePath = sTabTemplPath
      ' Imposto se per travi o pareti
      m_IsBeam = bIsBeam
      ' Se previste, aggiungo lavorazioni di superfici
      Dim sDummy As String = ""
      If EgtUILib.GetPrivateProfileString( MACH_SURFACING, "1", "", sDummy, m_MachTypeFilePath) > 0 Then
         m_MachiningList.Add(MACH_SURFACING)
      End If
      ' Seleziono la prima lavorazione
      If m_MachiningList.Count > 0 Then
         SetSelMachining( m_MachiningList(0))
      End If
      NotifyPropertyChanged( "MachiningList")
   End Sub
 #End Region    ' CONSTRUCTOR
 #Region "METHODS"
   Private Function LoadMachiningList() As Boolean
      Dim MachiningList As New List(Of String)
      Select Case SelMachining
         Case MACH_CUT
            If m_IsBeam Then
               LoadMachiningListByType(MachiningList, MCH_MY.MILLING, MCH_TF.SAWBLADE)
            Else
               LoadMachiningListByType(MachiningList, MCH_MY.SAWING, 0)
            End If
         Case MACH_DRILL
            LoadMachiningListByType(MachiningList, MCH_MY.DRILLING, 0)
            LoadMachiningListByType(MachiningList, MCH_MY.POCKETING, 0, False)
            LoadMachiningListByType(MachiningList, MCH_MY.MILLING, MCH_TF.MILL, False)
         Case MACH_MILLING
            LoadMachiningListByType(MachiningList, MCH_MY.MILLING, MCH_TF.MILL)
         Case MACH_POCKETING
            LoadMachiningListByType(MachiningList, MCH_MY.POCKETING, 0)
         Case MACH_SAWING
            LoadMachiningListByType(MachiningList, MCH_MY.MORTISING, 0)
         Case MACH_SURFACING
            LoadMachiningListByType(MachiningList, MCH_MY.SURFROUGHING, 0)
            LoadMachiningListByType(MachiningList, MCH_MY.SURFFINISHING, 0, False)
      End Select
      GridLine.SetNamesList(New ObservableCollection(Of String)(MachiningList))
      Return True
   End Function
   Private Function LoadTypeList() As Boolean
      Dim TypeList As New List(Of String)
      Dim Index As Integer = 1
      Dim Type As String = ""
      While EgtUILib.GetPrivateProfileString( SelMachining, Index.ToString, "", Type, m_MachTypeFilePath) > 0
         TypeList.Add(Type)
         Index += 1
      End While
      GridLine.SetTypeList( New ObservableCollection(Of String)( TypeList))
      Return True
   End Function
   Private Function ReadTableFile() As Boolean
      ' svuoto la lista
      m_TableRowList = New ObservableCollection(Of GridLine)
      Dim FilePath As String = m_BaseDir & "\" & SelMachining & "Data.lua"
      If Not File.Exists(FilePath) Then Return False
      Dim FileContent As String() = File.ReadAllLines(FilePath)
      Dim FoundTableName As Boolean = False
      For LineIndex As Integer = 0 To FileContent.Count - 1
         If FileContent(LineIndex).Contains(SelMachining & "Data") Then
            FoundTableName = True
         End If
         Dim Open As Integer = CountCharacter(FileContent(LineIndex), "{"c)
         Dim Close As Integer = CountCharacter(FileContent(LineIndex), "}"c)
         If Close > Open Then
            If FoundTableName Then
               FoundTableName = False
            End If
         End If
         If FoundTableName Then
            Dim sOn As String = SearchKey(FileContent(LineIndex), ONCONST)
            Dim sName As String = SearchKey(FileContent(LineIndex), NAME)
            Dim sType As String = SearchKey(FileContent(LineIndex), TYPE)
            If Not String.IsNullOrWhiteSpace(sOn) AndAlso Not String.IsNullOrWhiteSpace(sName) AndAlso Not String.IsNullOrWhiteSpace(sType) Then
               If String.Compare(sOn, "true", True) = 0 Then
                  TableRowList.Add(New GridLine(True, sName, sType))
               ElseIf String.Compare(sOn, "false", True) = 0 Then
                  TableRowList.Add(New GridLine(False, sName, sType))
               Else
                  Continue For
               End If
            End If
         End If
      Next
      NotifyPropertyChanged("TableRowList")
      Return True
   End Function
   Private Function WriteTableFile() As Boolean
      ' inizio routine di scrittura
      Dim FileContent As String() = File.ReadAllLines(m_TableTemplateFilePath)
      Dim NewTableFileContent As New List(Of String)
      Dim bBeamTable As Boolean = False
      For LineIndex As Integer = 0 To FileContent.Count - 1
         Dim sCurrLine As String = FileContent(LineIndex)
         sCurrLine = sCurrLine.Replace(DATETIME, System.DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss"))
         sCurrLine = sCurrLine.Replace(TABLENAME, SelMachining & "Data")
         If sCurrLine.Contains(SelMachining & "Data") AndAlso sCurrLine.Contains("=") Then
            bBeamTable = True
            NewTableFileContent.Add(sCurrLine)
            PrintActiveMachiningList(NewTableFileContent)
         End If
         If Not bBeamTable Then
            NewTableFileContent.Add(sCurrLine)
         Else
            bBeamTable = False
         End If
      Next
      Dim FilePath As String = m_BaseDir & "\" & SelMachining & "Data.lua"
      File.WriteAllLines(FilePath, NewTableFileContent, Text.Encoding.UTF8)
      Return True
   End Function
   Private Sub PrintActiveMachiningList(NewTableFileContent As List(Of String))
      For Index As Integer = 0 To m_TableRowList.Count - 1
         If String.IsNullOrEmpty(m_TableRowList(Index).Name) Then Continue For
         Dim CurrentLine As String = "   { On = " & If(m_TableRowList(Index).OnPar, "true", "false") & ", Name = '" & m_TableRowList(Index).Name & "', Type = '" & m_TableRowList(Index).Type & "'}"
         If Index < m_TableRowList.Count - 1 Then
            CurrentLine &= ","
         End If
         NewTableFileContent.Add(CurrentLine)
      Next
   End Sub
 #End Region    ' METHODS
 #Region "COMMANDS"
 #Region "MoveRowUp"
   ''' <summary>
   ''' Returns a command that do Exec.
   ''' </summary>
   Public ReadOnly Property MoveRowUp_Command As ICommand
      Get
         If m_cmdMoveRowUp Is Nothing Then
            m_cmdMoveRowUp = New Command(AddressOf MoveRowUp)
         End If
         Return m_cmdMoveRowUp
      End Get
   End Property
   ''' <summary>
   ''' Execute the Exec.  This method is invoked by the ExecCommand.
   ''' </summary>
   Public Sub MoveRowUp()
      If SelRowIndex > 0 Then
         m_TableRowList.Move(SelRowIndex, SelRowIndex - 1)
      End If
   End Sub
 #End Region    ' MoveRowUp
 #Region "MoveRowDown"
   ''' <summary>
   ''' Returns a command that do Exec.
   ''' </summary>
   Public ReadOnly Property MoveRowDown_Command As ICommand
      Get
         If m_cmdMoveRowDown Is Nothing Then
            m_cmdMoveRowDown = New Command(AddressOf MoveRowDown)
         End If
         Return m_cmdMoveRowDown
      End Get
   End Property
   ''' <summary>
   ''' Execute the Exec.  This method is invoked by the ExecCommand.
   ''' </summary>
   Public Sub MoveRowDown()
      If SelRowIndex < m_TableRowList.Count - 1 Then
         m_TableRowList.Move(SelRowIndex, SelRowIndex + 1)
      End If
   End Sub
 #End Region    ' MoveRowDown
 #Region "AddRow"
   ''' <summary>
   ''' Returns a command that do Exec.
   ''' </summary>
   Public ReadOnly Property AddRow_Command As ICommand
      Get
         If m_cmdAddRow Is Nothing Then
            m_cmdAddRow = New Command(AddressOf AddRow)
         End If
         Return m_cmdAddRow
      End Get
   End Property
   ''' <summary>
   ''' Execute the Exec.  This method is invoked by the ExecCommand.
   ''' </summary>
   Public Sub AddRow()
      m_TableRowList.Insert(SelRowIndex + 1, New GridLine(False, "", ""))
   End Sub
 #End Region    ' AddRow
 #Region "DeleteRow"
   ''' <summary>
   ''' Returns a command that do Exec.
   ''' </summary>
   Public ReadOnly Property DeleteRow_Command As ICommand
      Get
         If m_cmdDeleteRow Is Nothing Then
            m_cmdDeleteRow = New Command(AddressOf DeleteRow)
         End If
         Return m_cmdDeleteRow
      End Get
   End Property
   ''' <summary>
   ''' Execute the Exec.  This method is invoked by the ExecCommand.
   ''' </summary>
   Public Sub DeleteRow()
      m_TableRowList.RemoveAt(SelRowIndex)
   End Sub
 #End Region    ' DeleteRow
 #Region "Save"
   ''' <summary>
   ''' Returns a command that do Exec.
   ''' </summary>
   Public ReadOnly Property Save_Command As ICommand
      Get
         If m_cmdSave Is Nothing Then
            m_cmdSave = New Command(AddressOf Save)
         End If
         Return m_cmdSave
      End Get
   End Property
   ''' <summary>
   ''' Execute the Exec.  This method is invoked by the ExecCommand.
   ''' </summary>
   Public Sub Save()
      ' scrivo il file
      WriteTableFile()
      ' resetto le modifiche
      For Each Line In m_TableRowList
         Line.ResetIsModified()
      Next
   End Sub
 #End Region    ' Save
 #Region "Close"
   ''' <summary>
   ''' Returns a command that do Exec.
   ''' </summary>
   Public ReadOnly Property Close_Command As ICommand
      Get
         If m_cmdClose Is Nothing Then
            m_cmdClose = New Command(AddressOf Close)
         End If
         Return m_cmdClose
      End Get
   End Property
   ''' <summary>
   ''' Execute the Exec.  This method is invoked by the ExecCommand.
   ''' </summary>
   Public Sub Close()
      ' verifico se pagina precedente modificata
      Dim TableModified As Boolean = False
      For Each Line In m_TableRowList
         If Line.IsModified Then
            TableModified = True
            Exit For
         End If
      Next
      ' se modificata, chiedo se salvare
      If TableModified Then
         ' Salvare le modifiche apportate? - Salva
         Select Case MessageBox.Show( EgtMsg( 9007), EgtMsg( 9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
            Case MessageBoxResult.Yes
               Save()
            Case MessageBoxResult.No
               ' non devo fare nulla
         End Select
      End If
      RaiseEvent m_CloseWindow(True)
   End Sub
 #End Region    ' Close
 #End Region    ' COMMANDS
 End Class
 Public Class GridLine
   Inherits VMBase
   Friend ReadOnly Property IsModified As Boolean
      Get
         Return m_IsOnModified Or m_IsNameModified Or m_IsTypeModified
      End Get
   End Property
   Friend Sub ResetIsModified()
      m_IsOnModified = False
      m_IsNameModified = False
      m_IsTypeModified = False
   End Sub
   Private m_IsOnModified As Boolean = False
   Private m_On As Boolean
   Public Property OnPar As Boolean
      Get
         Return m_On
      End Get
      Set(value As Boolean)
         m_On = value
         m_IsOnModified = True
      End Set
   End Property
   Private Shared m_NamesList As ObservableCollection(Of String)
   Public ReadOnly Property NamesList As ObservableCollection(Of String)
      Get
         Return m_NamesList
      End Get
   End Property
   Friend Shared Sub SetNamesList(NamesList As ObservableCollection(Of String))
      m_NamesList = NamesList
   End Sub
   Private m_IsNameModified As Boolean = False
   Private m_Name As String
   Public Property Name As String
      Get
         Return m_Name
      End Get
      Set(value As String)
         m_Name = value
         m_IsNameModified = True
      End Set
   End Property
   Private Shared m_TypeList As ObservableCollection(Of String)
   Public ReadOnly Property TypeList As ObservableCollection(Of String)
      Get
         Return m_TypeList
      End Get
   End Property
   Friend Shared Sub SetTypeList(TypeList As ObservableCollection(Of String))
      m_TypeList = TypeList
   End Sub
   Private m_IsTypeModified As Boolean = False
   Private m_Type As String
   Public Property Type As String
      Get
         Return m_Type
      End Get
      Set(value As String)
         m_Type = value
         m_IsTypeModified = True
      End Set
   End Property
   Sub New(bOnPar As Boolean, sName As String, sType As String)
      m_On = bOnPar
      m_Name = sName
      m_Type = sType
   End Sub
 End Class
@@ -0,0 +1,12 @@
 <Grid x:Class="BottomTrayV"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
      DockPanel.Dock="Bottom">
   <EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelViewModel}"
                                  RepaetButtonStyle="{StaticResource CustomScrollBarButton}"
                                  MachGroupButtonStyle="{StaticResource {x:Type ToggleButton}}"
                                  IsToolBar="False"
                                  IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False"
                                  IsRightDockable="False" />
 </Grid>
@@ -0,0 +1,3 @@
 Public Class BottomTrayV
 End Class
@@ -22,6 +22,7 @@ Module ConstGen
   ' File con dati di licenza
   Public Const LIC_FILE_NAME As String = "EgtCAM5.lic"
   Public Const S_LICENCE As String = "Licence"
   Public Const K_LOCKID As String = "LockId"
   Public Const K_KEY As String = "Key"
   Public Const K_NESTKEY As String = "NestKey"
@@ -18,6 +18,7 @@ Module ConstIni
   Public Const S_GENERAL As String = "General"
   Public Const K_DEBUG As String = "Debug"
   Public Const K_LICENCE As String = "Licence"
   Public Const K_NETKEY As String = "NetKey"
   Public Const K_USERLEVEL As String = "UserLevel"
   Public Const K_MAXINST As String = "MaxInstances"
   Public Const K_INSTANCES As String = "Instances"
@@ -28,6 +29,7 @@ Module ConstIni
   Public Const K_HIDEPLACE As String = "HidePlace"
   Public Const K_LASTNGEDIR As String = "LastNgeDir"
   Public Const K_LASTNGEOBJDIR As String = "LastNgeObjDir"
   Public Const K_LASTNGEINSDIR As String = "LastNgeInsDir"
   Public Const K_LASTLUADIR As String = "LastLuaDir"
   Public Const K_LASTIMPDIR As String = "LastImpDir"
   Public Const K_LASTEXPDIR As String = "LastExpDir"
@@ -37,14 +39,16 @@ Module ConstIni
   Public Const K_TRANSFORM As String = "Transform"
   Public Const K_ONLYDRAW As String = "OnlyDraw"
   Public Const K_SUPPORT As String = "Support"
   Public Const K_PLUGIN As String = "Plugin"
   Public Const K_EXECUTE As String = "Execute"
   Public Const S_LANGUAGES As String = "Languages"
   Public Const K_LANGUAGE As String = "Language"
   Public Const S_LUA As String = "Lua"
   Public Const K_LIBSDIR As String = "LibsDir"
   Public Const K_LIBSDIR64 As String = "LibsDir64"
   Public Const K_BASELIB As String = "BaseLib"
   Public Const K_BWSIM As String = "BWSim"
   Public Const S_GEOMDB As String = "GeomDB"
   Public Const K_DEFAULTFONT As String = "DefaultFont"
@@ -104,11 +108,13 @@ Module ConstIni
   Public Const K_CNCFLAG As String = "CncFlag"
   Public Const K_BTLFLAG As String = "BtlFlag"
   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
   Public Const K_ADVFLAG As String = "AdvFlag"
   Public Const S_EXPORT As String = "Export"
   Public Const K_DXFFLAG As String = "DxfFlag"
   Public Const K_IMGWIDTH As String = "ImgWidth"
   Public Const K_IMGHEIGHT As String = "ImgHeight"
   Public Const K_THREEJSLIBDIR As String = "ThreeJSLibDir"
   Public Const S_SPECIAL As String = "Special"
   Public Const K_SPECIALENABLE As String = "SpecialEnable"
@@ -130,10 +136,13 @@ Module ConstIni
   Public Const K_WALLBUTTON As String = "Button"
   Public Const S_BEAMWALL As String = "BeamWall"
   Public Const K_BEAMWALLENABLE As String = "BtlEnable"
   Public Const K_BEAMWALLBASEDIR As String = "BaseDir"
   Public Const K_BEAMWALLBUTTON As String = "Button"
   Public Const S_PRINTING3D As String = "3dPrinting"
   Public Const K_ENABLE As String = "Enable"
   Public Const K_3PRNBASEDIR As String = "BaseDir"
   Public Const S_DOORS As String = "Doors"
   Public Const K_DDFENABLE As String = "DdfEnable"
   Public Const K_BASEDIR As String = "BaseDir"
@@ -153,13 +162,14 @@ Module ConstIni
   Public Const K_WRITEPEZFUNCTION As String = "WritePezFun"
   Public Const K_READPEZFUNCTION As String = "ReadPezFun"
   Public Const K_CREATEFUNCTION As String = "CreateFun"
   Public Const K_COPYFUNCTION As String = "CopyFun"
   Public Const K_MODDIR As String = "ModDir"
   Public Const K_PEZDIR As String = "PezDir"
   Public Const K_COPYDIR As String = "CopyDir"
   Public Const S_MACH As String = "Mach"
   Public Const K_MACHINESDIR As String = "MachinesDir"
   Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
   Public Const K_TOOLMAKERSDIR64 As String = "ToolMakersDir64"
   Public Const K_CURRMACH As String = "CurrMach"
   Public Const K_SELGEOMSAWING As String = "SelGeomSawing"
   Public Const K_SELGEOMDRILLING As String = "SelGeomDrilling"
@@ -174,6 +184,7 @@ Module ConstIni
   Public Const K_MACHININGGROUP As String = "MachiningGroup"
   Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
   Public Const K_MOVETHROUGHDISPS As String = "MoveThroughDisps"
   Public Const K_AUTOUPDATEALLMACHININGS As String = "AutoUpdateAllMachinings"
   Public Const S_SIMUL As String = "Simul"
   Public Const K_SLIDERX As String = "SliderX"
@@ -33,7 +33,9 @@
   Public Const K_SAWFINISHING As String = "SawFinishing"
   Public Const K_GENMACHINING As String = "GenMachining"
   Public Const K_CHISELING As String = "Chiseling"
   Public Const K_SURFROUGHING As String = "SurfRoughing"
   Public Const K_SURFFINISHING As String = "SurfFinishing"
   Public Const K_5AXMACHINING As String = "5axMachining"
   Public Const K_WATERJETTING As String = "WaterJetting"
   Public Const K_SAWINGONARCS As String = "SawingOnArcs"
@@ -1,9 +1,11 @@
-<UserControl x:Class="DrawPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="DrawPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                              xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5">
+                              xmlns:EgtCAM5="clr-namespace:EgtCAM5"
                              TitleBarOrientation="Vertical"
                              Visibility="{Binding DrawPanel_Visibility}">
   <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
      <Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
@@ -72,17 +74,27 @@
               Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
            </Button>
-            </UniformGrid>
+            <Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
               <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
            </Button>
         </UniformGrid>
      </Expander>
      <Expander Name="Draw3D" Style="{StaticResource ExpanderStyle}" Grid.Row="1"
                Visibility="{Binding Draw3DVisibility}" IsExpanded="{Binding Draw3DIsExpanded}">
@@ -170,6 +182,16 @@
               Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ApproxSurfToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
            </Button>
         </UniformGrid>
      </Expander>
      <Expander Name="Modify" Style="{StaticResource ExpanderStyle}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
@@ -187,8 +209,11 @@
               Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
            </Button>
-            <Button Style="{StaticResource DrawPanelButton}"
+            <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
-                    Visibility="Hidden"/>
+               ToolTipService.ShowOnDisabled="True"
               Command="{Binding ChangeStatusCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ChangeStatus.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
@@ -284,6 +309,11 @@
               Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ModifyArcRadiusToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
               <Image Source="/Resources/DrawPanel/ModifyArcRadius.png" Stretch="Uniform"/>
            </Button>
            <Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
               ToolTipService.ShowOnDisabled="True"
               Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
@@ -342,4 +372,4 @@
      </Interactivity:Interaction.Behaviors>
   </StackPanel>
-</UserControl>
+</EgtFloating:EgtFloatingPanel>
@@ -97,12 +97,22 @@ Public Class DrawPanelVM
   End Property
   Public ReadOnly Property TextToolTip As String
      Get
-         Return EgtMsg( 5214)
+         Return EgtMsg( 5214)       ' Testo<br/>Testo Avanzato (Shift)
      End Get
   End Property
   Public ReadOnly Property LinearDimensionToolTip As String
      Get
-         Return EgtMsg( 5155)
+         Return EgtMsg( 5155)       ' Quota Lineare<br/>Quota Allineata (Shift)
      End Get
   End Property
   Public ReadOnly Property AngularDimensionToolTip As String
      Get
         Return EgtMsg( 5167)       ' Quota Angolare<br/>Quota Angolare Avanzata (Shift)
      End Get
   End Property
   Public ReadOnly Property DiamRadDimensionToolTip As String
      Get
         Return EgtMsg( 5168)       ' Quota Diametrale<br/>Quota Radiale (Shift)
      End Get
   End Property
@@ -146,6 +156,16 @@ Public Class DrawPanelVM
         Return EgtMsg( 5221)         'Esplodi Superfici e Regioni Piane
      End Get
   End Property
   Public ReadOnly Property ApproxSurfToolTip As String
      Get
         Return EgtMsg( 5165)         'Approssima Superfici e Regioni Piane
      End Get
   End Property
   Public ReadOnly Property StmMoveVertexFacetToolTip As String
      Get
         Return EgtMsg( 5166)         'Muovi Vertice di Superficie<br/>Muovi Faccia di Superficie (Shift)
      End Get
   End Property
   Public ReadOnly Property ExtractSurfFacetToolTip As String
      Get
         Return EgtMsg( 5158)         'Estrai Faccia da Superficie
@@ -197,6 +217,12 @@ Public Class DrawPanelVM
         Return EgtMsg(MSG_DRAWPANEL + 24)
      End Get
   End Property
   Public ReadOnly Property ChangeStatusToolTip As String
      Get
         Return EgtMsg(5250)
      End Get
   End Property
   Public ReadOnly Property ChangeAlphaToolTip As String
      Get
         Return EgtMsg(MSG_DRAWPANEL + 25)
@@ -289,12 +315,17 @@ Public Class DrawPanelVM
   End Property
   Public ReadOnly Property ApproxCurveToolTip As String
      Get
-         Return EgtMsg( 5163)
+         Return EgtMsg(5163)
      End Get
   End Property
   Public ReadOnly Property ModifyArcRadiusToolTip As String
      Get
         Return EgtMsg(5164)
      End Get
   End Property
   Public ReadOnly Property ModifyTextToolTip As String
      Get
-         Return EgtMsg(MSG_DRAWPANEL + 49)
+         Return EgtMsg(5249)
      End Get
   End Property
@@ -383,6 +414,18 @@ Public Class DrawPanelVM
      End Set
   End Property
   Private m_DrawPanel_Visibility As Visibility
   Public ReadOnly Property DrawPanel_Visibility As Visibility
      Get
         Return m_DrawPanel_Visibility
      End Get
   End Property
   Friend Sub SetDrawPanelVisibility(bValue As Boolean)
      m_DrawPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
      OnPropertyChanged(NameOf(DrawPanel_Visibility))
   End Sub
 #Region "Button state"
   Private m_bLayerOk As Boolean
@@ -433,6 +476,8 @@ Public Class DrawPanelVM
   Private m_cmdPolygonSide As ICommand
   Private m_cmdText As ICommand
   Private m_cmdLinDim As ICommand
   Private m_cmdAngDim As ICommand
   Private m_cmdDiamRadDim As ICommand
   Private m_cmdModifyCurve As ICommand
   Private m_cmdAddPointCurve As ICommand
   Private m_cmdPlane As ICommand
@@ -443,6 +488,8 @@ Public Class DrawPanelVM
   Private m_cmdRuled As ICommand
   Private m_cmdMergeSurf As ICommand
   Private m_cmdExplodeSurf As ICommand
   Private m_cmdApproxSurf As ICommand
   Private m_cmdMoveStmVertexFacet As ICommand
   Private m_cmdExtractSurfFacet As ICommand
   Private m_cmdInvertSurf As ICommand
   Private m_cmdExtractLoops As ICommand
@@ -453,6 +500,7 @@ Public Class DrawPanelVM
   Private m_cmdIntersectSurfSurf As ICommand
   Private m_cmdDelete As ICommand
   Private m_cmdChangeLayer As ICommand
   Private m_cmdChangeStatus As ICommand
   Private m_cmdChangeAlpha As ICommand
   Private m_cmdResetColor As ICommand
   Private m_cmdChangeColor As ICommand
@@ -467,6 +515,7 @@ Public Class DrawPanelVM
   Private m_cmdFillet As ICommand
   Private m_cmdChamfer As ICommand
   Private m_cmdArcFlip As ICommand
   Private m_cmdModifyArcRadius As ICommand
   Private m_cmdModifyText As ICommand
   Private m_cmdMove As ICommand
   Private m_cmdRotate As ICommand
@@ -690,7 +739,11 @@ Public Class DrawPanelVM
   ''' Execute the Arc3P.  This method is invoked by the Arc3PCommand.
   ''' </summary>
   Public Sub Arc3P(ByVal param As Object)
-      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC2PR)
      Else
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARC3P)
      End If
   End Sub
 #End Region ' Arc3PCommand
@@ -713,13 +766,12 @@ Public Class DrawPanelVM
   ''' Execute the ArcPDP.  This method is invoked by the ArcPDPCommand.
   ''' </summary>
   Public Sub ArcPDP(ByVal param As Object)
-      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
         If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
            Map.refProjectVM.GetController.SetContinue()
         End If
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
      Else
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPVP)
      ElseIf (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
         Map.refProjectVM.GetController.SetContinue()
      Else
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ARCPDP)
      End If
   End Sub
@@ -848,6 +900,60 @@ Public Class DrawPanelVM
 #End Region ' LinearDimensionCommand
 #Region "AngularDimensionCommand"
   ''' <summary>
   ''' Returns a command that do Angular Dimension.
   ''' </summary>
   Public ReadOnly Property AngularDimensionCommand As ICommand
      Get
         If m_cmdAngDim Is Nothing Then
            m_cmdAngDim = New RelayCommand(AddressOf AngularDimension)
         End If
         Return m_cmdAngDim
      End Get
   End Property
   ''' <summary>
   ''' Execute the AngularDimension.  This method is invoked by the AngDimCommand.
   ''' </summary>
   Public Sub AngularDimension(ByVal param As Object)
      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ANGULARDIMENSIONPLUS)
      Else
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.ANGULARDIMENSION)
      End If
   End Sub
 #End Region ' AngularDimensionCommand
 #Region "DiamRadDimensionCommand"
   ''' <summary>
   ''' Returns a command that do DiamRad Dimension.
   ''' </summary>
   Public ReadOnly Property DiamRadDimensionCommand As ICommand
      Get
         If m_cmdDiamRadDim Is Nothing Then
            m_cmdDiamRadDim = New RelayCommand(AddressOf DiamRadDimension)
         End If
         Return m_cmdDiamRadDim
      End Get
   End Property
   ''' <summary>
   ''' Execute the DiamRadDimension.  This method is invoked by the DiamRadDimCommand.
   ''' </summary>
   Public Sub DiamRadDimension(ByVal param As Object)
      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.RADIALDIMENSION)
      Else
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.DIAMETRALDIMENSION)
      End If
   End Sub
 #End Region ' DiamRadDimensionCommand
 #Region "ModifyCurve"
   ''' <summary>
@@ -1140,7 +1246,7 @@ Public Class DrawPanelVM
   ''' </summary>
   Public Sub ExplodeSurf(ByVal param As Object)
      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFFACET)
+         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SURFTMTOTRIANGLES)
      Else
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXPLODESURF)
      End If
@@ -1148,6 +1254,56 @@ Public Class DrawPanelVM
 #End Region ' ExplodeSurfCommand
 #Region "ApproxSurfCommand"
   ''' <summary>
   ''' Returns a command that do ApproxSurf.
   ''' </summary>
   Public ReadOnly Property ApproxSurfCommand As ICommand
      Get
         If m_cmdApproxSurf Is Nothing Then
            m_cmdApproxSurf = New RelayCommand(AddressOf ApproxSurf)
         End If
         Return m_cmdApproxSurf
      End Get
   End Property
   ''' <summary>
   ''' Execute the ApproxSurf.  This method is invoked by the ApproxSurfCommand.
   ''' </summary>
   Public Sub ApproxSurf(ByVal param As Object)
      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.APPROXSURF)
   End Sub
 #End Region ' ApproxSurfCommand
 #Region "MoveStmVertexFacetCommand"
   ''' <summary>
   ''' Returns a command that do MoveStmVertex.
   ''' </summary>
   Public ReadOnly Property MoveStmVertexFacetCommand As ICommand
      Get
         If m_cmdMoveStmVertexFacet Is Nothing Then
            m_cmdMoveStmVertexFacet = New RelayCommand(AddressOf MoveStmVertexFacet)
         End If
         Return m_cmdMoveStmVertexFacet
      End Get
   End Property
   ''' <summary>
   ''' Execute the MoveStmVertexFacet.  This method is invoked by the MoveStmVertexFacetCommand.
   ''' </summary>
   Public Sub MoveStmVertexFacet(ByVal param As Object)
      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVESURFFACET)
      Else
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MOVESURFVERTEX)
      End If
   End Sub
 #End Region ' MoveStmVertexFacetCommand
 #Region "ExtractSurfFacetCommand"
   ''' <summary>
@@ -1169,7 +1325,7 @@ Public Class DrawPanelVM
      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.EXTRACTSURFFACET)
   End Sub
-#End Region ' ExplodeSurfCommand
+#End Region ' ExtractSurfFacetCommand
 #Region "InvertSurfCommand"
@@ -1391,6 +1547,41 @@ Public Class DrawPanelVM
 #End Region ' ChangeLayerCommand
 #Region "ChangeStatusCommand"
   ''' <summary>
   ''' Returns a command that do ChangeStatus.
   ''' </summary>
   Public ReadOnly Property ChangeStatusCommand As ICommand
      Get
         If m_cmdChangeStatus Is Nothing Then
            m_cmdChangeStatus = New RelayCommand(AddressOf ChangeStatus)
         End If
         Return m_cmdChangeStatus
      End Get
   End Property
   ''' <summary>
   ''' Execute the ChangeStatus.  This method is invoked by the ChangeStatusCommand.
   ''' </summary>
   Public Sub ChangeStatus(ByVal param As Object)
      If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SELPART)
         Map.refProjectVM.GetController.SetLastBoolean( True)
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
      ElseIf (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SELLAYER)
         Map.refProjectVM.GetController.SetLastBoolean( True)
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
      Else
         Map.refProjectVM.GetController.SetLastInteger( GDB_ID.SEL)
         Map.refProjectVM.GetController.SetLastBoolean( False)
         Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.CHANGESTATUS)
      End If
   End Sub
 #End Region ' ChangeStatusCommand
 #Region "ChangeAlphaCommand"
   ''' <summary>
@@ -1726,6 +1917,29 @@ Public Class DrawPanelVM
 #End Region ' ArcFlipCommand
 #Region "ModifyArcRadiusCommand"
   ''' <summary>
   ''' Returns a command that do ModifyArcRadius.
   ''' </summary>
   Public ReadOnly Property ModifyArcRadiusCommand As ICommand
      Get
         If m_cmdModifyArcRadius Is Nothing Then
            m_cmdModifyArcRadius = New RelayCommand(AddressOf ModifyArcRadius)
         End If
         Return m_cmdModifyArcRadius
      End Get
   End Property
   ''' <summary>
   ''' Execute the ModifyArcRadius.  This method is invoked by the ModifyArcRadiusCommand.
   ''' </summary>
   Public Sub ModifyArcRadius(ByVal param As Object)
      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MODIFYARCRADIUS)
   End Sub
 #End Region ' ModifyTextCommand
 #Region "ModifyTextCommand"
   ''' <summary>
@@ -97,27 +97,31 @@
    <ApplicationManifest>app.manifest</ApplicationManifest>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="EgtUILib">
+    <Reference Include="DotNetZip">
      <HintPath>..\..\EgtProg\EgtCAM5\DotNetZip.dll</HintPath>
    </Reference>
    <Reference Include="EgtUILib, Version=2.4.6.1, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="EgtWPFLib5">
+    <Reference Include="EgtWPFLib, Version=2.4.5.1, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\EgtProg\DllD32\EgtWPFLib.dll</HintPath>
    </Reference>
    <Reference Include="EgtWPFLib5, Version=2.4.6.1, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Ionic.Zip">
      <HintPath>..\..\EgtProg\EgtCAM5\Ionic.Zip.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\EgtProg\EgtCAM5\Microsoft.Expression.Interactions.dll</HintPath>
    </Reference>
    <Reference Include="System.ComponentModel.Composition" />
    <Reference Include="System.Core" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>packages\EgtWPFLib5.2.4.6.1\lib\System.Windows.Interactivity.dll</HintPath>
      <HintPath>..\..\EgtProg\EgtCAM5\System.Windows.Interactivity.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -150,12 +154,18 @@
    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
      <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
    </Compile>
-    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowVM.vb" />
+    <Compile Include="BottomTray\BottomTrayV.xaml.vb">
      <DependentUpon>BottomTrayV.xaml</DependentUpon>
    </Compile>
    <Compile Include="CurrSetUp\CurrSetUpV.xaml.vb">
      <DependentUpon>CurrSetUpV.xaml</DependentUpon>
    </Compile>
    <Compile Include="CurrSetUp\CurrSetUpVM.vb" />
    <Compile Include="LeftTray\LeftTrayV.xaml.vb">
      <DependentUpon>LeftTrayV.xaml</DependentUpon>
    </Compile>
    <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
    <Compile Include="MEFPlugin\MefPlugin.vb" />
    <Compile Include="OptionPanel\MachiningOptionPanel\EstimationsExpander\EstimationsExpanderV.xaml.vb">
      <DependentUpon>EstimationsExpanderV.xaml</DependentUpon>
    </Compile>
@@ -225,6 +235,12 @@
    <Compile Include="OptionsWindow\MachineBox.xaml.vb">
      <DependentUpon>MachineBox.xaml</DependentUpon>
    </Compile>
    <Compile Include="RightTray\RightTrayV.xaml.vb">
      <DependentUpon>RightTrayV.xaml</DependentUpon>
    </Compile>
    <Compile Include="SceneContentControl\SceneContentControlV.xaml.vb">
      <DependentUpon>SceneContentControlV.xaml</DependentUpon>
    </Compile>
    <Compile Include="SetUpDb\SetUpDbV.xaml.vb">
      <DependentUpon>SetUpDbV.xaml</DependentUpon>
    </Compile>
@@ -272,7 +288,11 @@
    </Compile>
    <Compile Include="StatusBar\MyStatusBarVM.vb" />
    <Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
    <Compile Include="TopTray\TopTrayV.xaml.vb">
      <DependentUpon>TopTrayV.xaml</DependentUpon>
    </Compile>
    <Compile Include="Utility\Analyze.vb" />
    <Compile Include="Utility\BasePanelVM.vb" />
    <Compile Include="Utility\BindingProxy.vb" />
    <Compile Include="Utility\Map.vb" />
    <Compile Include="Internals\MruList.vb" />
@@ -344,7 +364,6 @@
      <DependentUpon>MachiningParameterExpanderV.xaml</DependentUpon>
    </Compile>
    <Compile Include="OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBoxItem\OperationListBoxItem.vb" />
    <Compile Include="OptionPanel\MachiningOptionPanel\SimulationExpander\MachineAxis.vb" />
    <Compile Include="PopUpGridPanel\PopUpGridPanelV.xaml.vb">
      <DependentUpon>PopUpGridPanelV.xaml</DependentUpon>
    </Compile>
@@ -411,6 +430,10 @@
    <Compile Include="Utility\Utility.vb" />
    <Compile Include="Utility\VMBase.vb" />
    <Compile Include="ValidationGroup.vb" />
    <Compile Include="WinFormPluginControl\WinFormPluginControlVM.vb" />
    <Compile Include="WinFormPluginControl\WinFormPluginControlV.xaml.vb">
      <DependentUpon>WinFormPluginControlV.xaml</DependentUpon>
    </Compile>
    <Page Include="AboutBoxWindow\AboutBoxView.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -419,6 +442,10 @@
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
    <Page Include="BottomTray\BottomTrayV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
    <Page Include="CurrSetUp\CurrSetUpV.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -427,6 +454,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
    <Page Include="LeftTray\LeftTrayV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
    <Page Include="MachOptionsWindow\MachOptionV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -515,6 +546,14 @@
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
    <Page Include="RightTray\RightTrayV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
    <Page Include="SceneContentControl\SceneContentControlV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
    <Page Include="SetUpDb\SetUpDbV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -579,6 +618,10 @@
      <SubType>Designer</SubType>
      <Generator>XamlIntelliSenseFileGenerator</Generator>
    </Page>
    <Page Include="TopTray\TopTrayV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
    <Page Include="Utility\Dictionary.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -671,6 +714,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
    <Page Include="WinFormPluginControl\WinFormPluginControlV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
  </ItemGroup>
  <ItemGroup>
    <Import Include="System.Linq" />
@@ -943,6 +990,37 @@
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\ApproxCurve.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\ModifyArcRadius.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\ApproxSurf.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\TopCommandBar\Print.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\EgtCAM5_64.ico" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\Note\+.png" />
    <Resource Include="Resources\Note\-.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\AngularDimension.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\DiametralDimension.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\ChangeStatus.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\GridViewPanel\CplaneINVERT.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\DrawPanel\StmMoveVertex.png" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
@@ -1,6 +1,8 @@
-<UserControl x:Class="ExecutePanelV"
+<EgtFloating:EgtFloatingPanel x:Class="ExecutePanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                              Visibility="{Binding ExecutePanel_Visibility}">
   <StackPanel Orientation="Horizontal">
      <Button Command="{Binding ExecCommand}" ToolTip="{Binding ExecToolTip}"
@@ -13,4 +15,4 @@
      </Button>
   </StackPanel>
-</UserControl>
+</EgtFloating:EgtFloatingPanel>
@@ -12,6 +12,18 @@ Public Class ExecutePanelVM
      End Get
   End Property
   Private m_ExecutePanel_Visibility As Visibility
   Public ReadOnly Property ExecutePanel_Visibility As Visibility
      Get
         Return m_ExecutePanel_Visibility
      End Get
   End Property
   Friend Sub SetExecutePanelVisibility(bValue As Boolean)
      m_ExecutePanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
      OnPropertyChanged(NameOf(ExecutePanel_Visibility))
   End Sub
   ' Definizione comandi
   Private m_cmdExec As ICommand
   Private Shared m_cmdOpenMruScript As ICommand
@@ -28,6 +40,11 @@ Public Class ExecutePanelVM
 #End Region    ' FIELDS & PROPERTIES
   Sub New()
      ' Creo riferimento a questa classe in Map
      Map.SetRefExecutePanelVM(Me)
   End Sub
 #Region "COMMANDS"
 #Region "ExecCommand"
@@ -6,20 +6,20 @@
      <Button Command="{Binding CPlaneTopCommand}" ToolTip="{Binding CPlaneTopToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneBottomCommand}" ToolTip="{Binding CPlaneBottomToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneFrontCommand}" ToolTip="{Binding CPlaneFrontToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneRightCommand}" ToolTip="{Binding CPlaneRightToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneBackCommand}" ToolTip="{Binding CPlaneBackToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneLeftCommand}" ToolTip="{Binding CPlaneLeftToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
      </Button>
-      <Button Command="{Binding CPlaneBottomCommand}" ToolTip="{Binding CPlaneBottomToolTip}" Style="{StaticResource GridViewPanelButton}">
+      <Button Command="{Binding CPlaneRightCommand}" ToolTip="{Binding CPlaneRightToolTip}" Style="{StaticResource GridViewPanelButton}">
-         <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+         <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneElevationCommand}" ToolTip="{Binding CPlaneElevationToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
@@ -12,13 +12,8 @@ Public Class GridPanelVM
   Private m_cmdCPlaneBack As ICommand
   Private m_cmdCPlaneLeft As ICommand
   Private m_cmdCPlaneBottom As ICommand
   Private m_cmdCPlaneView As ICommand
   Private m_cmdCPlaneElevation As ICommand
   Private m_cmdCPlaneOrigin As ICommand
   Private m_cmdCPlaneRotate As ICommand
   Private m_cmdCPlane3P As ICommand
   Private m_cmdCPlanePerpObj As ICommand
   Private m_cmdCPlaneObj As ICommand
 #Region "ToolTip"
@@ -59,7 +59,7 @@ Public Class MruList
   End Sub
   '---------------------------------------------------------------------------
-   Public Sub Add(ByVal sFileName As String)
+   Public Sub Add(sFileName As String)
      ' Gestione '_'
      Dim sMyFileName As String = sFileName.Replace("_", "__")
      ' Se stringa vuota, esco subito
@@ -84,7 +84,7 @@ Public Class MruList
   End Sub
   '---------------------------------------------------------------------------
-   Private Function FileNameIndex(ByVal sFileName As String) As Integer
+   Private Function FileNameIndex(sFileName As String) As Integer
      For i As Integer = 0 To m_FileNames.Count - 1
         If String.Compare(m_FileNames(i).ToString, sFileName, True) = 0 Then
            Return i
@@ -94,7 +94,7 @@ Public Class MruList
   End Function
   '---------------------------------------------------------------------------
-   Public Sub Remove(ByVal sFileName As String)
+   Public Sub Remove(sFileName As String)
      ' Gestione '_'
      Dim sMyFileName As String = sFileName.Replace("_", "__")
      ' Rimozione
@@ -108,8 +108,8 @@ Public Class MruList
   End Sub
   '---------------------------------------------------------------------------
-   Public Function GetFileName(ByVal nInd As Integer, ByRef sFileName As String) As Boolean
+   Public Function GetFileName(nInd As Integer, ByRef sFileName As String) As Boolean
-      If nInd > 0 And nInd <= m_FileNames.Count() Then
+      If nInd >= 0 And nInd < m_FileNames.Count() Then
         ' Gestione '_'
         sFileName = m_FileNames(nInd).ToString().Replace("__", "_")
         Return True
@@ -0,0 +1,9 @@
 <Grid x:Class="LeftTrayV"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:local="clr-namespace:EgtCAM5"
      DockPanel.Dock="Left">
   <local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
 </Grid>
@@ -0,0 +1,3 @@
 Public Class LeftTrayV
 End Class
@@ -0,0 +1,74 @@
 Imports System.ComponentModel.Composition
 Imports System.ComponentModel.Composition.hosting
 Public Class MEFLoader
   Private importers As Dictionary(Of String, List(Of Object)) = New Dictionary(Of String, List(Of Object))()
   Public Overridable Function LoadByTag(Of T)(ByVal path As String, ByVal tag As String) As ICollection(Of T)
      Dim importer = GetImporter(Of T)(path)
      Return importer.LoadByMEF(path, tag)
   End Function
   Protected Function GetImporter(Of T)(ByVal path As String) As MEFImporter(Of T)
      Dim importerList = GetImporterList(path)
      Dim importer = importerList.OfType(Of MEFImporter(Of T))().FirstOrDefault()
      If importer Is Nothing Then
         importer = New MEFImporter(Of T)(path)
         importerList.Add(importer)
      End If
      Return importer
   End Function
   Protected Function GetImporterList(ByVal path As String) As List(Of Object)
      If importers.ContainsKey(path) = False Then importers.Add(path, New List(Of Object)())
      Return importers(path)
   End Function
   Public Overridable Function LoadByType(Of T)(ByVal path As String) As ICollection(Of T)
      Return LoadByTag(Of T)(path, String.Empty)
   End Function
 End Class
 Public Interface IMetadata
   ReadOnly Property Name As String
 End Interface
 Public Class MEFImporter(Of T)
   <ImportMany(AllowRecomposition:=True)>
   Public Property [imports] As IEnumerable(Of Lazy(Of T, IMetadata))
   Private Sub New()
   End Sub
   Public Sub New(ByVal path As String)
      Me.New()
      directoryCatalog = New DirectoryCatalog(path)
   End Sub
   Protected directoryCatalog As DirectoryCatalog = Nothing
   Protected Sub DoImport(ByVal path As String)
      Dim catalog = New AggregateCatalog()
      catalog.Catalogs.Add(directoryCatalog)
      Dim container As CompositionContainer = New CompositionContainer(catalog)
      container.ComposeParts(Me)
   End Sub
   Public Function LoadByMEF(ByVal path As String, ByVal name As String) As ICollection(Of T)
      Dim res = New List(Of T)()
      DoImport(path)
      For Each [module] As Lazy(Of T, IMetadata) In [imports]
         If [module].Metadata.Name = name OrElse String.IsNullOrEmpty(name) Then
            res.Add([module].Value)
         End If
      Next
      Return res
   End Function
 End Class
@@ -1,5 +1,8 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
 Imports EgtCAM5.MyMachinePanelVM
 Imports System.Security.Cryptography
 Imports System.Windows.Forms.AxHost
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -95,30 +98,32 @@ Public Class MyMachGroupPanelVM
            ' Vuoi creare un nuovo Gruppo di Lavoro con i pezzi selezionati ?    -   LAVORA
            If MessageBox.Show(EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
               Return If(AddNewMachGroup(nGroupId, vPart), 0, 1)
-            Else
+         Else
               Return -2
            End If
         End If
-         ' Se non ci sono pezzi selezionati
+      ' Se non ci sono pezzi selezionati
      Else
         ' se ci sono gruppi di lavorazione
         If bMachGroup Then
            nGroupId = EgtGetLastMachGroup()
            Return If(EgtSetCurrMachGroup(nGroupId), 0, 1)
-            ' se altrimenti ammessi gruppi di lavoro vuoti
+         ' se altrimenti ammessi gruppi di lavoro vuoti
         ElseIf bAllowEmpty Then
            Return If(AddNewMachGroup(nGroupId, vPart), 0, 1)
-            ' altrimenti esco
+         ' altrimenti esco
         Else
            Return -1
         End If
      End If
   End Function
-   Private Function ExecScript(sScriptPath As String, nGroupId As Integer, nPartId As Integer) As Boolean
+   Private Function ExecScript(sScriptPath As String, nGroupId As Integer, nPartId As Integer, nInd As Integer, sParts As String) As Boolean
      EgtLuaCreateGlobTable("DISP")
      EgtLuaSetGlobIntVar("DISP.GROUPID", nGroupId)
      EgtLuaSetGlobIntVar("DISP.PARTID", nPartId)
      EgtLuaSetGlobIntVar("DISP.IND", nInd)
      EgtLuaSetGlobStringVar("DISP.PARTS", sParts)
      If Not EgtLuaExecFile(sScriptPath) Then
         EgtOutLog("Error executing disposition init script " & sScriptPath)
         MessageBox.Show(EgtMsg(MSG_DISPOSITIONERRORS + 2) & " " & sScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -161,10 +166,25 @@ Public Class MyMachGroupPanelVM
      If bWithScript Then
         ' Rendo corrente il gruppo di lavoro
         EgtSetCurrMachGroup(nGroupId)
-         ' Creo grezzo e posiziono i pezzi
+         ' Recupero i pezzi già inseriti
         Dim sParts As String = ""
         Dim nInd As Integer = 0
         Dim nRawId As Integer = EgtGetFirstRawPart()
         While nRawId <> GDB_ID.NULL
            Dim nPartId As Integer = EgtGetFirstPartInRawPart( nRawId)
            While nPartId <> GDB_ID.NULL
               nInd += 1
               sParts &= nInd.ToString() & ","
               nPartId = EgtGetNextPartInRawPart( nPartId)
            End While
            nRawId = EgtGetNextRawPart( nRawId)
         End While 
         ' Creo grezzi e posiziono i pezzi
         Dim bOk As Boolean = True
         sParts &= String.Join( ",", PartList)
         For Each Part In PartList
-            If Not ExecScript(sInitScriptPath, nGroupId, Part) Then bOk = False
+            nInd += 1
            If Not ExecScript(sInitScriptPath, nGroupId, Part, nInd, sParts) Then bOk = False
         Next
         Return bOk
      Else
@@ -193,14 +213,18 @@ Public Class MyMachGroupPanelVM
            Return False
         End If
         If bWithScript Then
            ' Creo grezzo e posiziono i pezzi
            Dim bOk As Boolean = True
-            For Each Part In PartList
+            ' Creo grezzi e posiziono i pezzi
-               If Not ExecScript(sInitScriptPath, nGroupId, Part) Then bOk = False
+            If PartList.Count() > 0 then
-            Next
+               Dim nInd As Integer = 0
-            ' Gestione ingresso senza pezzi
+               Dim sParts As String = String.Join( ",", PartList)
-            If PartList.Count() = 0 Then
+               For Each Part In PartList
-               If Not ExecScript(sInitScriptPath, nGroupId, GDB_ID.NULL) Then bOk = False
+                  nInd += 1
                  If Not ExecScript(sInitScriptPath, nGroupId, Part, nInd, sParts) Then bOk = False
               Next
            ' altrimenti, ingresso senza pezzi
            Else
               If Not ExecScript(sInitScriptPath, nGroupId, GDB_ID.NULL, 0, "") Then bOk = False
            End If
            If Not bOk Then
               EgtResetCurrMachGroup()
@@ -208,6 +232,13 @@ Public Class MyMachGroupPanelVM
               EgtOutLog("Errore nel posizionamento dei pezzi")
               Return False
            End If
         Else
            Dim sTabNames As String = ""
            EgtGetAllTablesNames(sTabNames)
            Dim sItems() As String = sTabNames.Split(","c).ToArray
            If sItems.Count() > 0 Then
               EgtSetTable( sItems(0))
            End If
         End If
      Else
         EgtOutLog("Machine without InitDisp script.")
@@ -290,8 +321,10 @@ Public Class MyMachGroupPanelVM
            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.WOOD
         Case "Beam"
            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.BEAM
         Case "Additive"
            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.WOOD
         Case Else
-            ' Se il materiale spcificato nel file INI della macchina non corrisponde ai 2 sopracitati viene emesso un messaggio di errore 
+            ' Se il materiale specificato nel file INI della macchina non corrisponde ai 4 sopracitati viene emesso un messaggio di errore 
            EgtWPFLib5.MachiningTreeViewItem.m_MatType = Nothing
            MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
      End Select
@@ -300,15 +333,36 @@ Public Class MyMachGroupPanelVM
 #End Region
   Public Overrides Sub AddMachGroup()
-      'If AddNewMachGroup() Then
+   
-      '   Dim sMachName As String = String.Empty
+      Dim nNewMachGrpId As Integer = GDB_ID.NULL
-      '   EgtGetMachGroupName(EgtGetCurrMachGroup(), sMachName)
+      Dim sNewMachGrpName As String = ""
-      '   MachGroupList.Add(sMachName)
+
-      '   SelectedMachGroup = sMachName
+      ' Se premuto Shift, copio il gruppo corrente
-      '   EgtDraw()
+      If (Keyboard.Modifiers And Input.ModifierKeys.Shift) = Input.ModifierKeys.Shift Then
-      '   Map.refOperationsListExpanderVM.LoadOperationList(GDB_ID.NULL)
+         ' Eseguo una copia del gruppo corrente
-      '   Map.refOperationsListExpanderVM.UpdateCurrentMachine()
+         Dim sMachGrpName As String = ""
-      'End If
+         If Not EgtGetMachGroupName(EgtGetCurrMachGroup(), sMachGrpName) Then Return 
         sNewMachGrpName = "Mach_1"
         EgtGetMachGroupNewName(sNewMachGrpName)
         nNewMachGrpId = EgtCopyMachGroup(sMachGrpName, sNewMachGrpName)
      ' altrimenti ne aggiungo uno vuoto
      Else
         Dim vPart As New List(Of Integer)
         AddNewMachGroup(nNewMachGrpId, vPart)
         EgtGetMachGroupName(nNewMachGrpId, sNewMachGrpName)
      End If
      ' Se creazione non riuscita, esco subito
      If nNewMachGrpId = GDB_ID.NULL Then Return
      ' altrimenti sistemo interfaccia
      Dim sMachine As String = String.Empty
      EgtGetMachGroupMachineName(nNewMachGrpId, sMachine)
      Dim machGroup As New MachGroup(nNewMachGrpId, sNewMachGrpName, sMachine)
      MachGroupList.Add(machGroup)
      SelectedMachGroup = machGroup
      Map.refMachGroupPanelVM.SetMachGroupState(True)
      EgtZoom(ZM.ALL)
   End Sub
   Public Overrides Sub RemoveMachGroup()
@@ -27,6 +27,7 @@
         <RowDefinition Height="Auto"/>
         <RowDefinition Height="Auto"/>
         <RowDefinition Height="Auto"/>
         <RowDefinition Height="Auto"/>
      </Grid.RowDefinitions>
      <UniformGrid Grid.Row="0" Columns="2" Margin="0,0,0,5">
@@ -56,7 +57,12 @@
         </ComboBox>
      </UniformGrid>
-      <UniformGrid Grid.Row="4" Columns="2">
+      <UniformGrid Grid.Row="4" Columns="2" Margin="0,0,0,5">
         <TextBlock Text="{Binding ApproxLinTolMsg}" VerticalAlignment="Center"/>
         <TextBox Text="{Binding ApproxLinTol}" Height="25" Margin="10,0,0,0"/>
      </UniformGrid>
      <UniformGrid Grid.Row="5" Columns="2">
         <TextBlock Text="{Binding DefaultSetUpMsg}" VerticalAlignment="Center"/>
         <ComboBox ItemsSource="{Binding ArchivedSetUpList}" Height="25" Margin="10,0,0,0"
            SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>
@@ -48,6 +48,21 @@ Public Class MachOptionVM
      End Set
   End Property
   Private m_sApproxLinTol As String
   Public Property ApproxLinTol As String
      Get
         Return m_sApproxLinTol
      End Get
      Set(value As String)
         Dim dApproxLinTol As Double = 0
         If StringToLen(value, dApproxLinTol) Then
            EgtMdbSetGeneralParam(MCH_GP.APPROXLINTOL, dApproxLinTol)
            EgtMdbSave()
            m_sApproxLinTol = value
         End If
      End Set
   End Property
   Private m_SplitArcsList As New List(Of MCH_SA)({MCH_SA.NEVER, MCH_SA.GEN_PLANE, MCH_SA.NO_XY_PLANE, MCH_SA.ALWAYS})
   Public ReadOnly Property SplitArcsList As List(Of MCH_SA)
      Get
@@ -106,6 +121,11 @@ Public Class MachOptionVM
         Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9)
      End Get
   End Property
   Public ReadOnly Property ApproxLinTolMsg As String
      Get
         Return EgtMsg(6410)         ' Tolleranza di approssimazione
      End Get
   End Property
   Public ReadOnly Property SplitArcsMsg As String
      Get
@@ -141,6 +161,10 @@ Public Class MachOptionVM
      Dim nVal As Integer = 0
      EgtMdbGetGeneralParam(MCH_GP.SPLITARCS, nVal)
      m_SelectedSplitArcs = DirectCast(nVal, MCH_SA)
      ' Leggo tolleranza lineare di approssimazione
      dVal = 0
      EgtMdbGetGeneralParam(MCH_GP.APPROXLINTOL, dVal)
      m_sApproxLinTol = LenToString(dVal, 4)
      ' Riempio lista attrezzaggi salvati
      m_ArchivedSetUpList.Add(String.Empty)
      If Directory.Exists(IniFile.m_sCurrMachSetUpDirPath) Then
@@ -1,6 +1,8 @@
-<UserControl x:Class="MachinePanelV"
+<EgtFloating:EgtFloatingPanel x:Class="MachinePanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                              Visibility="{Binding MachinePanel_Visibility}">
   <StackPanel Orientation="Horizontal">
      <!--Combobox per selezionare la macchina corrente-->
@@ -32,4 +34,4 @@
      </Button>
    </StackPanel>
-</UserControl>
+</EgtFloating:EgtFloatingPanel>
@@ -82,6 +82,17 @@ Public Class MyMachinePanelVM
      End Set
   End Property
   Private m_MachinePanel_Visibility As Visibility
   Public ReadOnly Property MachinePanel_Visibility As Visibility
      Get
         Return m_MachinePanel_Visibility
      End Get
   End Property
   Friend Sub SetMachinePanelVisibility(bValue As Boolean)
      m_MachinePanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
      NotifyPropertyChanged(NameOf(MachinePanel_Visibility))
   End Sub
 #Region "Messages"
   Public ReadOnly Property ToolDBMsg As String
@@ -283,6 +294,7 @@ Public Class MyMachinePanelVM
         MachDbWindowV.Width = 1024
         MachDbWindowV.Owner = Application.Current.MainWindow
         MachDbWindowV.ShowDialog()
         If Not IsNothing(Map.refMachiningTreeExpanderVM) Then Map.refMachiningTreeExpanderVM.UpdateOperationMachiningList()
      End If
   End Sub
@@ -4,7 +4,7 @@
   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
   xmlns:local="clr-namespace:EgtCAM5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+   Title="{Binding Title}" Icon="{Binding IconSource}"
   TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
   BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
   MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
@@ -4,6 +4,7 @@ Imports System.Windows.Threading
 Imports System.Runtime.InteropServices
 Imports System.Math
 Imports EgtUILib
 Imports EgtWPFLib5
 Public Class MainWindowVM
   Inherits ViewModelBase
@@ -14,13 +15,16 @@ Public Class MainWindowVM
   Private m_objMutex As Mutex
   Private m_sDataRoot As String = String.Empty
   Private m_sConfigDir As String = String.Empty
-   Private m_nDebug As Integer = 0
+   Private m_OnTerminateProcessCallback As New OnTerminateProcessCallback(AddressOf OnTerminateProcess)
   ' EGALTECH ENVIRONMENT FIELDS WITH PROPERTY
-   ' GRAPHICAL FIELDS
+   Private m_nDebug As Integer = 0
-   ' Event commands
+   Public ReadOnly Property DebugLevel As Integer
-   ' MainWindow ContentRendered Event
+      Get
         Return m_nDebug
      End Get
   End Property
   Private m_sVersion As String = "1.1a1"
   Public ReadOnly Property Version As String
@@ -65,7 +69,6 @@ Public Class MainWindowVM
   End Property
   ' GRAPHICAL FIELDS WITH PROPERTY
   Private m_StatusBar As StatusBarV
   Private m_bfirst As Boolean = True
   Public ReadOnly Property StatusBar As StatusBarV
@@ -92,6 +95,16 @@ Public Class MainWindowVM
      End Get
   End Property
   Public ReadOnly Property IconSource As String
      Get
         #If PLATFORM = "x64" Then
            Return "/Resources/EgtCAM5_64.ico"
         #else
            Return "/Resources/EgtCAM5.ico"
         #End If
      End Get
   End Property
 #End Region
 #Region "CONSTRUCTOR"
@@ -190,6 +203,19 @@ Public Class MainWindowVM
      End If
   End Sub
   Private Function OnTerminateProcess( nExitCode As Integer) As Boolean
      ' Aggiorno istanze usate
      m_objMutex.WaitOne(1000)
      Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
      nTmp -= (1 << (IniFile.m_nInstance - 1))
      WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
      m_objMutex.ReleaseMutex()
      ' Rilascio mutex
      If Not IsNothing(m_objMutex) Then m_objMutex.Close()
      ' Dichiaro di procedere con la terminazione del programma
      Return True
   End Function
 #End Region ' CloseApplicationCommand
 #Region "cmdMainWindow_ContentRendered"
@@ -331,10 +357,7 @@ Public Class MainWindowVM
      ' Impostazione direttorio toolmakers
      Dim sToolMakersDir As String = String.Empty
      GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR, "", sToolMakersDir)
-      #If PLATFORM = "x64" Then
+      If Not String.IsNullOrWhiteSpace(sToolMakersDir) Then
         GetPrivateProfileString(S_MACH, K_TOOLMAKERSDIR64, sToolMakersDir, sToolMakersDir)
      #End If
      If Not String.IsNullOrWhiteSpace( sToolMakersDir) Then
         IniFile.m_sToolMakersDir = sToolMakersDir
      Else
         IniFile.m_sToolMakersDir = m_sDataRoot & "\" & TOOLMAKER_DFL_DIR
@@ -345,17 +368,29 @@ Public Class MainWindowVM
      EgtSetLockType(KEY_TYPE.HW)
      ' Leggo e imposto chiave di protezione ed eventuale chiave nesting
      Dim sLicFileName As String = ""
-      GetPrivateProfileString( S_GENERAL, K_LICENCE, LIC_FILE_NAME, sLicFileName)
+      GetPrivateProfileString(S_GENERAL, K_LICENCE, LIC_FILE_NAME, sLicFileName)
      Dim sLicFile As String = m_sConfigDir & "\" & sLicFileName
      Dim sKey As String = ""
-      EgtUILib.GetPrivateProfileString( S_LICENCE, K_KEY, "", sKey, sLicFile)
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
-      EgtSetKey( sKey)
+      EgtSetKey(sKey)
      Dim sNestKey As String = ""
-      EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
-      EgtSetNestKey( sNestKey)
+      EgtSetNestKey(sNestKey)
      ' Impostazioni per chiave di rete
      Dim bNetKey As Boolean = (GetPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
      EgtSetNetHwKey(bNetKey)
      Dim sLockId As String = ""
      EgtUILib.GetPrivateProfileString(S_LICENCE, K_LOCKID, "", sLockId, sLicFile)
      If Not String.IsNullOrEmpty(sLockId) Then
         EgtSetLockId(sLockId)
      End If
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2310, 1, IniFile.m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2605, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2310, 1, IniFile.m_nKeyOptions)
+                            EgtGetKeyOptions(3279, 2605, 1, IniFile.m_nKeyOptions)
      ' Leggo e imposto livello utilizzatore
      IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
      ' Imposto abilitazione lavorazioni avanzate
      MachineUtility.EnableAdvMachinings = IniFile.IsKeyEnabledAdvancedMachining()
      ' Inizializzazione generale di EgtInterface
      m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
      m_sVersion = My.Application.Info.Version.Major.ToString() & "." &
@@ -363,9 +398,13 @@ Public Class MainWindowVM
                   (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
                   My.Application.Info.Version.Revision.ToString()
      IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString())
-      Dim sLogMsg As String = "User " & Environment.MachineName & "\" & Environment.UserName & " (" & IniFile.m_nInstance.ToString() & ")" & vbLf &
+      Dim sLogMsg As String = "User " & Environment.MachineName & "\" & Environment.UserName &
                              "  Inst" & IniFile.m_nInstance.ToString() &
                              " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" & DebugLevel().ToString() & vbLf &
                              My.Application.Info.Title.ToString() & " ver. " & m_sVersion
      EgtInit(m_nDebug, IniFile.m_sLogFile, sLogMsg)
      EgtSetOnTerminateProcess( m_OnTerminateProcessCallback)
      EgtSetUserLevel( IniFile.m_nUserLevel)
      ' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
      Dim sMsgDir As String = String.Empty
      If GetPrivateProfileString(S_GENERAL, K_MESSAGESDIR, "", sMsgDir) = 0 Then
@@ -378,32 +417,31 @@ Public Class MainWindowVM
      If Not EgtLoadMessages(sMsgFilePath) Then
         EgtOutLog("Error in EgtLoadMessages")
      End If
-      ' Leggo e imposto livello utilizzatore
+      ' Imposto dir font Nfe e font default
      IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
      ' imposto dir font Nfe e font default
      Dim sNfeDir As String = String.Empty
      GetPrivateProfileString(S_GEOMDB, K_NFEFONTDIR, "", sNfeDir)
      GetPrivateProfileString(S_GEOMDB, K_DEFAULTFONT, "", OptionModule.m_sFontText)
      EgtSetFont(sNfeDir, OptionModule.m_sFontText)
-      ' imposto direttorio ausiliario per import/gestione BTL
+      ' Imposto direttorio ausiliario per import/gestione BTL
      Dim sBtlAuxDir As String = String.Empty
      GetPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
      EgtSetBtlAuxDir(sBtlAuxDir)
-      ' imposto dir di default per libreria Lua e lancio libreria di base
+      ' Imposto direttorio libreria per export ThreeJs
      Dim sThreeJSLibDir As String = String.Empty
      GetPrivateProfileString(S_EXPORT, K_THREEJSLIBDIR, "", sThreeJSLibDir)
      EgtSetThreeJSLibDir(sThreeJSLibDir)
      ' Imposto dir di default per libreria Lua e lancio libreria di base
      Dim sLuaLibsDir As String = String.Empty
      GetPrivateProfileString(S_LUA, K_LIBSDIR, "", sLuaLibsDir)
      #If PLATFORM = "x64" Then
         GetPrivateProfileString(S_LUA, K_LIBSDIR64, sLuaLibsDir, sLuaLibsDir)
      #End If
      EgtSetLuaLibs(sLuaLibsDir)
      Dim sLuaBaseLib As String = String.Empty
      GetPrivateProfileString(S_LUA, K_BASELIB, "EgtBase", sLuaBaseLib)
      EgtLuaRequire(sLuaBaseLib)
-      ' imposto direttorio temporaneo a EgtInterface
+      ' Imposto direttorio temporaneo a EgtInterface
      EgtSetTempDir(m_sTempDir)
-      ' imposto IniFile a EgtInterface
+      ' Imposto IniFile a EgtInterface
      EgtSetIniFile(m_sIniFile)
-      ' verifico se avviare programma in modalità CAD-ONLY
+      ' Verifico se avviare programma in modalità CAD-ONLY
      IniFile.m_ProjectMode = If(GetPrivateProfileInt(S_GENERAL, K_ONLYDRAW, 0) = 0, ProjectModeOpt.DRAW, ProjectModeOpt.ONLYDRAW)
      ' Impostazioni MruLists
      m_MruFiles.Init(S_MRUFILES, 8)
@@ -448,7 +486,7 @@ Public Class MainWindowVM
            Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
            IniFile.m_nInstance = 1
            Dim nMask As Integer = 1
-            While (nTmp And nMask) <> 0 And IniFile.m_nInstance < MAX_INST
+            While (nTmp And nMask) <> 0 And IniFile.m_nInstance <= MAX_INST
               IniFile.m_nInstance += 1
               nMask *= 2
            End While
@@ -536,7 +574,7 @@ Public Class MainWindowVM
         WritePrivateProfileString(S_GRID, K_SNAPSTEPINCH, DoubleToString(IniFile.dSnapStepInch, 4))
      End If
      ' gestisco la chiusura di DrawPanelVM
-      If Not IniFile.m_bFailedRun Then
+      If Not IniFile.m_bFailedRun AndAlso Not IsNothing(Map.refDrawPanelVM) Then
         WritePrivateProfileString(S_GENERAL, K_DRAW2D, If(Map.refDrawPanelVM.Draw2DIsExpanded, "1", "0"))
         WritePrivateProfileString(S_GENERAL, K_DRAW3D, If(Map.refDrawPanelVM.Draw3DIsExpanded, "1", "0"))
         WritePrivateProfileString(S_GENERAL, K_MODIFY, If(Map.refDrawPanelVM.ModifyIsExpanded, "1", "0"))
@@ -548,7 +586,7 @@ Public Class MainWindowVM
 #Region "Events"
-   Private Sub MainWindow_KeyDown(ByVal sender As System.Object, ByVal e As KeyEventArgs)
+   Private Sub MainWindow_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs)
      ' Con ESC esco dall'azione corrente
      If e.Key = Key.Escape Then
         ' reset Azione corrente
@@ -574,4 +612,53 @@ Public Class MainWindowVM
 #End Region
 #Region "MEF Plugin"
   Private m_Loader As MEFLoader = New MEFLoader()
   Private Function GetPathByName(ByVal name As String) As String
      Dim PluginNameSplit() As String = name.Split("."c)
      Dim res = Map.refMainWindowVM.m_sDataRoot & "\Plugin\" & PluginNameSplit(0)
      Return res
   End Function
   Friend Function GetControlByName(Of T)(Element As PluginControl) As Panel
      Dim PlugInControl As Object = m_Loader.LoadByTag(Of T)(GetPathByName(Element.Name), Element.Name).FirstOrDefault()
      Dim PluginPanel As Panel = Nothing
      Select Case PlugInControl.GetType().BaseType.FullName
         Case GetType(Panel).FullName, GetType(Grid).FullName
            PluginPanel = TryCast(PlugInControl, Panel)
         Case GetType(Forms.UserControl).FullName
            Dim PluginUserControl As Forms.UserControl = TryCast(PlugInControl, Forms.UserControl)
            Dim PluginControlInterface As IPluginControl = TryCast(PlugInControl, IPluginControl)
            If Not IsNothing(PluginControlInterface) Then
               AddHandler PluginControlInterface.UpdateProjectName, AddressOf UpdateProjectName
               AddHandler PluginControlInterface.UpdateUI, AddressOf UpdateUI
            End If
            PluginPanel = New WinFormPluginControlV(New WinFormPluginControlVM(PluginUserControl, Element.ViewPanelState))
      End Select
      Return PluginPanel
   End Function
   Friend Function GetConfigData(Of T)(ByVal name As String) As IPluginConfigData
      Dim PlugInControl As Object = m_Loader.LoadByTag(Of T)(GetPathByName(name), name).FirstOrDefault()
      Dim PluginConfigData As IPluginConfigData = Nothing
      Dim v = PlugInControl.GetType()
      If PlugInControl.GetType().Name = PLUGIN_CONFIGURATION_DATA Then
         Return TryCast(PlugInControl, IPluginConfigData)
      Else
         Return Nothing
      End If
   End Function
   Private Sub UpdateProjectName(ProjectName As String)
      Map.refMainWindowVM.Title = ProjectName & " - EgtCAM5"
   End Sub
   Private Sub UpdateUI()
      Map.refProjectVM.UpdateProjectUI(True)
   End Sub
 #End Region    ' MEF Plugin
 End Class
@@ -28,9 +28,9 @@ Imports System.Windows
 <Assembly: AssemblyDescription("EgtCAM5 32 bit")> 
 #End If
 #End If
-<Assembly: AssemblyCompany("EgalTech s.r.l.")> 
+<Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("EgtCAM5")>
-<Assembly: AssemblyCopyright("Copyright ©  2016-2021 by EgalTech s.r.l.")> 
+<Assembly: AssemblyCopyright("Copyright ©  2016-2024 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
-<Assembly: AssemblyVersion("2.3.10.6")>
+<Assembly: AssemblyVersion("2.6.5.1")>
-<Assembly: AssemblyFileVersion("2.3.10.6")>
+<Assembly: AssemblyFileVersion("2.6.5.1")>
@@ -69,6 +69,7 @@ Public Class LayerTreeViewItem
         Return m_bOnOff
      End Get
      Set(value As Boolean)
         If Map.refProjectVM.GetController().GetStep() <> 0 Then Return
         If m_bOnOff <> value Then
            m_bOnOff = value
            ' se abilitato, eseguo operazione
@@ -82,20 +83,24 @@ Public Class LayerTreeViewItem
            End If
            Dim bOnOffGroup As Boolean = ((Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift) AndAlso Items.Count > 0
            If bOnOffGroup Then
               EgtEnableCommandLogger()
               ' abilito/disabilito tutti i nodi del livello sotto di esso (e non oltre)
               For Each Node In Items
                  Node.m_bOnOff = value
                  ' se abilitato, eseguo operazione
                  If m_SendCmd Then
-                     Map.refProjectVM.SetLastInteger(Node.Id)
+                     Dim nStat As Integer
-                     If value Then
+                     EgtGetStatus(Node.Id, nStat)
-                        Map.refProjectVM.ExecuteCommand(Controller.CMD.SHOW)
+                     If value AndAlso nStat <> GDB_ST.ON_ Then
-                     Else
+                        EgtSetStatus(Node.Id, GDB_ST.ON_)
-                        Map.refProjectVM.ExecuteCommand(Controller.CMD.HIDE)
+                     ElseIf Not value AndAlso nStat <> GDB_ST.OFF Then
                        EgtSetStatus(Node.Id, GDB_ST.OFF)
                     End If
                  End If
                  Node.NotifyPropertyChanged(NameOf(OnOff))
               Next
               EgtDisableCommandLogger()
               EgtDraw()
            End If
         End If
      End Set
@@ -107,24 +107,6 @@ Public Class EstimationsExpanderVM
      Return True
   End Function
   Private Function UpdateAllMachinings() As Boolean
      ' Eseguo ricalcolo
      Dim bModified As Boolean = EgtGetModified()
      Dim sErr As String = String.Empty
      Dim bOk As Boolean = EgtApplyAllMachinings(False, False, sErr)
      ' In caso di errori, li segnalo
      If Not bOk Then
         If Not String.IsNullOrEmpty(sErr) Then
            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
         Else
            MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
         End If
      End If
      If Not bModified Then EgtResetModified()
      Return bOk
   End Function
   Public Overrides Function GetEstimationFileName(bAskSave As Boolean, ByRef sEstFile As String, ByRef sInfo As String) As Boolean
      Dim bOk As Boolean = True
      ' Recupero e verifico la path del progetto corrente
@@ -177,7 +159,7 @@ Public Class EstimationsExpanderVM
      ' Recupero la fase corrente
      Dim nPhase As Integer = EgtGetCurrPhase()
      ' Aggiorno le lavorazioni
-      If Not UpdateAllMachinings() Then
+      If Not Map.refSimulationExpanderVM.UpdateAllMachinings() Then
         EgtSetCurrPhase(If(nPhase = 0, 1, nPhase), True)
         Return False
      End If
@@ -15,8 +15,6 @@
      <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}"/>-->
            <!--ContentPresenter that contains the RawPart options -->
            <ContentPresenter Name="RawPartOptions" Content="{Binding RawPartOptions ,Mode=OneWay}"/>
         </StackPanel>
      </Expander>
@@ -59,7 +59,7 @@ Public Class DispositionParameterExpanderVM
               PartIsExpanded = False
               FixtureIsExpanded = False
               ' verifico se è attiva l'opzione muovi con ventose
-               If m_MoveWithFixture Then
+               If Map.refRawPartOptionVM.MoveWithFixture() Then
                  ' Abilito la selezione dei RawPart con ventose
                  Map.refProjectVM.SceneSelType = SceneSelTypeOpt.RAWPARTWITHFIXTURE
               Else
@@ -168,42 +168,6 @@ Public Class DispositionParameterExpanderVM
      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
               Map.refProjectVM.SceneSelType = SceneSelTypeOpt.RAWPARTWITHFIXTURE
               ' Seleziono le ventose associate ad uno dei grezzi selezionati
               ' ciclo sui grezzi selezionati
               Dim nSelRawPartId As Integer = EgtGetFirstSelectedObj()
               While nSelRawPartId <> GDB_ID.NULL
                  ' seleziono i sottopezzi del grezzo
                  DispositionUtility.SelectRawPartFixture(nSelRawPartId)
                  nSelRawPartId = EgtGetNextSelectedObj()
               End While
            Else
               ' Abilito la selezione di RawPart
               Map.refProjectVM.SceneSelType = SceneSelTypeOpt.RAWPART
               ' ciclo sui grezzi selezionati
               Dim nSelRawPartId As Integer = EgtGetFirstSelectedObj()
               While nSelRawPartId <> GDB_ID.NULL
                  ' deseleziono i sottopezzi del grezzo
                  DispositionUtility.DeselectRawPartFixture(nSelRawPartId)
                  nSelRawPartId = EgtGetNextSelectedObj()
               End While
            End If
            EgtDraw()
            m_MoveWithFixture = value
            OnPropertyChanged("MoveWithFixture")
         End If
      End Set
   End Property
   Private m_InputValue As String
   Public Property InputValue As String
      Get
@@ -315,8 +279,7 @@ Public Class DispositionParameterExpanderVM
            ' Abilito la selezione delle Fixture
            Map.refProjectVM.SceneSelType = SceneSelTypeOpt.FIXTURE
      End Select
-      m_MoveWithFixture = False
+      Map.refRawPartOptionVM.SetMoveWithFixture(False)
      OnPropertyChanged("MoveWithFixture")
      Map.refFixtureParametersVM.UpdateFixtureTypeList()
   End Sub
@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.ComponentModel
 Imports EgtUILib
 Public Class RawPartOptionVM
   Inherits ViewModelBase
@@ -38,6 +39,11 @@ Public Class RawPartOptionVM
         End If
      End Set
   End Property
   friend Sub SetMoveWithFixture(value As Boolean)
      m_MoveWithFixture=value
      OnPropertyChanged(NameOf(MoveWithFixture))
   End Sub
   Private m_bRawPartParamVisibility As Visibility
   Public ReadOnly Property RawPartParamVisibility As Visibility
@@ -86,6 +92,7 @@ Public Class RawPartOptionVM
   Private m_cmdRemoveRawPart As ICommand
   Sub New()
      Map.SetRefRawPartOptionVM(Me) 
      If EgtGetFirstSelectedObj() <> GDB_ID.NULL Then
         m_bRawPartParamVisibility = Visibility.Visible
      Else
@@ -1,384 +1,432 @@
 <UserControl x:Class="BeamMillingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-    <UserControl.Resources>
+   <UserControl.Resources>
-        <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
-        <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-        <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
-        <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-        <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
-        <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
-        <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
-        <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
-        <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
-        <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
-        <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
-        <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
-        <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
-        <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
-        <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
-        <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
-        <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
-        <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
-        <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
-        <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
-        <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
-        <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
-        <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
-        <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
-        <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
-        <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
-        <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
-        <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
-        <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
-        <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
-        <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
-        <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
-        <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
-        <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
-        <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
-        <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
-        <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
-        <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
-        <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
-        <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
-        <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
-        <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
-        <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
-        <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
-        <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
-        <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
-        <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
-        <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
-        <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
-        <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
-        <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
-        <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
-        <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
-        <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
-        <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
-        <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
-        <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
-        <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
-    </UserControl.Resources>
+   </UserControl.Resources>
-    <StackPanel Name="OperationParametersStackPanel">
+   <StackPanel Name="OperationParametersStackPanel">
-        <StackPanel Name="OperationFirstParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
            </UniformGrid>
            <EgtWPFLib5:CheckParamV 
                                     ParamTxBl="{Binding InvertTxBl}" 
                                     ParamChBx="{Binding Path=Invert,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                                     Style="{DynamicResource CheckParamV_Margin}"/>
            <EgtWPFLib5:ComboParamV 
                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                   UpdateSourceTrigger=PropertyChanged,
                                   ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
            <UniformGrid Columns="2">
                <TextBlock Text="{Binding UserNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
                    <EgtWPFLib5:EgtTextBox.ToolTip>
                        <TextBlock Text="{Binding UserNotesTooltip}"/>
                    </EgtWPFLib5:EgtTextBox.ToolTip>
                </EgtWPFLib5:EgtTextBox>
                <TextBlock Text="{Binding SystemNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
                           Visibility="{Binding SysNotes_Visibility}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
-        </StackPanel>
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+                                 ParamChBx="{Binding Path=Invert,
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+                                                     UpdateSourceTrigger=PropertyChanged,
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                                                     ValidatesOnDataErrors=True}" 
-                <StackPanel>
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                 ParamCmBxList="{Binding Path=WorkSideList,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
-                                ValidatesOnDataErrors=True}" 
+                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+         <UniformGrid Columns="2">
-                               ParamTxBl="{Binding OverLapTxBl}" 
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                               ParamTxBx="{Binding Path=OverLap,
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                ValidatesOnDataErrors=True}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                    <EgtWPFLib5:ComboParamV 
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                                  ParamCmBxList="{Binding Path=StepTypeList,
+            </EgtWPFLib5:EgtTextBox>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                                   ValidatesOnDataErrors=True}"
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                    <EgtWPFLib5:StringParamV 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                   Visibility="{Binding SysNotes_Visibility}"
-                               ParamTxBx="{Binding Path=StepPar,
+                                   IsReadOnly="True"/>
-                                UpdateSourceTrigger=PropertyChanged,
+         </UniformGrid>
-                                ValidatesOnDataErrors=True}" 
+      </StackPanel>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-                    <EgtWPFLib5:StringParamV 
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                               ParamTxBx="{Binding Path=OffSr,
+            <StackPanel>
-                                UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=OffSl,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OverLapTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=OverLap,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                </StackPanel>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </Expander>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
                                       ParamCmBxList="{Binding Path=StepTypeList,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
                                        ParamTxBx="{Binding Path=StepPar,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
                                        ParamTxBx="{Binding Path=OffSr,
                                         UpdateSourceTrigger=PropertyChanged,
                                         ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
                                        ParamTxBx="{Binding Path=OffSl,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <UniformGrid Columns="2">
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                                     ParamChBx="{Binding Path=InvertToolDir,
+                             Margin="2.5"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                      ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:ComboParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                                  ParamTxBl="{Binding FaceUseTypeTxBl}" 
+                          Grid.Column="1"
-                                  ParamCmBxList="{Binding Path=FaceUseTypeList,
+                          HorizontalAlignment="Right"
-                                   UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                   ValidatesOnDataErrors=True}"
+                          Width="20">
-                                  ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                  </Button>
-                    <EgtWPFLib5:StringParamV 
+               </UniformGrid>
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+            </Expander.Header>
-                               ParamTxBx="{Binding Path=InitAngs,
+            <Grid>
-                                UpdateSourceTrigger=PropertyChanged,
+               <Grid.RowDefinitions>
-                                ValidatesOnDataErrors=True}" 
+                  <RowDefinition Height="1*"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                  <RowDefinition Height="Auto"/>
-                    <EgtWPFLib5:StringParamV 
+               </Grid.RowDefinitions>
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+               <StackPanel>
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                          ParamChBx="{Binding Path=InvertToolDir,
-                                ValidatesOnDataErrors=True}" 
+                                                              UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                              ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:ComboParamV 
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding FaceUseTypeTxBl}" 
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+                                          ParamCmBxList="{Binding Path=FaceUseTypeList,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                                  UpdateSourceTrigger=PropertyChanged,
-                                   ValidatesOnDataErrors=True,
+                                                                  ValidatesOnDataErrors=True}"
-                                   Mode=OneWay}"
+                                          ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                                          Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                </StackPanel>
+                                           ParamTxBx="{Binding Path=InitAngs,
-            </Expander>
+                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=StartAddLen,
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=StartAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LiTang,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LiTangTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LiTang,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=LiPerp,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=LiPerp,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=LiElev,
-                                      ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBl="{Binding LiElevTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiCompLenTxBl}" 
-                                     ParamTxBx="{Binding Path=LiElev,
+                                        ParamTxBx="{Binding Path=LiCompLen,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                                     ParamTxBl="{Binding LiCompLenTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=LiCompLen,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=EndAddLen,
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=EndAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LoTang,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LoTangTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LoTang,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=LoPerp,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=LoPerp,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoElevTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=LoElev,
-                                      ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBl="{Binding LoElevTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoCompLenTxBl}" 
-                                     ParamTxBx="{Binding Path=LoElev,
+                                        ParamTxBx="{Binding Path=LoCompLen,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                                     ParamTxBl="{Binding LoCompLenTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=LoCompLen,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}" 
-                                     ParamTxBl="{Binding LeaveTabTxBl}" 
+                                       ParamChBx="{Binding Path=LeaveTab,
-                                     ParamChBx="{Binding Path=LeaveTab,
+                                                           UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                           ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                       Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel Margin="2">
-                <StackPanel Margin="2">
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=TabLen,
-                                     ParamTxBl="{Binding TabLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=TabLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
-                                      ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                        ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabHeightTxBl}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TabHeight,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding TabHeightTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=TabHeight,
+                                        ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabAngleTxBl}" 
-                        ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
+                                        ParamTxBx="{Binding Path=TabAngle,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding TabAngleTxBl}" 
+                                        ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
-                                     ParamTxBx="{Binding Path=TabAngle,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabDistTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=TabDist,
-                        ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}"
-                    <EgtWPFLib5:StringParamV 
+                                        ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
-                                     ParamTxBl="{Binding TabDistTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=TabDist,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMinTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=TabMin,
-                                      ValidatesOnDataErrors=True}"
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
+                                                            ValidatesOnDataErrors=True}"
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBl="{Binding TabMinTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMaxTxBl}" 
-                                     ParamTxBx="{Binding Path=TabMin,
+                                        ParamTxBx="{Binding Path=TabMax,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}"
+                                                            ValidatesOnDataErrors=True}"
-                        ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
+                                        ParamErrorMsg="{Binding Path=TabMaxErrorMsg}"
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                                     ParamTxBl="{Binding TabMaxTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=TabMax,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}"
                        ParamErrorMsg="{Binding Path=TabMaxErrorMsg}"
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+
-                           ValidatesOnDataErrors=True}" 
+         <Interactivity:Interaction.Behaviors>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+            <EgtCAM5:AutomaticCloseExpander/>
-                </StackPanel>
+         </Interactivity:Interaction.Behaviors>
-            </Expander>
+      </StackPanel>
-            <Interactivity:Interaction.Behaviors>
+   </StackPanel>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class BeamMillingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class BeamMillingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class BeamMillingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class BeamMillingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="ChiselingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,165 +75,232 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-            <EgtWPFLib5:ComboParamV 
+                                 ParamCmBxList="{Binding Path=WorkSideList,
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxList="{Binding Path=WorkSideList,
+                                                         ValidatesOnDataErrors=True}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                                   ValidatesOnDataErrors=True}"
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
+         <UniformGrid Columns="2">
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-            <UniformGrid Columns="2">
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+            </EgtWPFLib5:EgtTextBox>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                </EgtWPFLib5:EgtTextBox>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                           Visibility="{Binding SysNotes_Visibility}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   IsReadOnly="True"/>
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ReturnPosTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=ReturnPos,
-                               ParamTxBl="{Binding ReturnPosTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=ReturnPos,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=StepPar,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBx="{Binding Path=StepPar,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=OffSr,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=OffSr,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=OffSl,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+            </StackPanel>
-                               ParamTxBx="{Binding Path=OffSl,
+         </Expander>
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <UniformGrid Columns="2">
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                                     ParamChBx="{Binding Path=InvertToolDir,
+                             Margin="2.5"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                      ValidatesOnDataErrors=True}" 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                    <EgtWPFLib5:StringParamV 
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=InitAngs,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:StringParamV 
+                  </Button>
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+               </UniformGrid>
-                               ParamTxBx="{Binding Path=BlockedAxis,
+            </Expander.Header>
-                                UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                ValidatesOnDataErrors=True}" 
+               <Grid.RowDefinitions>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                  <RowDefinition Height="1*"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <RowDefinition Height="Auto"/>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </Grid.RowDefinitions>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+               <StackPanel>
-                                   UpdateSourceTrigger=PropertyChanged,
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                   ValidatesOnDataErrors=True,
+                                          ParamChBx="{Binding Path=InvertToolDir,
-                                   Mode=OneWay}"
+                                                              UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                                                              ValidatesOnDataErrors=True}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
-                </StackPanel>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-            </Expander>
+                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Header="{Binding LeadOutTypeMsg}" Name="LeadOutType"
+         <Expander Header="{Binding LeadOutTypeMsg}" Name="LeadOutType"
-                Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
+                                        ParamTxBx="{Binding Path=EndAddLen,
-                               ParamTxBx="{Binding Path=EndAddLen,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                         UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                         ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class ChiselingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class ChiselingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class ChiselingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class ChiselingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="GenMachiningParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,142 +75,212 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <UniformGrid Columns="2">
-            <UniformGrid Columns="2">
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+            </EgtWPFLib5:EgtTextBox>
-                </EgtWPFLib5:EgtTextBox>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                           Visibility="{Binding SysNotes_Visibility}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       Visibility="{Binding SysNotes_Visibility}"
+                                   IsReadOnly="True"/>
                                       IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-                    <EgtWPFLib5:ComboParamV 
+                                       ParamCmBxList="{Binding Path=SubTypeList,
-                               ParamTxBl="{Binding SubTypeTxBl}" 
+                                                               UpdateSourceTrigger=PropertyChanged,
-                               ParamCmBxList="{Binding Path=SubTypeList,
+                                                               ValidatesOnDataErrors=True}"
-                                UpdateSourceTrigger=PropertyChanged,
+                                       ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
-                                ValidatesOnDataErrors=True}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                               ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               Style="{DynamicResource ComboParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=OffSr,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBx="{Binding Path=OffSr,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=OffSl,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=OffSl,
+            </StackPanel>
-                                UpdateSourceTrigger=PropertyChanged,
+         </Expander>
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InvertToolDirTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamChBx="{Binding Path=InvertToolDir,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               Style="{DynamicResource CheckParamV_Margin}"/>
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                    <EgtWPFLib5:StringParamV 
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=InitAngs,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:StringParamV 
+                  </Button>
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+               </UniformGrid>
-                               ParamTxBx="{Binding Path=BlockedAxis,
+            </Expander.Header>
-                                UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                ValidatesOnDataErrors=True}" 
+               <Grid.RowDefinitions>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                  <RowDefinition Height="1*"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <RowDefinition Height="Auto"/>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </Grid.RowDefinitions>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+               <StackPanel>
-                                   UpdateSourceTrigger=PropertyChanged,
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                   ValidatesOnDataErrors=True,
+                                          ParamChBx="{Binding Path=InvertToolDir,
-                                   Mode=OneWay}"
+                                                              UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                                                              ValidatesOnDataErrors=True}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
-                </StackPanel>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-            </Expander>
+                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamErrorMsg="{Binding Path=SpeedErrorMsg}"
-                               ParamErrorMsg="{Binding Path=SpeedErrorMsg}"
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class GenMachiningParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class GenMachiningParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class GenMachiningParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class GenMachiningParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -106,21 +106,21 @@ Public Class MachiningParameterExpanderVM
         EgtGetMachiningParam(MCH_MP.TYPE, nType)
         m_CurrOperation = New MachiningTreeViewItem(sName, DirectCast(nType, MCH_MY))
-         WoodDrillParamExpanderV.DataContext = Nothing
+         'WoodDrillParamExpanderV.DataContext = Nothing
-         WoodSawParamExpanderV.DataContext = Nothing
+         'WoodSawParamExpanderV.DataContext = Nothing
-         WoodMillParamExpanderV.DataContext = Nothing
+         'WoodMillParamExpanderV.DataContext = Nothing
-         BeamMillParamExpanderV.DataContext = Nothing
+         'BeamMillParamExpanderV.DataContext = Nothing
-         PocketParamExpanderV.DataContext = Nothing
+         'PocketParamExpanderV.DataContext = Nothing
-         MortiseParamExpanderV.DataContext = Nothing
+         'MortiseParamExpanderV.DataContext = Nothing
-         GenMachinParamExpanderV.DataContext = Nothing
+         'GenMachinParamExpanderV.DataContext = Nothing
-         ChiselParamExpanderV.DataContext = Nothing
+         'ChiselParamExpanderV.DataContext = Nothing
-         StoneSawParamExpanderV.DataContext = Nothing
+         'StoneSawParamExpanderV.DataContext = Nothing
-         StoneSawFinishParamExpanderV.DataContext = Nothing
+         'StoneSawFinishParamExpanderV.DataContext = Nothing
-         StoneSawRoughParamExpanderV.DataContext = Nothing
+         'StoneSawRoughParamExpanderV.DataContext = Nothing
-         StoneMillParamExpanderV.DataContext = Nothing
+         'StoneMillParamExpanderV.DataContext = Nothing
-         StoneDrillParamExpanderV.DataContext = Nothing
+         'StoneDrillParamExpanderV.DataContext = Nothing
-         SurfFinishParamExpanderV.DataContext = Nothing
+         'SurfFinishParamExpanderV.DataContext = Nothing
-         WjParamExpanderV.DataContext = Nothing
+         'WjParamExpanderV.DataContext = Nothing
         m_CurrOperation.ReadOperationParam()
@@ -136,53 +136,80 @@ Public Class MachiningParameterExpanderVM
         Select Case nType
            Case MCH_OY.DRILLING
               If MatType = MaterialType.STONE Then
                  If IsNothing(StoneDrillParamExpanderV) Then StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
                  StoneDrillParamExpanderV.DataContext = m_CurrOperation
                  Return StoneDrillParamExpanderV
               Else
                  If IsNothing(WoodDrillParamExpanderV) Then WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
                  WoodDrillParamExpanderV.DataContext = m_CurrOperation
                  Return WoodDrillParamExpanderV
               End If
            Case MCH_OY.SAWING
               If MatType = MaterialType.STONE Then
                  If IsNothing(StoneSawParamExpanderV) Then StoneSawParamExpanderV = New StoneSawingParameterExpanderV
                  StoneSawParamExpanderV.DataContext = m_CurrOperation
                  Return StoneSawParamExpanderV
               Else
                  If IsNothing(WoodSawParamExpanderV) Then WoodSawParamExpanderV = New WoodSawingParameterExpanderV
                  WoodSawParamExpanderV.DataContext = m_CurrOperation
                  Return WoodSawParamExpanderV
               End If
            Case MCH_OY.MILLING
               If MatType = MaterialType.BEAM Then
                  If IsNothing(BeamMillParamExpanderV) Then BeamMillParamExpanderV = New BeamMillingParameterExpanderV
                  BeamMillParamExpanderV.DataContext = m_CurrOperation
                  Return BeamMillParamExpanderV
               ElseIf MatType = MaterialType.STONE Then
                  If IsNothing(StoneMillParamExpanderV) Then StoneMillParamExpanderV = New StoneMillingParameterExpanderV
                  StoneMillParamExpanderV.DataContext = m_CurrOperation
                  Return StoneMillParamExpanderV
               Else
                  If IsNothing(WoodMillParamExpanderV) Then WoodMillParamExpanderV = New WoodMillingParameterExpanderV
                  WoodMillParamExpanderV.DataContext = m_CurrOperation
                  Return WoodMillParamExpanderV
               End If
            Case MCH_OY.SAWROUGHING
               If IsNothing(StoneSawRoughParamExpanderV) Then StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
               StoneSawRoughParamExpanderV.DataContext = m_CurrOperation
               Return StoneSawRoughParamExpanderV
            Case MCH_OY.SAWFINISHING
               If IsNothing(StoneSawFinishParamExpanderV) Then StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
               StoneSawFinishParamExpanderV.DataContext = m_CurrOperation
               Return StoneSawFinishParamExpanderV
            Case MCH_OY.POCKETING
               If MatType = MaterialType.STONE Or MatType = MaterialType.STONE5 Then
                  ' se macchina di tipo STONE ricavo il tipo di utensile
                  Dim sMachiningToolName = String.Empty
                  EgtMdbSetCurrMachining(sName)
                  EgtMdbGetCurrMachiningParam(MCH_MP.TOOL, sMachiningToolName)
                  EgtTdbSetCurrTool(sMachiningToolName)
                  Dim dValue As Double = 0
                  Dim nToolType As Integer
                  EgtTdbGetCurrToolParam(MCH_TP.TYPE, nToolType)
                  ' se utensile di tipo POLISHING rendo visibili i campi sugli epicicli
                  If nToolType = MCH_TY.MILL_POLISHING Then m_CurrOperation.Epicycles_Visibility = Visibility.Visible
               End If
               If IsNothing(PocketParamExpanderV) Then PocketParamExpanderV = New PocketingParameterExpanderV
               PocketParamExpanderV.DataContext = m_CurrOperation
               Return PocketParamExpanderV
            Case MCH_OY.MORTISING
               If IsNothing(MortiseParamExpanderV) Then MortiseParamExpanderV = New MortisingParameterExpanderV
               MortiseParamExpanderV.DataContext = m_CurrOperation
               Return MortiseParamExpanderV
            Case MCH_OY.GENMACHINING
               If IsNothing(GenMachinParamExpanderV) Then GenMachinParamExpanderV = New GenMachiningParameterExpanderV
               GenMachinParamExpanderV.DataContext = m_CurrOperation
               Return GenMachinParamExpanderV
            Case MCH_OY.CHISELING
               If IsNothing(ChiselParamExpanderV) Then ChiselParamExpanderV = New ChiselingParameterExpanderV
               ChiselParamExpanderV.DataContext = m_CurrOperation
               Return ChiselParamExpanderV
            Case MCH_OY.SURFFINISHING
               If IsNothing(SurfFinishParamExpanderV) Then SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
               SurfFinishParamExpanderV.DataContext = m_CurrOperation
               Return SurfFinishParamExpanderV
            Case MCH_OY.WATERJETTING
               If IsNothing(WjParamExpanderV) Then WjParamExpanderV = New WaterjettingParameterExpanderV
               WjParamExpanderV.DataContext = m_CurrOperation
               Return WjParamExpanderV
         End Select
@@ -231,21 +258,21 @@ Public Class MachiningParameterExpanderVM
   Sub New()
      EgtWPFLib5.MachiningDbWindowVM.m_sMachineIniPath = IniFile.m_sCurrMachIniFilePath
-      WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
+      'WoodDrillParamExpanderV = New WoodDrillingParameterExpanderV
-      WoodSawParamExpanderV = New WoodSawingParameterExpanderV
+      'WoodSawParamExpanderV = New WoodSawingParameterExpanderV
-      WoodMillParamExpanderV = New WoodMillingParameterExpanderV
+      'WoodMillParamExpanderV = New WoodMillingParameterExpanderV
-      BeamMillParamExpanderV = New BeamMillingParameterExpanderV
+      'BeamMillParamExpanderV = New BeamMillingParameterExpanderV
-      PocketParamExpanderV = New PocketingParameterExpanderV
+      'PocketParamExpanderV = New PocketingParameterExpanderV
-      MortiseParamExpanderV = New MortisingParameterExpanderV
+      'MortiseParamExpanderV = New MortisingParameterExpanderV
-      GenMachinParamExpanderV = New GenMachiningParameterExpanderV
+      'GenMachinParamExpanderV = New GenMachiningParameterExpanderV
-      ChiselParamExpanderV = New ChiselingParameterExpanderV
+      'ChiselParamExpanderV = New ChiselingParameterExpanderV
-      StoneSawParamExpanderV = New StoneSawingParameterExpanderV
+      'StoneSawParamExpanderV = New StoneSawingParameterExpanderV
-      StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
+      'StoneSawFinishParamExpanderV = New StoneSawFinishingParameterExpanderV
-      StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
+      'StoneSawRoughParamExpanderV = New StoneSawRoughingParameterExpanderV
-      StoneMillParamExpanderV = New StoneMillingParameterExpanderV
+      'StoneMillParamExpanderV = New StoneMillingParameterExpanderV
-      StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
+      'StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
-      SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
+      'SurfFinishParamExpanderV = New SurfFinishingParameterExpanderV
-      WjParamExpanderV = New WaterjettingParameterExpanderV
+      'WjParamExpanderV = New WaterjettingParameterExpanderV
      NotifyPropertyChanged("ParamExpanderPageV")
   End Sub
@@ -402,9 +429,10 @@ Public Class MachiningParameterExpanderVM
            Dim sInfo As String = String.Empty
            EgtGetOutstrokeInfo(sInfo)
            If Not String.IsNullOrEmpty(sInfo) Then sErr &= " " & sInfo
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation)
         Else
-            MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            ' Errore nel calcolo della lavorazione!
            MessageBox.Show(EgtMsg(5345), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error)
         End If
      Else
         If EgtGetMachMgrWarningId(0) <> 0 Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="MortisingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,185 +75,251 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+                       Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-            <EgtWPFLib5:ComboParamV 
+                                 ParamCmBxList="{Binding Path=WorkSideList,
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxList="{Binding Path=WorkSideList,
+                                                         ValidatesOnDataErrors=True}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                                   ValidatesOnDataErrors=True}"
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
+         <UniformGrid Columns="2">
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-            <UniformGrid Columns="2">
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+            </EgtWPFLib5:EgtTextBox>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                </EgtWPFLib5:EgtTextBox>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                           Visibility="{Binding SysNotes_Visibility}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   IsReadOnly="True"/>
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                    <EgtWPFLib5:ComboParamV 
+                                       ParamCmBxList="{Binding Path=StepTypeList,
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxList="{Binding Path=StepTypeList,
+                                                               ValidatesOnDataErrors=True}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                       ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
-                                   ValidatesOnDataErrors=True}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=StepPar,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBx="{Binding Path=StepPar,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=OffSr,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=OffSr,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=OffSl,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+            </StackPanel>
-                               ParamTxBx="{Binding Path=OffSl,
+         </Expander>
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <UniformGrid Columns="2">
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                                     ParamChBx="{Binding Path=InvertToolDir,
+                             Margin="2.5"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                      ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:ComboParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                                  ParamTxBl="{Binding FaceUseTypeTxBl}" 
+                          Grid.Column="1"
-                                  ParamCmBxList="{Binding Path=FaceUseTypeList,
+                          HorizontalAlignment="Right"
-                                   UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                   ValidatesOnDataErrors=True}"
+                          Width="20">
-                                  ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                  </Button>
-                    <EgtWPFLib5:StringParamV 
+               </UniformGrid>
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+            </Expander.Header>
-                               ParamTxBx="{Binding Path=InitAngs,
+            <Grid>
-                                UpdateSourceTrigger=PropertyChanged,
+               <Grid.RowDefinitions>
-                                ValidatesOnDataErrors=True}" 
+                  <RowDefinition Height="1*"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                  <RowDefinition Height="Auto"/>
-                    <EgtWPFLib5:StringParamV 
+               </Grid.RowDefinitions>
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+               <StackPanel>
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                          ParamChBx="{Binding Path=InvertToolDir,
-                                ValidatesOnDataErrors=True}" 
+                                                              UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                              ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:ComboParamV 
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding FaceUseTypeTxBl}" 
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+                                          ParamCmBxList="{Binding Path=FaceUseTypeList,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                                  UpdateSourceTrigger=PropertyChanged,
-                                   ValidatesOnDataErrors=True,
+                                                                  ValidatesOnDataErrors=True}"
-                                   Mode=OneWay}"
+                                          ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                                          Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                </StackPanel>
+                                           ParamTxBx="{Binding Path=InitAngs,
-            </Expander>
+                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Header="{Binding LeadInTypeMsg}" Name="LeadInTypeMsg"
+         <Expander Header="{Binding LeadInTypeMsg}" Name="LeadInTypeMsg"
-                Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
+                                        ParamTxBx="{Binding Path=StartAddLen,
-                               ParamTxBx="{Binding Path=StartAddLen,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
            </Expander>
-            <Expander Header="{Binding LeadOutTypeMsg}" Name="LeadOutType"
+         <Expander Header="{Binding LeadOutTypeMsg}" Name="LeadOutType"
-                Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
+                                        ParamTxBx="{Binding Path=EndAddLen,
-                               ParamTxBx="{Binding Path=EndAddLen,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class MortisingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class MortisingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class MortisingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class MortisingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,279 +1,354 @@
 <UserControl x:Class="PocketingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-    <UserControl.Resources>
+   <UserControl.Resources>
-        <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
-        <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-        <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
-        <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-        <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
-        <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
-        <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
-        <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
-        <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
-        <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
-        <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
-        <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
-        <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
-        <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
-        <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
-        <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
-        <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
-        <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
-        <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
-        <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
-        <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
-        <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
-        <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
-        <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
-        <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
-        <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
-        <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
-        <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
-        <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
-        <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
-        <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
-        <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
-        <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
-        <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
-        <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
-        <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
-        <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
-        <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
-        <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
-        <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
-        <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
-        <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
-        <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
-        <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
-        <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
-        <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
-        <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
-        <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
-        <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
-        <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
-        <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
-        <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
-        <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
-        <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
-        <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
-        <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
-        <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
-        <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
-    </UserControl.Resources>
+   </UserControl.Resources>
-    <StackPanel Name="OperationParametersStackPanel">
+   <StackPanel Name="OperationParametersStackPanel">
-        <StackPanel Name="OperationFirstParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <UniformGrid Columns="2">
-            <UniformGrid Columns="2">
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+            </EgtWPFLib5:EgtTextBox>
-                </EgtWPFLib5:EgtTextBox>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                           Visibility="{Binding SysNotes_Visibility}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       Visibility="{Binding SysNotes_Visibility}"
+                                   IsReadOnly="True"/>
-                                       IsReadOnly="True"/>
+         </UniformGrid>
-            </UniformGrid>
+      </StackPanel>
-        </StackPanel>
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                       ParamCmBxList="{Binding Path=SubTypeList,
-                    <EgtWPFLib5:ComboParamV 
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                  ParamTxBl="{Binding SubTypeTxBl}" 
+                                                               ValidatesOnDataErrors=True}"
-                                  ParamCmBxList="{Binding Path=SubTypeList,
+                                       ParamCmBxSelIndex="{Binding Path=SelectedSubType}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                   ValidatesOnDataErrors=True}"
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSubType}"
+                                        ParamTxBx="{Binding Path=StepPar,
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=StepPar,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=SideStep,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding SideStepTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBx="{Binding Path=SideStep,
+                                        ParamTxBx="{Binding Path=OffSl,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+                                        ParamTxBx="{Binding Path=OffSr,
-                               ParamTxBx="{Binding Path=OffSl,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EpicyclesRadTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=EpicyclesRad,
-                                 ParamTxBl="{Binding OffsetSrTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                 ParamTxBx="{Binding Path=OffSr,
+                                                            ValidatesOnDataErrors=True}" 
-                                 UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"
-                                 ValidatesOnDataErrors=True}" 
+                                        Visibility="{Binding Epicycles_Visibility}"/>
-                                 Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EpicyclesDistTxBl}" 
-                    <EgtWPFLib5:StringParamV
+                                        ParamTxBx="{Binding Path=EpicyclesDist,
-                                 ParamTxBl="{Binding SideAngleTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                 ParamTxBx="{Binding Path=SideAngle,
+                                                            ValidatesOnDataErrors=True}" 
-                                 UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"
-                                 ValidatesOnDataErrors=True}" 
+                                        Visibility="{Binding Epicycles_Visibility}"/>
-                                 Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                </StackPanel>
+                                        ParamTxBx="{Binding Path=SideAngle,
-            </Expander>
+                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <UniformGrid Columns="2">
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                                     ParamChBx="{Binding Path=InvertToolDir,
+                             Margin="2.5"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                      ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=InitAngs,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:StringParamV 
+                  </Button>
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+               </UniformGrid>
-                               ParamTxBx="{Binding Path=BlockedAxis,
+            </Expander.Header>
-                                UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                ValidatesOnDataErrors=True}" 
+               <Grid.RowDefinitions>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                  <RowDefinition Height="1*"/>
-                    <EgtWPFLib5:ComboParamV 
+                  <RowDefinition Height="Auto"/>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </Grid.RowDefinitions>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+               <StackPanel>
-                                   UpdateSourceTrigger=PropertyChanged,
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                   ValidatesOnDataErrors=True,
+                                          ParamChBx="{Binding Path=InvertToolDir,
-                                   Mode=OneWay}"
+                                                              UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                                                              ValidatesOnDataErrors=True}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
-                </StackPanel>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-            </Expander>
+                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=LiTang,
-                                     ParamTxBl="{Binding LiTangTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=LiTang,
+                                                            ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LiElev,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LiElevTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LiElev,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+            </StackPanel>
-                                      ValidatesOnDataErrors=True}" 
+         </Expander>
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=LoTang,
-                                     ParamTxBl="{Binding LoTangTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=LoTang,
+                                                            ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+            </StackPanel>
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+         </Expander>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+
-                           ValidatesOnDataErrors=True}" 
+         <Interactivity:Interaction.Behaviors>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+            <EgtCAM5:AutomaticCloseExpander/>
-                </StackPanel>
+         </Interactivity:Interaction.Behaviors>
-            </Expander>
+      </StackPanel>
-            <Interactivity:Interaction.Behaviors>
+   </StackPanel>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class PocketingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class PocketingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class PocketingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class PocketingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="StoneDrillingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -74,141 +74,211 @@
   </UserControl.Resources>
   <StackPanel Name="OperationParametersStackPanel">
-        <StackPanel Name="OperationFirstParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
            </UniformGrid>
            <UniformGrid Columns="2">
                <TextBlock Text="{Binding UserNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
                    <EgtWPFLib5:EgtTextBox.ToolTip>
                        <TextBlock Text="{Binding UserNotesTooltip}"/>
                    </EgtWPFLib5:EgtTextBox.ToolTip>
                </EgtWPFLib5:EgtTextBox>
                <TextBlock Text="{Binding SystemNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
                           Visibility="{Binding SysNotes_Visibility}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
-        </StackPanel>
+         <UniformGrid Columns="2">
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <StackPanel>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                               ParamTxBx="{Binding Path=StartPos,
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                                UpdateSourceTrigger=PropertyChanged,
+            </EgtWPFLib5:EgtTextBox>
-                                ValidatesOnDataErrors=True}" 
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                    <EgtWPFLib5:StringParamV 
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                               ParamTxBl="{Binding ReturnPosTxBl}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                               ParamTxBx="{Binding Path=ReturnPos,
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                UpdateSourceTrigger=PropertyChanged,
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                ValidatesOnDataErrors=True}" 
+                                   IsReadOnly="True"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         </UniformGrid>
-                    <EgtWPFLib5:StringParamV 
+      </StackPanel>
-                                     ParamTxBl="{Binding ThrouAddLenTxBl}" 
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-                                     ParamTxBx="{Binding Path=ThrouAddLen,
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-                                      UpdateSourceTrigger=PropertyChanged,
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                                      ValidatesOnDataErrors=True}" 
+            <StackPanel>
-                        Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=StartPos,
-                                     ParamTxBl="{Binding StepParTxBl}" 
+                                         UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=StepPar,
+                                         ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ReturnPosTxBl}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=ReturnPos,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding StartSlowLenTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=StartSlowLen,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ThrouAddLenTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=ThrouAddLen,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding EndSlowLenTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=EndSlowLen,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=StepPar,
-                                      ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                </StackPanel>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </Expander>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartSlowLenTxBl}" 
                                        ParamTxBx="{Binding Path=StartSlowLen,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndSlowLenTxBl}" 
                                        ParamTxBx="{Binding Path=EndSlowLen,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:StringParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamTxBx="{Binding Path=InitAngs,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:ComboParamV 
+                  </Button>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+            </Expander.Header>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                   ValidatesOnDataErrors=True,
+               <Grid.RowDefinitions>
-                                   Mode=OneWay}"
+                  <RowDefinition Height="1*"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                  <RowDefinition Height="Auto"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                </StackPanel>
+               <StackPanel>
-            </Expander>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class StoneDrillingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class StoneDrillingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneDrillingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class StoneDrillingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,218 +1,288 @@
 <UserControl x:Class="StoneMillingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-    <UserControl.Resources>
+   <UserControl.Resources>
-        <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
-        <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-        <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
-        <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-        <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
-        <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
-        <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
-        <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
-        <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
-        <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
-        <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
-        <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
-        <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
-        <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
-        <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
-        <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
-        <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
-        <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
-        <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
-        <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
-        <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
-        <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
-        <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
-        <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
-        <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
-        <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
-        <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
-        <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
-        <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
-        <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
-        <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
-        <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
-        <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
-        <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
-        <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
-        <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
-        <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
-        <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
-        <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
-        <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
-        <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
-        <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
-        <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
-        <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
-        <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
-        <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
-        <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
-        <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
-        <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
-        <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
-        <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
-        <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
-        <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
-        <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
-        <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
-        <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
-        <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
-        <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
-    </UserControl.Resources>
+   </UserControl.Resources>
-    <StackPanel Name="OperationParametersStackPanel">
+   <StackPanel Name="OperationParametersStackPanel">
-        <StackPanel Name="OperationFirstParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
            </UniformGrid>
            <EgtWPFLib5:CheckParamV 
                                     ParamTxBl="{Binding InvertTxBl}" 
                                     ParamChBx="{Binding Path=Invert,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                                     Style="{DynamicResource CheckParamV_Margin}"/>
            <EgtWPFLib5:ComboParamV 
                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                   UpdateSourceTrigger=PropertyChanged,
                                   ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
            <UniformGrid Columns="2">
                <TextBlock Text="{Binding UserNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
                    <EgtWPFLib5:EgtTextBox.ToolTip>
                        <TextBlock Text="{Binding UserNotesTooltip}"/>
                    </EgtWPFLib5:EgtTextBox.ToolTip>
                </EgtWPFLib5:EgtTextBox>
                <TextBlock Text="{Binding SystemNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
                           Visibility="{Binding SysNotes_Visibility}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
-        </StackPanel>
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+                                 ParamChBx="{Binding Path=Invert,
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+                                                     UpdateSourceTrigger=PropertyChanged,
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                                                     ValidatesOnDataErrors=True}" 
-                <StackPanel>
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                 ParamCmBxList="{Binding Path=WorkSideList,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
-                                ValidatesOnDataErrors=True}" 
+                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+         <UniformGrid Columns="2">
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                   ValidatesOnDataErrors=True}"
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                    <EgtWPFLib5:ComboParamV 
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+            </EgtWPFLib5:EgtTextBox>
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                                   UpdateSourceTrigger=PropertyChanged,
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                                   ValidatesOnDataErrors=True}"
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                    <EgtWPFLib5:StringParamV 
+                                   Visibility="{Binding SysNotes_Visibility}"
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                   IsReadOnly="True"/>
-                               ParamTxBx="{Binding Path=StepPar,
+         </UniformGrid>
-                                UpdateSourceTrigger=PropertyChanged,
+      </StackPanel>
-                                ValidatesOnDataErrors=True}" 
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
            <StackPanel>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
                                        ParamTxBx="{Binding Path=StartPos,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
                                       ParamCmBxList="{Binding Path=LeadInTypeList,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
                                        ParamTxBx="{Binding Path=StepPar,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
-                </StackPanel>
+            </StackPanel>
-            </Expander>
+         </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:StringParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamTxBx="{Binding Path=InitAngs,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:ComboParamV 
+                  </Button>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+            </Expander.Header>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                   ValidatesOnDataErrors=True,
+               <Grid.RowDefinitions>
-                                   Mode=OneWay}"
+                  <RowDefinition Height="1*"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                  <RowDefinition Height="Auto"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                </StackPanel>
+               <StackPanel>
-            </Expander>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class StoneMillingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class StoneMillingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneMillingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class StoneMillingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="StoneSawFinishingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,186 +75,255 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-            <EgtWPFLib5:ComboParamV 
+                                 ParamCmBxList="{Binding Path=SubTypeList,
-                                     ParamTxBl="{Binding SubTypeTxBl}" 
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                     ParamCmBxList="{Binding Path=SubTypeList,
+                                                         ValidatesOnDataErrors=True}"
-                                      UpdateSourceTrigger=PropertyChanged,
+                                 ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
-                                      ValidatesOnDataErrors=True}"
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
                                     ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
                                     Style="{DynamicResource ComboParamV_Margin}"/>
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                </EgtWPFLib5:EgtTextBox>
+            </EgtWPFLib5:EgtTextBox>
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                           Visibility="{Binding SysNotes_Visibility}"/>
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                       Visibility="{Binding SysNotes_Visibility}"
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       IsReadOnly="True"/>
+                                   IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="0"
+               <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="0"
-                                     ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBl="{Binding StartPosTxBl}" 
-                                     ParamTxBx="{Binding Path=StartPos,
+                                        ParamTxBx="{Binding Path=StartPos,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}"
+                                                            ValidatesOnDataErrors=True}"
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}" 
-                                     ParamTxBl="{Binding LeadLinkTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadLinkTypeList,
-                                     ParamCmBxList="{Binding Path=LeadLinkTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                      ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
-                                     ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
                                     Style="{DynamicResource ComboParamV_Margin}"/>
-                </StackPanel>
+            </StackPanel>
-            </Expander>
+         </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:StringParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamTxBx="{Binding Path=InitAngs,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:ComboParamV 
+                  </Button>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+            </Expander.Header>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                   ValidatesOnDataErrors=True,
+               <Grid.RowDefinitions>
-                                   Mode=OneWay}"
+                  <RowDefinition Height="1*"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                  <RowDefinition Height="Auto"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                </StackPanel>
+               <StackPanel>
-            </Expander>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Header="{Binding StepGpBxLbl}" 
+         <Expander Header="{Binding StepGpBxLbl}" 
-                      Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                     ParamTxBl="{Binding StepTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=StepTypeList,
-                                     ParamCmBxList="{Binding Path=StepTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                      ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
-                                     ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
                                     Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                     ParamTxBl="{Binding StepParTxBl}" 
+                                       ParamTxBx="{Binding Path=StepPar,
-                                     ParamTxBx="{Binding Path=StepPar,
+                                                           UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                           ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                       Style="{DynamicResource StringParamV_Margin}"/>
                                     Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
-                                 ParamTxBl="{Binding SideStepTxBl}" 
+                                        ParamTxBx="{Binding Path=SideStep,
-                                 ParamTxBx="{Binding Path=SideStep,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                  UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                  ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
                                 Style="{DynamicResource StringParamV_Margin}"/>
-                </StackPanel>
+            </StackPanel>
-            </Expander>
+         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding OffsetGpBxLbl}"/>
+               <TextBlock Text="{Binding OffsetGpBxLbl}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <UniformGrid Columns="1">
+            <UniformGrid Columns="1">
-                    <EgtWPFLib5:StringParamV Grid.Row="0"
+               <EgtWPFLib5:StringParamV Grid.Row="0"
-                                     ParamTxBl="{Binding OffSrTxBl}" 
+                                        ParamTxBl="{Binding OffSrTxBl}" 
-                                     ParamTxBx="{Binding Path=OffSr,
+                                        ParamTxBx="{Binding Path=OffSr,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                </UniformGrid>
+            </UniformGrid>
-            </Expander>
+         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                               ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding EndFeedTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding VertFeedTxBl}" 
-                               ParamTxBx="{Binding Path=EndFeed,
+                                        ParamTxBx="{Binding Path=VertFeed,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                               ParamTxBl="{Binding VertFeedTxBl}" 
+         </Expander>
-                               ParamTxBx="{Binding Path=VertFeed,
+         <Interactivity:Interaction.Behaviors>
-                                UpdateSourceTrigger=PropertyChanged,
+            <EgtCAM5:AutomaticCloseExpander/>
-                                ValidatesOnDataErrors=True}" 
+         </Interactivity:Interaction.Behaviors>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+      </StackPanel>
-                </StackPanel>
+   </StackPanel>
            </Expander>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class StoneSawFinishingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class StoneSawFinishingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneSawFinishingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class StoneSawFinishingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="StoneSawRoughingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,176 +75,245 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                     ParamTxBl="{Binding StepTypeTxBl}" 
+                                 ParamCmBxList="{Binding Path=StepTypeList,
-                                     ParamCmBxList="{Binding Path=StepTypeList,
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
-                                      ValidatesOnDataErrors=True}"
+                                 ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
-                                     ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
                                     Style="{DynamicResource ComboParamV_Margin}"/>
-
+         <UniformGrid Columns="2">
-            <UniformGrid Columns="2">
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+            </EgtWPFLib5:EgtTextBox>
-                </EgtWPFLib5:EgtTextBox>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                           Visibility="{Binding SysNotes_Visibility}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       Visibility="{Binding SysNotes_Visibility}"
+                                   IsReadOnly="True"/>
                                       IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding HeadSideTxBl}" 
-                                  ParamTxBl="{Binding HeadSideTxBl}" 
+                                       ParamCmBxList="{Binding Path=HeadSideList,
-                                  ParamCmBxList="{Binding Path=HeadSideList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedHeadSide}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedHeadSide}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="0"
-                    <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="0"
+                                        ParamTxBl="{Binding StartPosTxBl}" 
-                                     ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                                     ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}"
-                                      ValidatesOnDataErrors=True}"
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
                                       ParamCmBxList="{Binding Path=ExtLinkTypeList,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}" 
                                       Style="{DynamicResource ComboParamV_Margin}"/>
            </StackPanel>
         </Expander>
-                    <EgtWPFLib5:ComboParamV 
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-                                     ParamTxBl="{Binding ExtLinkTypeTxBl}" 
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                                     ParamCmBxList="{Binding Path=ExtLinkTypeList,
+            <Expander.Header>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <UniformGrid Columns="2">
-                                      ValidatesOnDataErrors=True}"
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                                     ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}" 
+                             Margin="2.5"/>
-                                     Style="{DynamicResource ComboParamV_Margin}"/>
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                </StackPanel>
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-            </Expander>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
                          ToolTip="{Binding ShowNoteToolTip}"
                          Grid.Column="1"
                          HorizontalAlignment="Right"
                          Margin="2.5,2.5,7,2.5"
                          Width="20">
                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
                  </Button>
               </UniformGrid>
            </Expander.Header>
            <Grid>
               <Grid.RowDefinitions>
                  <RowDefinition Height="1*"/>
                  <RowDefinition Height="Auto"/>
               </Grid.RowDefinitions>
               <StackPanel>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Header="{Binding StepGpBxLbl}" 
-                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                                        ParamTxBx="{Binding Path=StepPar,
-                               ParamTxBx="{Binding Path=InitAngs,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=SideStep,
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+            </StackPanel>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         </Expander>
                    <EgtWPFLib5:ComboParamV 
                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                   UpdateSourceTrigger=PropertyChanged,
                                   ValidatesOnDataErrors=True,
                                   Mode=OneWay}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                  Style="{DynamicResource ComboParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding StepGpBxLbl}" 
+         <Expander Style="{StaticResource ExpanderStyle}">
-                      Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
-                <StackPanel>
+               <TextBlock Text="{Binding OffsetGpBxLbl}"/>
-                    <EgtWPFLib5:StringParamV
+            </Expander.Header>
-                                     ParamTxBl="{Binding StepParTxBl}" 
+            <UniformGrid Columns="1">
                                     ParamTxBx="{Binding Path=StepPar,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                                     Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV
                                 ParamTxBl="{Binding SideStepTxBl}" 
                                 ParamTxBx="{Binding Path=SideStep,
                                  UpdateSourceTrigger=PropertyChanged,
                                  ValidatesOnDataErrors=True}" 
                                 Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+               <EgtWPFLib5:StringParamV Grid.Row="0"
-                <Expander.Header>
+                                        ParamTxBl="{Binding OffSrTxBl}" 
-                    <TextBlock Text="{Binding OffsetGpBxLbl}"/>
+                                        ParamTxBx="{Binding Path=OffSr,
-                </Expander.Header>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                <UniformGrid Columns="1">
+                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV Grid.Row="0"
+               <EgtWPFLib5:StringParamV Grid.Row="0"
-                                     ParamTxBl="{Binding OffSrTxBl}" 
+                                        ParamTxBl="{Binding OffSlTxBl}" 
-                                     ParamTxBx="{Binding Path=OffSr,
+                                        ParamTxBx="{Binding Path=OffSl,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV Grid.Row="0"
+            </UniformGrid>
-                                     ParamTxBl="{Binding OffSlTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=OffSl,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                                     Style="{DynamicResource StringParamV_Margin}"/>
-                </UniformGrid>
+         <Expander Style="{StaticResource ExpanderStyle}">
-            </Expander>
+            <Expander.Header>
-
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-            <Expander Style="{StaticResource ExpanderStyle}">
+            </Expander.Header>
-                <Expander.Header>
+            <StackPanel>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                </Expander.Header>
+                                        ParamTxBx="{Binding Path=Speed,
-                <StackPanel>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=Speed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=Feed,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding FeedTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                               ParamTxBx="{Binding Path=Feed,
+                                        ParamTxBx="{Binding Path=TipFeed,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                               ParamTxBl="{Binding TipFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                               ParamTxBx="{Binding Path=TipFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=EndFeed,
-                               ParamTxBl="{Binding StartFeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=StartFeed,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+            </StackPanel>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         </Expander>
-                    <EgtWPFLib5:StringParamV 
+         <Interactivity:Interaction.Behaviors>
-                               ParamTxBl="{Binding EndFeedTxBl}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                               ParamTxBx="{Binding Path=EndFeed,
+         </Interactivity:Interaction.Behaviors>
-                                UpdateSourceTrigger=PropertyChanged,
+      </StackPanel>
-                                ValidatesOnDataErrors=True}" 
+   </StackPanel>
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class StoneSawRoughingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class StoneSawRoughingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneSawRoughingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class StoneSawRoughingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,352 +1,405 @@
 <UserControl x:Class="StoneSawingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-    <UserControl.Resources>
+   <UserControl.Resources>
-        <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
-        <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-        <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
-        <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-        <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
-        <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
-        <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
-        <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
-        <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
-        <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
-        <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
-        <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
-        <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
-        <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
-        <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
-        <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
-        <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
-        <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
-        <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
-        <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
-        <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
-        <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
-        <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
-        <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
-        <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
-        <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
-        <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
-        <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
-        <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
-        <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
-        <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
-        <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
-        <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
-        <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
-        <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
-        <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
-        <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
-        <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
-        <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
-        <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
-        <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
-        <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
-        <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
-        <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
-        <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
-        <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
-        <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
-        <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
-        <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
-        <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
-        <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
-        <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
-        <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
-        <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
-        <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
-        <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
-        <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
-        <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
-    </UserControl.Resources>
+   </UserControl.Resources>
-    <StackPanel Name="OperationParametersStackPanel">
+   <StackPanel Name="OperationParametersStackPanel">
-        <StackPanel Name="OperationFirstParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
            </UniformGrid>
            <EgtWPFLib5:CheckParamV 
                                     ParamTxBl="{Binding InvertTxBl}" 
                                     ParamChBx="{Binding Path=Invert,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                                     Style="{DynamicResource CheckParamV_Margin}"/>
            <UniformGrid Columns="2">
                <TextBlock Text="{Binding UserNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
                    <EgtWPFLib5:EgtTextBox.ToolTip>
                        <TextBlock Text="{Binding UserNotesTooltip}"/>
                    </EgtWPFLib5:EgtTextBox.ToolTip>
                </EgtWPFLib5:EgtTextBox>
                <TextBlock Text="{Binding SystemNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
                           Visibility="{Binding SysNotes_Visibility}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
-        </StackPanel>
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+                                 ParamChBx="{Binding Path=Invert,
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+                                                     UpdateSourceTrigger=PropertyChanged,
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                                                     ValidatesOnDataErrors=True}" 
-                <StackPanel>
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
                    <EgtWPFLib5:ComboParamV 
                                  ParamTxBl="{Binding WorkSideTxBl}" 
                                  ParamCmBxList="{Binding Path=WorkSideList,
                                   UpdateSourceTrigger=PropertyChanged,
                                   ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
                    <EgtWPFLib5:ComboParamV 
                                  ParamTxBl="{Binding HeadSideTxBl}" 
                                  ParamCmBxList="{Binding Path=HeadSideList,
                                   UpdateSourceTrigger=PropertyChanged,
                                   ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedHeadSide}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                                  ParamTxBl="{Binding StartPosTxBl}" 
                                  ParamTxBx="{Binding Path=StartPos,
                                   UpdateSourceTrigger=PropertyChanged,
                                   ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:ComboParamV 
                                  ParamTxBl="{Binding ExtLinkTypeTxBl}" 
                                  ParamCmBxList="{Binding Path=ExtLinkTypeList,
                                   UpdateSourceTrigger=PropertyChanged,
                                   ValidatesOnDataErrors=True}"
                                  ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}"
                                  Style="{DynamicResource ComboParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                               ParamTxBl="{Binding SideAngleTxBl}" 
                               ParamTxBx="{Binding Path=SideAngle,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <UniformGrid Columns="2">
-                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                <StackPanel>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                    <EgtWPFLib5:StringParamV 
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                               ParamTxBx="{Binding Path=InitAngs,
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                                ValidatesOnDataErrors=True}" 
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+            </EgtWPFLib5:EgtTextBox>
-                    <EgtWPFLib5:StringParamV 
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                ValidatesOnDataErrors=True}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                   Visibility="{Binding SysNotes_Visibility}"
-                    <EgtWPFLib5:ComboParamV 
+                                   IsReadOnly="True"/>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+         </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+      </StackPanel>
-                                   UpdateSourceTrigger=PropertyChanged,
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-                                   ValidatesOnDataErrors=True,
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-                                   Mode=OneWay}"
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+            <StackPanel>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-                </StackPanel>
+                                       ParamCmBxList="{Binding Path=WorkSideList,
-            </Expander>
+                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding HeadSideTxBl}" 
                                       ParamCmBxList="{Binding Path=HeadSideList,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedHeadSide}" 
                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
                                        ParamTxBx="{Binding Path=StartPos,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
                                       ParamCmBxList="{Binding Path=ExtLinkTypeList,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}"
                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
                                        ParamTxBx="{Binding Path=SideAngle,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-                <Expander.Header>
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                    <EgtWPFLib5:ComboParamV 
+            <Expander.Header>
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+               <UniformGrid Columns="2">
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                             Margin="2.5"/>
-                                   ValidatesOnDataErrors=True}"
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                </Expander.Header>
+                          ToolTip="{Binding ShowNoteToolTip}"
-                <StackPanel>
+                          Grid.Column="1"
-                    <EgtWPFLib5:StringParamV 
+                          HorizontalAlignment="Right"
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
+                          Margin="2.5,2.5,7,2.5"
-                               ParamTxBx="{Binding Path=StartAddLen,
+                          Width="20">
-                                UpdateSourceTrigger=PropertyChanged,
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                                ValidatesOnDataErrors=True}" 
+                  </Button>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               </UniformGrid>
-                    <EgtWPFLib5:StringParamV
+            </Expander.Header>
-                               ParamTxBl="{Binding LiTangStoneTxBl}" 
+            <Grid>
-                               ParamTxBx="{Binding Path=LiTang,
+               <Grid.RowDefinitions>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <RowDefinition Height="1*"/>
-                                ValidatesOnDataErrors=True}"  
+                  <RowDefinition Height="Auto"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                    <EgtWPFLib5:StringParamV
+               <StackPanel>
-                               ParamTxBl="{Binding LiElevStoneTxBl}" 
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                               ParamTxBx="{Binding Path=LiElev,
+                                           ParamTxBx="{Binding Path=InitAngs,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}"  
+                                                               ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                           Style="{DynamicResource StringParamV_Margin}"/>
-                </StackPanel>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
-            </Expander>
+                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=StartAddLen,
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=EndAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangStoneTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LiTang,
-                </StackPanel>
+                                                            UpdateSourceTrigger=PropertyChanged,
-            </Expander>
+                                                            ValidatesOnDataErrors=True}"  
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevStoneTxBl}" 
                                        ParamTxBx="{Binding Path=LiElev,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}"  
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding StepGpBxLbl}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                </Expander.Header>
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                <StackPanel>
+                                                               UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:ComboParamV 
+                                                               ValidatesOnDataErrors=True}"
-                               ParamTxBl="{Binding StepTypeTxBl}" 
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                               ParamCmBxList="{Binding Path=StepTypeList,
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+            </Expander.Header>
-                                ValidatesOnDataErrors=True}"
+            <StackPanel>
-                               ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                               Style="{DynamicResource ComboParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=EndAddLen,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBx="{Binding Path=StepPar,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+            </StackPanel>
-                                ValidatesOnDataErrors=True}" 
+         </Expander>
                               Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                               ParamTxBl="{Binding StepBackTxBl}" 
                               ParamTxBx="{Binding Path=StepBack,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                               ParamTxBl="{Binding StepSideAngTxBl}" 
                               ParamTxBx="{Binding Path=StepSideAng,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                               ParamTxBl="{Binding StepSideAngBackTxBl}" 
                               ParamTxBx="{Binding Path=StepSideAngBack,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                               ParamTxBl="{Binding StepIntArcTxBl}" 
                               ParamTxBx="{Binding Path=StepIntArc,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                               ParamTxBl="{Binding StepExtArcTxBl}" 
                               ParamTxBx="{Binding Path=StepExtArc,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                    <EgtWPFLib5:StringParamV 
                               ParamTxBl="{Binding StepLastTxBl}" 
                               ParamTxBx="{Binding Path=StepLast,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding OffsetGpBxLbl}"
+         <Expander Style="{StaticResource ExpanderStyle}">
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
-                <StackPanel>
+               <TextBlock Text="{Binding StepGpBxLbl}"/>
-                    <EgtWPFLib5:StringParamV 
+            </Expander.Header>
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+            <StackPanel>
-                               ParamTxBx="{Binding Path=OffSl,
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                       ParamCmBxList="{Binding Path=StepTypeList,
-                                ValidatesOnDataErrors=True}" 
+                                                               UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                               ValidatesOnDataErrors=True}"
-                </StackPanel>
+                                       ParamCmBxSelIndex="{Binding Path=SelectedStepType}" 
-            </Expander>
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
                                        ParamTxBx="{Binding Path=StepPar,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepBackTxBl}" 
                                        ParamTxBx="{Binding Path=StepBack,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepSideAngTxBl}" 
                                        ParamTxBx="{Binding Path=StepSideAng,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepSideAngBackTxBl}" 
                                        ParamTxBx="{Binding Path=StepSideAngBack,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepIntArcTxBl}" 
                                        ParamTxBx="{Binding Path=StepIntArc,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepExtArcTxBl}" 
                                        ParamTxBx="{Binding Path=StepExtArc,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepLastTxBl}" 
                                        ParamTxBx="{Binding Path=StepLast,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Header="{Binding OffsetGpBxLbl}"
-                <Expander.Header>
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+            <StackPanel>
-                </Expander.Header>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                <StackPanel>
+                                        ParamTxBx="{Binding Path=OffSl,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-                    <EgtWPFLib5:StringParamV 
+         <Expander Style="{StaticResource ExpanderStyle}">
-                               ParamTxBl="{Binding SpeedTxBl}" 
+            <Expander.Header>
-                               ParamTxBx="{Binding Path=Speed,
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+            </Expander.Header>
-                                ValidatesOnDataErrors=True}" 
+            <StackPanel>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding FeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Feed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                               ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=TipFeed,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBl="{Binding StartFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBx="{Binding Path=StartFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding EndFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=EndFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding BackFeedTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding BackFeedTxBl}" 
-                               ParamTxBx="{Binding Path=BackFeed,
+                                        ParamTxBx="{Binding Path=BackFeed,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngFeedTxBl}" 
-                               ParamTxBl="{Binding SideAngFeedTxBl}" 
+                                        ParamTxBx="{Binding Path=SideAngFeed,
-                               ParamTxBx="{Binding Path=SideAngFeed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
-            </Expander>
+         <Interactivity:Interaction.Behaviors>
-            <Interactivity:Interaction.Behaviors>
+            <EgtCAM5:AutomaticCloseExpander/>
-                <EgtCAM5:AutomaticCloseExpander/>
+         </Interactivity:Interaction.Behaviors>
-            </Interactivity:Interaction.Behaviors>
+      </StackPanel>
-        </StackPanel>
+   </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class StoneSawingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class StoneSawingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class StoneSawingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class StoneSawingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,286 +1,347 @@
 <UserControl x:Class="SurfFinishingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-    <UserControl.Resources>
+   <UserControl.Resources>
-        <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
-        <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-        <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
-        <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-        <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
-        <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
-        <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
-        <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
-        <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
-        <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
-        <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
-        <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
-        <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
-        <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
-        <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
-        <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
-        <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
-        <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
-        <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
-        <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
-        <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
-        <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
-        <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
-        <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
-        <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
-        <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
-        <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
-        <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
-        <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
-        <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
-        <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
-        <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
-        <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
-        <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
-        <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
-        <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
-        <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
-        <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
-        <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
-        <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
-        <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
-        <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
-        <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
-        <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
-        <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
-        <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
+      <sys:Int32 x:Key="OverLapStr">47</sys:Int32>
-        <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
+      <sys:Int32 x:Key="OffsetStr">48</sys:Int32>
-        <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
-        <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="SolChoiceType">50</sys:Int32>
-        <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
-        <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
-        <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
-        <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
-        <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
+      <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
-        <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
-        <sys:Int32 x:Key="OscEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscEnable">58</sys:Int32>
-        <sys:Int32 x:Key="OscHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscHeight">59</sys:Int32>
-        <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
+      <sys:Int32 x:Key="OscRampLen">60</sys:Int32>
-        <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
+      <sys:Int32 x:Key="OscFlatLen">61</sys:Int32>
-    </UserControl.Resources>
+   </UserControl.Resources>
-    <StackPanel Name="OperationParametersStackPanel">
+   <StackPanel Name="OperationParametersStackPanel">
-        <StackPanel Name="OperationFirstParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
            </UniformGrid>
            <EgtWPFLib5:CheckParamV 
                                     ParamTxBl="{Binding InvertTxBl}" 
                                     ParamChBx="{Binding Path=Invert,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                                     Style="{DynamicResource CheckParamV_Margin}"/>
            <EgtWPFLib5:ComboParamV 
                                     ParamTxBl="{Binding SubTypeTxBl}" 
                                     ParamCmBxList="{Binding Path=SubTypeList,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}"
                                     ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
                                     Style="{DynamicResource ComboParamV_Margin}"/>
            <EgtWPFLib5:StringParamV 
                                     ParamTxBl="{Binding OverLapTxBl}" 
                                     ParamTxBx="{Binding Path=OverLap,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                                     Style="{DynamicResource StringParamV_Margin}"/>
            <UniformGrid Columns="2">
                <TextBlock Text="{Binding UserNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
                    <EgtWPFLib5:EgtTextBox.ToolTip>
                        <TextBlock Text="{Binding UserNotesTooltip}"/>
                    </EgtWPFLib5:EgtTextBox.ToolTip>
                </EgtWPFLib5:EgtTextBox>
                <TextBlock Text="{Binding SystemNotesTxBl}" 
                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
                           Visibility="{Binding SysNotes_Visibility}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
-        </StackPanel>
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+                                 ParamChBx="{Binding Path=Invert,
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+                                                     UpdateSourceTrigger=PropertyChanged,
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                                                     ValidatesOnDataErrors=True}" 
-                <StackPanel>
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SubTypeTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                 ParamCmBxList="{Binding Path=SubTypeList,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
-                                ValidatesOnDataErrors=True}" 
+                                 ParamCmBxSelIndex="{Binding Path=SelectedSubType}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:StringParamV ParamTxBl="{Binding OverLapTxBl}" 
-                                     ParamTxBl="{Binding LeadLinkTypeTxBl}" 
+                                  ParamTxBx="{Binding Path=OverLap,
-                                     ParamCmBxList="{Binding Path=LeadLinkTypeList,
+                                                      UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                      ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}"
+                                  Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
+         <UniformGrid Columns="2">
-                                     Style="{DynamicResource ComboParamV_Margin}"/>
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                    <EgtWPFLib5:StringParamV
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                                     ParamTxBl="{Binding SideAngleTxBl}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                     ParamTxBx="{Binding Path=SideAngle,
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                                      ValidatesOnDataErrors=True}" 
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                    <EgtWPFLib5:StringParamV 
+            </EgtWPFLib5:EgtTextBox>
-                               ParamTxBl="{Binding SideStepTxBl}" 
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                               ParamTxBx="{Binding Path=SideStep,
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                                UpdateSourceTrigger=PropertyChanged,
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                                ValidatesOnDataErrors=True}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                    <EgtWPFLib5:StringParamV 
+                                   Visibility="{Binding SysNotes_Visibility}"
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
+                                   IsReadOnly="True"/>
-                               ParamTxBx="{Binding Path=OffSr,
+         </UniformGrid>
-                                UpdateSourceTrigger=PropertyChanged,
+      </StackPanel>
-                                ValidatesOnDataErrors=True}" 
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-                    <EgtWPFLib5:StringParamV
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                                     ParamTxBl="{Binding ApproxTxBl}" 
+            <StackPanel>
-                                     ParamTxBx="{Binding Path=Approx,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=StartPos,
-                                      ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                </StackPanel>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-            </Expander>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadLinkTypeTxBl}" 
                                       ParamCmBxList="{Binding Path=LeadLinkTypeList,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}"
                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadLinkType}" 
                                       Style="{DynamicResource ComboParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
                                        ParamTxBx="{Binding Path=SideAngle,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideStepTxBl}" 
                                        ParamTxBx="{Binding Path=SideStep,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
                                        ParamTxBx="{Binding Path=OffSr,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ApproxTxBl}" 
                                        ParamTxBx="{Binding Path=Approx,
                                                            UpdateSourceTrigger=PropertyChanged,
                                                            ValidatesOnDataErrors=True}" 
                                        Style="{DynamicResource StringParamV_Margin}"/>
            </StackPanel>
         </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:StringParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamTxBx="{Binding Path=InitAngs,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:ComboParamV 
+                  </Button>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+            </Expander.Header>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                   ValidatesOnDataErrors=True,
+               <Grid.RowDefinitions>
-                                   Mode=OneWay}"
+                  <RowDefinition Height="1*"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                  <RowDefinition Height="Auto"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                </StackPanel>
+               <StackPanel>
-            </Expander>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=LiTang,
-                                     ParamTxBl="{Binding LiTangTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=LiTang,
+                                                            ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LiPerp,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LiPerp,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+            </StackPanel>
-                                      ValidatesOnDataErrors=True}" 
+         </Expander>
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=LoTang,
-                                     ParamTxBl="{Binding LoTangTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=LoTang,
+                                                            ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LoPerp,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LoPerp,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+            </StackPanel>
-                                      ValidatesOnDataErrors=True}" 
+         </Expander>
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class SurfFinishingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class SurfFinishingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class SurfFinishingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class SurfFinishingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="WaterjettingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -74,280 +74,340 @@
   </UserControl.Resources>
   <StackPanel Name="OperationParametersStackPanel">
-        <StackPanel Name="OperationFirstParametersStackPanel">
+      <StackPanel Name="OperationFirstParametersStackPanel">
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-            <EgtWPFLib5:ComboParamV 
+                                 ParamCmBxList="{Binding Path=WorkSideList,
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxList="{Binding Path=WorkSideList,
+                                                         ValidatesOnDataErrors=True}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                                   ValidatesOnDataErrors=True}"
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
+         <EgtWPFLib5:StringParamV ParamTxBl="{Binding ForwardAngleTxBl}" 
                                  Style="{DynamicResource ComboParamV_Margin}"/>
            <EgtWPFLib5:StringParamV 
                                  ParamTxBl="{Binding ForwardAngleTxBl}" 
                                  ParamTxBx="{Binding Path=ForwardAngle,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                      UpdateSourceTrigger=PropertyChanged,
-                                   ValidatesOnDataErrors=True}" 
+                                                      ValidatesOnDataErrors=True}" 
                                  Style="{DynamicResource StringParamV_Margin}"/>
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                </EgtWPFLib5:EgtTextBox>
+            </EgtWPFLib5:EgtTextBox>
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                           Visibility="{Binding SysNotes_Visibility}"/>
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                       Visibility="{Binding SysNotes_Visibility}"
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       IsReadOnly="True"/>
+                                   IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                               ParamTxBl="{Binding SideAngleTxBl}" 
+                                        ParamTxBx="{Binding Path=SideAngle,
-                               ParamTxBx="{Binding Path=SideAngle,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:StringParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamTxBx="{Binding Path=InitAngs,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:ComboParamV 
+                  </Button>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+            </Expander.Header>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                   ValidatesOnDataErrors=True,
+               <Grid.RowDefinitions>
-                                   Mode=OneWay}"
+                  <RowDefinition Height="1*"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                  <RowDefinition Height="Auto"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                </StackPanel>
+               <StackPanel>
-            </Expander>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=StartAddLen,
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=StartAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                                     ParamTxBl="{Binding LiTangTxBl}" 
+                                        ParamTxBx="{Binding Path=LiTang,
-                                     ParamTxBx="{Binding Path=LiTang,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
+                                        ParamTxBx="{Binding Path=LiPerp,
-                                     ParamTxBx="{Binding Path=LiPerp,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:CheckParamV Grid.Column="0" Grid.Row="0"
+               <EgtWPFLib5:CheckParamV Grid.Column="0" Grid.Row="0"
-                                     ParamTxBl="{Binding LiHoleTxBl}" 
+                                       ParamTxBl="{Binding LiHoleTxBl}" 
-                                     ParamChBx="{Binding Path=LiHole,
+                                       ParamChBx="{Binding Path=LiHole,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                           UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                           ValidatesOnDataErrors=True}" 
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+                                       Style="{DynamicResource CheckParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV Grid.Column="1" Grid.Row="0"
+               <EgtWPFLib5:StringParamV Grid.Column="1" Grid.Row="0"
-                                     ParamTxBl="{Binding LiHoleRadTxBl}" 
+                                        ParamTxBl="{Binding LiHoleRadTxBl}" 
-                                     ParamTxBx="{Binding Path=LiHoleRad,
+                                        ParamTxBx="{Binding Path=LiHoleRad,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="1"
+               <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="1"
-                                     ParamTxBl="{Binding LpTurnsTxBl}" 
+                                        ParamTxBl="{Binding LpTurnsTxBl}" 
-                                     ParamTxBx="{Binding Path=LpTurns,
+                                        ParamTxBx="{Binding Path=LpTurns,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV Grid.Column="1" Grid.Row="1"
+               <EgtWPFLib5:StringParamV Grid.Column="1" Grid.Row="1"
-                                     ParamTxBl="{Binding HpTurnsTxBl}" 
+                                        ParamTxBl="{Binding HpTurnsTxBl}" 
-                                     ParamTxBx="{Binding Path=HpTurns,
+                                        ParamTxBx="{Binding Path=HpTurns,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                </StackPanel>
+            </StackPanel>
-            </Expander>
+         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=EndAddLen,
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=EndAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LoTang,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LoTangTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LoTang,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=LoPerp,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=LoPerp,
+            </StackPanel>
-                                      UpdateSourceTrigger=PropertyChanged,
+         </Expander>
                                      ValidatesOnDataErrors=True}" 
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AnglesGpBxLbl}" 
+         <Expander Header="{Binding AnglesGpBxLbl}" 
-                      Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1"> 
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtCornTypeTxBl}" 
-                                     ParamTxBl="{Binding ExtCornTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=ExtCornTypeList,
-                                     ParamCmBxList="{Binding Path=ExtCornTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                      ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedExtCornType}" 
-                                     ParamCmBxSelIndex="{Binding Path=SelectedExtCornType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
                                     Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding IntCornTypeTxBl}" 
-                                 ParamTxBl="{Binding IntCornTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=IntCornTypeList,
-                                 ParamCmBxList="{Binding Path=IntCornTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                  UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                  ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedIntCornType}" 
-                                 ParamCmBxSelIndex="{Binding Path=SelectedIntCornType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding CornSlowLenTxBl}" 
-                                 ParamTxBl="{Binding CornSlowLenTxBl}" 
+                                        ParamTxBx="{Binding Path=CornSlowLen,
-                                 ParamTxBx="{Binding Path=CornSlowLen,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                  UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                  ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
                                 Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding CornSlowPercTxBl}" 
-                                 ParamTxBl="{Binding CornSlowPercTxBl}" 
+                                        ParamTxBx="{Binding Path=CornSlowPerc,
-                                 ParamTxBx="{Binding Path=CornSlowPerc,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                  UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                  ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                 Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding ProbingGpBxLbl}" 
-                                     ParamTxBl="{Binding ProbingGpBxLbl}" 
+                                       ParamChBx="{Binding Path=Probing,
-                                     ParamChBx="{Binding Path=Probing,
+                                                           UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                           ValidatesOnDataErrors=True}"
-                                      ValidatesOnDataErrors=True}"
+                                       Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel Margin="2">
-                <StackPanel Margin="2">
+               <EgtWPFLib5:StringParamV Grid.Column="1" Grid.Row="0"
-                    <EgtWPFLib5:StringParamV Grid.Column="1" Grid.Row="0"
+                                        ParamTxBl="{Binding ProbingMinDistTxBl}" 
-                                     ParamTxBl="{Binding ProbingMinDistTxBl}" 
+                                        ParamTxBx="{Binding Path=ProbingMinDist,
-                                     ParamTxBx="{Binding Path=ProbingMinDist,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="1"
-                    <EgtWPFLib5:StringParamV Grid.Column="0" Grid.Row="1"
+                                        ParamTxBl="{Binding ProbingMaxDistTxBl}" 
-                                     ParamTxBl="{Binding ProbingMaxDistTxBl}" 
+                                        ParamTxBx="{Binding Path=ProbingMaxDist,
-                                     ParamTxBx="{Binding Path=ProbingMaxDist,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
            </Expander>
-            <Expander Header="{Binding OffsetGpBxLbl}"
+         <Expander Header="{Binding OffsetGpBxLbl}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
+                                        ParamTxBx="{Binding Path=OffSr,
-                               ParamTxBx="{Binding Path=OffSr,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+            </StackPanel>
-                </StackPanel>
+         </Expander>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                           UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                           ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=TipFeed,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=TipFeed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ThicknessFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=ThicknessFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding ThicknessFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=ThicknessFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+            </StackPanel>
-                           ValidatesOnDataErrors=True}" 
+         </Expander>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         <Interactivity:Interaction.Behaviors>
-                </StackPanel>
+            <EgtCAM5:AutomaticCloseExpander/>
-            </Expander>
+         </Interactivity:Interaction.Behaviors>
-            <Interactivity:Interaction.Behaviors>
+      </StackPanel>
-                <EgtCAM5:AutomaticCloseExpander/>
+   </StackPanel>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class WaterjettingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class WaterjettingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WaterjettingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class WaterjettingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="WoodDrillingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,146 +75,215 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <UniformGrid Columns="2">
-            <UniformGrid Columns="2">
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+            </EgtWPFLib5:EgtTextBox>
-                </EgtWPFLib5:EgtTextBox>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                           Visibility="{Binding SysNotes_Visibility}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       Visibility="{Binding SysNotes_Visibility}"
+                                   IsReadOnly="True"/>
                                       IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ReturnPosTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=ReturnPos,
-                               ParamTxBl="{Binding ReturnPosTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=ReturnPos,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ThrouAddLenTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=ThrouAddLen,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding ThrouAddLenTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=ThrouAddLen,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StepPar,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding StepParTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=StepPar,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartSlowLenTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=StartSlowLen,
-                                      ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBl="{Binding StartSlowLenTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndSlowLenTxBl}" 
-                                     ParamTxBx="{Binding Path=StartSlowLen,
+                                        ParamTxBx="{Binding Path=EndSlowLen,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                                     ParamTxBl="{Binding EndSlowLenTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=EndSlowLen,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:StringParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamTxBx="{Binding Path=InitAngs,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:ComboParamV 
+                  </Button>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+            </Expander.Header>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                   ValidatesOnDataErrors=True,
+               <Grid.RowDefinitions>
-                                   Mode=OneWay}"
+                  <RowDefinition Height="1*"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                  <RowDefinition Height="Auto"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                </StackPanel>
+               <StackPanel>
-            </Expander>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class WoodDrillingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class WoodDrillingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WoodDrillingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class WoodDrillingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="WoodMillingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,342 +75,385 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-            <EgtWPFLib5:ComboParamV 
+                                 ParamCmBxList="{Binding Path=WorkSideList,
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxList="{Binding Path=WorkSideList,
+                                                         ValidatesOnDataErrors=True}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                                   ValidatesOnDataErrors=True}"
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
+         <UniformGrid Columns="2">
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-            <UniformGrid Columns="2">
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+            </EgtWPFLib5:EgtTextBox>
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                </EgtWPFLib5:EgtTextBox>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                           Visibility="{Binding SysNotes_Visibility}"/>
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   Visibility="{Binding SysNotes_Visibility}"
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
+                                   IsReadOnly="True"/>
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OverLapTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=OverLap,
-                               ParamTxBl="{Binding OverLapTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=OverLap,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                       ParamCmBxList="{Binding Path=StepTypeList,
-                    <EgtWPFLib5:ComboParamV 
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
+                                                               ValidatesOnDataErrors=True}"
-                                  ParamCmBxList="{Binding Path=StepTypeList,
+                                       ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                   ValidatesOnDataErrors=True}"
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
+                                        ParamTxBx="{Binding Path=StepPar,
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=StepPar,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSrTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=OffSr,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding OffsetSrTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                               ParamTxBx="{Binding Path=OffSr,
+                                        ParamTxBx="{Binding Path=OffSl,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+         </Expander>
                               ParamTxBx="{Binding Path=OffSl,
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <UniformGrid Columns="2">
-                                     ParamTxBl="{Binding InvertToolDirTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                                     ParamChBx="{Binding Path=InvertToolDir,
+                             Margin="2.5"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                      ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:ComboParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                                  ParamTxBl="{Binding FaceUseTypeTxBl}" 
+                          Grid.Column="1"
-                                  ParamCmBxList="{Binding Path=FaceUseTypeList,
+                          HorizontalAlignment="Right"
-                                   UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                   ValidatesOnDataErrors=True}"
+                          Width="20">
-                                  ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                  </Button>
-                    <EgtWPFLib5:StringParamV 
+               </UniformGrid>
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+            </Expander.Header>
-                               ParamTxBx="{Binding Path=InitAngs,
+            <Grid>
-                                UpdateSourceTrigger=PropertyChanged,
+               <Grid.RowDefinitions>
-                                ValidatesOnDataErrors=True}" 
+                  <RowDefinition Height="1*"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                  <RowDefinition Height="Auto"/>
-                    <EgtWPFLib5:StringParamV 
+               </Grid.RowDefinitions>
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+               <StackPanel>
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                  <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertToolDirTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                          ParamChBx="{Binding Path=InvertToolDir,
-                                ValidatesOnDataErrors=True}" 
+                                                              UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                              ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:ComboParamV 
+                                          Style="{DynamicResource CheckParamV_Margin}"/>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding FaceUseTypeTxBl}" 
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+                                          ParamCmBxList="{Binding Path=FaceUseTypeList,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                                  UpdateSourceTrigger=PropertyChanged,
-                                   ValidatesOnDataErrors=True,
+                                                                  ValidatesOnDataErrors=True}"
-                                   Mode=OneWay}"
+                                          ParamCmBxSelIndex="{Binding Path=SelectedFaceUseType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                                          Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
-                </StackPanel>
+                                           ParamTxBx="{Binding Path=InitAngs,
-            </Expander>
+                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=StartAddLen,
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=StartAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiTangTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LiTang,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LiTangTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LiTang,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiPerpTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=LiPerp,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding LiPerpTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=LiPerp,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiElevTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=LiElev,
-                                      ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBl="{Binding LiElevTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LiCompLenTxBl}" 
-                                     ParamTxBx="{Binding Path=LiElev,
+                                        ParamTxBx="{Binding Path=LiCompLen,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                                     ParamTxBl="{Binding LiCompLenTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=LiCompLen,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=EndAddLen,
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=EndAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoTangTxBl}" 
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=LoTang,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding LoTangTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=LoTang,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoPerpTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=LoPerp,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding LoPerpTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=LoPerp,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoElevTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=LoElev,
-                                      ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBl="{Binding LoElevTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding LoCompLenTxBl}" 
-                                     ParamTxBx="{Binding Path=LoElev,
+                                        ParamTxBx="{Binding Path=LoCompLen,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}" 
+                                                            ValidatesOnDataErrors=True}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                                     ParamTxBl="{Binding LoCompLenTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=LoCompLen,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}" 
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding LeaveTabTxBl}" 
-                                     ParamTxBl="{Binding LeaveTabTxBl}" 
+                                       ParamChBx="{Binding Path=LeaveTab,
-                                     ParamChBx="{Binding Path=LeaveTab,
+                                                           UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                           ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                       Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel Margin="2">
-                <StackPanel Margin="2">
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=TabLen,
-                                     ParamTxBl="{Binding TabLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=TabLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
-                                      ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                        ParamErrorMsg="{Binding Path=TabLenErrorMsg}"
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabHeightTxBl}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TabHeight,
-                            <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding TabHeightTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=TabHeight,
+                                        ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabAngleTxBl}" 
-                        ParamErrorMsg="{Binding Path=TabHeightErrorMsg}"
+                                        ParamTxBx="{Binding Path=TabAngle,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding TabAngleTxBl}" 
+                                        ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
-                                     ParamTxBx="{Binding Path=TabAngle,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabDistTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=TabDist,
-                        ParamErrorMsg="{Binding Path=TabAngleErrorMsg}"
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}"
-                    <EgtWPFLib5:StringParamV 
+                                        ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
-                                     ParamTxBl="{Binding TabDistTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=TabDist,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMinTxBl}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=TabMin,
-                                      ValidatesOnDataErrors=True}"
+                                                            UpdateSourceTrigger=PropertyChanged,
-                        ParamErrorMsg="{Binding Path=TabDistErrorMsg}"
+                                                            ValidatesOnDataErrors=True}"
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBl="{Binding TabMinTxBl}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TabMaxTxBl}" 
-                                     ParamTxBx="{Binding Path=TabMin,
+                                        ParamTxBx="{Binding Path=TabMax,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                      ValidatesOnDataErrors=True}"
+                                                            ValidatesOnDataErrors=True}"
-                        ParamErrorMsg="{Binding Path=TabMinErrorMsg}"
+                                        ParamErrorMsg="{Binding Path=TabMaxErrorMsg}"
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                    <EgtWPFLib5:StringParamV 
+            </StackPanel>
-                                     ParamTxBl="{Binding TabMaxTxBl}" 
+         </Expander>
                                     ParamTxBx="{Binding Path=TabMax,
                                      UpdateSourceTrigger=PropertyChanged,
                                      ValidatesOnDataErrors=True}"
                        ParamErrorMsg="{Binding Path=TabMaxErrorMsg}"
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:CheckParamV 
+               <EgtWPFLib5:CheckParamV ParamTxBl="{Binding OscEnableTxBl}" 
-                                     ParamTxBl="{Binding OscEnableTxBl}" 
+                                       ParamChBx="{Binding Path=OscEnable,
-                                     ParamChBx="{Binding Path=OscEnable,
+                                                           UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                           ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                       Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel Margin="2">
-                <StackPanel Margin="2">
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OscHeightTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=OscHeight,
-                                     ParamTxBl="{Binding OscHeightTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBx="{Binding Path=OscHeight,
+                                                            ValidatesOnDataErrors=True}" 
-                                      UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OscRampLenTxBl}" 
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=OscRampLen,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                     ParamTxBl="{Binding OscRampLenTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBx="{Binding Path=OscRampLen,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                      UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OscFlatLenTxBl}" 
-                                      ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=OscFlatLen,
-                        Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                                     ParamTxBl="{Binding OscFlatLenTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                     ParamTxBx="{Binding Path=OscFlatLen,
+            </StackPanel>
-                                      UpdateSourceTrigger=PropertyChanged,
+         </Expander>
                                      ValidatesOnDataErrors=True}" 
                        Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamErrorMsg="{Binding Path=SpeedErrorMsg}"
-                               ParamErrorMsg="{Binding Path=SpeedErrorMsg}"
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class WoodMillingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class WoodMillingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WoodMillingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class WoodMillingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -1,10 +1,10 @@
 <UserControl x:Class="WoodSawingParameterExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
   <UserControl.Resources>
      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
@@ -75,225 +75,286 @@
   <StackPanel Name="OperationParametersStackPanel">
      <StackPanel Name="OperationFirstParametersStackPanel">
-            <UniformGrid Columns="2">
+         <UniformGrid Columns="2">
-                <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
+            <TextBlock Text="{Binding DepthStrTxBl}" Style="{DynamicResource MPExpander_DepthTxBlMargin}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
+            <EgtWPFLib5:EgtTextBox Text="{Binding DepthStr, UpdateSourceTrigger=PropertyChanged,
                                                  Converter={StaticResource DepthUnitConverter}}"
-                                       Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
+                                   Style="{DynamicResource MPExpander_DepthTxBxMargin}"/>
-            </UniformGrid>
+         </UniformGrid>
-            <EgtWPFLib5:CheckParamV 
+         <EgtWPFLib5:CheckParamV ParamTxBl="{Binding InvertTxBl}" 
-                                     ParamTxBl="{Binding InvertTxBl}" 
+                                 ParamChBx="{Binding Path=Invert,
-                                     ParamChBx="{Binding Path=Invert,
+                                                     UpdateSourceTrigger=PropertyChanged,
-                                      UpdateSourceTrigger=PropertyChanged,
+                                                     ValidatesOnDataErrors=True}" 
-                                      ValidatesOnDataErrors=True}" 
+                                 Style="{DynamicResource CheckParamV_Margin}"/>
-                                     Style="{DynamicResource CheckParamV_Margin}"/>
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding WorkSideTxBl}" 
-            <EgtWPFLib5:ComboParamV 
+                                 ParamCmBxList="{Binding Path=WorkSideList,
-                                  ParamTxBl="{Binding WorkSideTxBl}" 
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxList="{Binding Path=WorkSideList,
+                                                         ValidatesOnDataErrors=True}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                 ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
-                                   ValidatesOnDataErrors=True}"
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedWorkSide}" 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding HeadSideTxBl}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                 ParamCmBxList="{Binding Path=HeadSideList,
-            <EgtWPFLib5:ComboParamV 
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                  ParamTxBl="{Binding HeadSideTxBl}" 
+                                                         ValidatesOnDataErrors=True}"
-                                  ParamCmBxList="{Binding Path=HeadSideList,
+                                 ParamCmBxSelIndex="{Binding Path=SelectedHeadSide}" 
-                                   UpdateSourceTrigger=PropertyChanged,
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
-                                   ValidatesOnDataErrors=True}"
+         <UniformGrid Columns="2">
-                                  ParamCmBxSelIndex="{Binding Path=SelectedHeadSide}" 
+            <TextBlock Text="{Binding UserNotesTxBl}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-            <UniformGrid Columns="2">
+            <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
-                <TextBlock Text="{Binding UserNotesTxBl}" 
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+               <EgtWPFLib5:EgtTextBox.ToolTip>
-                <EgtWPFLib5:EgtTextBox Text="{Binding UserNotes, UpdateSourceTrigger=PropertyChanged}" 
+                  <TextBlock Text="{Binding UserNotesTooltip}"/>
-                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}">
+               </EgtWPFLib5:EgtTextBox.ToolTip>
-                    <EgtWPFLib5:EgtTextBox.ToolTip>
+            </EgtWPFLib5:EgtTextBox>
-                        <TextBlock Text="{Binding UserNotesTooltip}"/>
+            <TextBlock Text="{Binding SystemNotesTxBl}" 
-                    </EgtWPFLib5:EgtTextBox.ToolTip>
+                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
-                </EgtWPFLib5:EgtTextBox>
+                       Visibility="{Binding SysNotes_Visibility}"/>
-                <TextBlock Text="{Binding SystemNotesTxBl}" 
+            <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
-                           Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"
+                                   Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
-                           Visibility="{Binding SysNotes_Visibility}"/>
+                                   Visibility="{Binding SysNotes_Visibility}"
-                <EgtWPFLib5:EgtTextBox Text="{Binding SystemNotes, UpdateSourceTrigger=PropertyChanged}" 
+                                   IsReadOnly="True"/>
                                       Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"
                                       Visibility="{Binding SysNotes_Visibility}"
                                       IsReadOnly="True"/>
         </UniformGrid>
      </StackPanel>
-        <StackPanel Name="AutomaticCloseExpanderStackPanel">
+      <StackPanel Name="AutomaticCloseExpanderStackPanel">
-            <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
+         <Expander Header="{Binding GenericExpanderHeader}" Name="GenericExpander"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartPosTxBl}" 
-                               ParamTxBl="{Binding StartPosTxBl}" 
+                                        ParamTxBx="{Binding Path=StartPos,
-                               ParamTxBx="{Binding Path=StartPos,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding StepTypeTxBl}" 
-                    <EgtWPFLib5:ComboParamV 
+                                       ParamCmBxList="{Binding Path=StepTypeList,
-                                  ParamTxBl="{Binding StepTypeTxBl}" 
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                  ParamCmBxList="{Binding Path=StepTypeList,
+                                                               ValidatesOnDataErrors=True}"
-                                   UpdateSourceTrigger=PropertyChanged,
+                                       ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
-                                   ValidatesOnDataErrors=True}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedStepType}"
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StepParTxBl}" 
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=StepPar,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBl="{Binding StepParTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBx="{Binding Path=StepPar,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SideAngleTxBl}" 
-                                ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=SideAngle,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                               ParamTxBl="{Binding SideAngleTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBx="{Binding Path=SideAngle,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding OffsetSlTxBl}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=OffSl,
-                                ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               ParamTxBl="{Binding OffsetSlTxBl}" 
+            </StackPanel>
-                               ParamTxBx="{Binding Path=OffSl,
+         </Expander>
                                UpdateSourceTrigger=PropertyChanged,
                                ValidatesOnDataErrors=True}" 
                               Style="{DynamicResource StringParamV_Margin}"/>
                </StackPanel>
            </Expander>
-            <Expander Header="{Binding AdvancedParamMsg}" Name="AdvancedParam"
+         <Expander Name="AdvancedParam" IsExpanded="{Binding AdvancedParamIsExpander}"
-            Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
-                <StackPanel>
+            <Expander.Header>
-                    <EgtWPFLib5:StringParamV 
+               <UniformGrid Columns="2">
-                               ParamTxBl="{Binding InitAngsTxBl}" 
+                  <TextBlock Text="{Binding AdvancedParamMsg}"
-                               ParamTxBx="{Binding Path=InitAngs,
+                             Margin="2.5"/>
-                                UpdateSourceTrigger=PropertyChanged,
+                  <Button Command="{Binding ShowNoteListComboCommand}"
-                                ValidatesOnDataErrors=True}" 
+                          IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                          Visibility="{Binding ShowNoteListCombo_Visibility}"
-                    <EgtWPFLib5:StringParamV 
+                          ToolTip="{Binding ShowNoteToolTip}"
-                               ParamTxBl="{Binding BlockedAxisTxBl}" 
+                          Grid.Column="1"
-                               ParamTxBx="{Binding Path=BlockedAxis,
+                          HorizontalAlignment="Right"
-                                UpdateSourceTrigger=PropertyChanged,
+                          Margin="2.5,2.5,7,2.5"
-                                ValidatesOnDataErrors=True}" 
+                          Width="20">
-                               Style="{DynamicResource StringParamV_Margin}"/>
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-                    <EgtWPFLib5:ComboParamV 
+                  </Button>
-                                  ParamTxBl="{Binding SolChoiceTypeTxBl}" 
+               </UniformGrid>
-                                  ParamCmBxList="{Binding Path=SolChoiceTypeList,
+            </Expander.Header>
-                                   UpdateSourceTrigger=PropertyChanged,
+            <Grid>
-                                   ValidatesOnDataErrors=True,
+               <Grid.RowDefinitions>
-                                   Mode=OneWay}"
+                  <RowDefinition Height="1*"/>
-                                  ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
+                  <RowDefinition Height="Auto"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+               </Grid.RowDefinitions>
-                </StackPanel>
+               <StackPanel>
-            </Expander>
+                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding InitAngsTxBl}" 
                                           ParamTxBx="{Binding Path=InitAngs,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding BlockedAxisTxBl}" 
                                           ParamTxBx="{Binding Path=BlockedAxis,
                                                               UpdateSourceTrigger=PropertyChanged,
                                                               ValidatesOnDataErrors=True}" 
                                           Style="{DynamicResource StringParamV_Margin}"/>
                  <EgtWPFLib5:ComboParamV ParamTxBl="{Binding SolChoiceTypeTxBl}" 
                                          ParamCmBxList="{Binding Path=SolChoiceTypeList,
                                                                  UpdateSourceTrigger=PropertyChanged,
                                                                  ValidatesOnDataErrors=True,
                                                                  Mode=OneWay}"
                                          ParamCmBxSelIndex="{Binding Path=SelectedSolChoiceType}"
                                          Style="{DynamicResource ComboParamV_Margin}"/>
               </StackPanel>
               <Grid Grid.Row="1" Margin="0,5,0,0">
                  <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
                  </Grid.ColumnDefinitions>
                  <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="Auto"/>
                  </Grid.RowDefinitions>
                  <ItemsControl ItemsSource="{Binding NotesList}">
                     <ItemsControl.ItemTemplate>
                        <DataTemplate>
                           <Grid>
                              <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="Auto"/>
                              </Grid.ColumnDefinitions>
                              <TextBlock Text="{Binding Description}"
                                         Margin="0,5.5,29,0"
                                         Width="82"
                                         Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
                              <TabControl SelectedIndex="{Binding SelTypeValue}"
                                          Grid.Column="1"
                                          Background="Transparent"
                                          BorderBrush="Transparent">
                                 <TabControl.ItemContainerStyle>
                                    <Style TargetType="{x:Type TabItem}">
                                       <Setter Property="Visibility" Value="Collapsed"/>
                                    </Style>
                                 </TabControl.ItemContainerStyle>
                                 <TabItem Header="TEXT">
                                    <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
                                             IsReadOnly="False"/>
                                 </TabItem>
                                 <TabItem Header="CHECKBOX">
                                    <CheckBox IsChecked="{Binding Value}"/>
                                 </TabItem>
                              </TabControl>
                              <Button Command="{Binding RemoveItemNoteCommand}"
                                      Grid.Column="2"
                                      Width="20"
                                      Height="20"
                                      Margin="5,0,0,0">
                                 <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
                              </Button>
                           </Grid>
                        </DataTemplate>
                     </ItemsControl.ItemTemplate>
                  </ItemsControl>
                  <ComboBox ItemsSource="{Binding NotesListCombo}"
                            SelectedItem="{Binding SelNoteItemCombo}"
                            Grid.Row="1"
                            Grid.ColumnSpan="1"
                            Visibility="{Binding ComboAddVisibility}">
                     <ComboBox.ItemTemplate>
                        <DataTemplate>
                           <TextBlock Text="{Binding Description}"
                                      Margin="2.5"/>
                        </DataTemplate>
                     </ComboBox.ItemTemplate>
                  </ComboBox>
               </Grid>
            </Grid>
         </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadInTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadInTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadInTypeList,
-                                  ParamCmBxList="{Binding Path=LeadInTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadInType}" 
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=StartAddLen,
-                               ParamTxBl="{Binding StartAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=StartAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+            </StackPanel>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         </Expander>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding LeadOutTypeTxBl}" 
-                                  ParamTxBl="{Binding LeadOutTypeTxBl}" 
+                                       ParamCmBxList="{Binding Path=LeadOutTypeList,
-                                  ParamCmBxList="{Binding Path=LeadOutTypeList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True}"
-                                   ValidatesOnDataErrors=True}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedLeadOutType}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel>
-                <StackPanel>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndAddLenTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=EndAddLen,
-                               ParamTxBl="{Binding EndAddLenTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=EndAddLen,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+            </StackPanel>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         </Expander>
                </StackPanel>
            </Expander>
-            <EgtWPFLib5:ComboParamV 
+         <EgtWPFLib5:ComboParamV ParamTxBl="{Binding ExtLinkTypeTxBl}" 
-                                  ParamTxBl="{Binding ExtLinkTypeTxBl}" 
+                                 ParamCmBxList="{Binding Path=ExtLinkTypeList,
-                                  ParamCmBxList="{Binding Path=ExtLinkTypeList,
+                                                         UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True, 
-                                   ValidatesOnDataErrors=True, 
+                                                         Mode=OneWay}"
-                                   Mode=OneWay}"
+                                 ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedExtLinkType}"
+                                 Style="{DynamicResource ComboParamV_Margin}"/>
                                  Style="{DynamicResource ComboParamV_Margin}"/>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <EgtWPFLib5:ComboParamV 
+               <EgtWPFLib5:ComboParamV ParamTxBl="{Binding CurveUseTxBl}" 
-                                  ParamTxBl="{Binding CurveUseTxBl}" 
+                                       ParamCmBxList="{Binding Path=CurveUseList,
-                                  ParamCmBxList="{Binding Path=CurveUseList,
+                                                               UpdateSourceTrigger=PropertyChanged,
-                                   UpdateSourceTrigger=PropertyChanged,
+                                                               ValidatesOnDataErrors=True, 
-                                   ValidatesOnDataErrors=True, 
+                                                               Mode=OneWay}"
-                                   Mode=OneWay}"
+                                       ParamCmBxSelIndex="{Binding Path=SelectedCurveUse}"
-                                  ParamCmBxSelIndex="{Binding Path=SelectedCurveUse}"
+                                       Style="{DynamicResource ComboParamV_Margin}"/>
-                                  Style="{DynamicResource ComboParamV_Margin}"/>
+            </Expander.Header>
-                </Expander.Header>
+            <StackPanel Margin="2">
-                <StackPanel Margin="2">
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding ApproxTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Approx,
-                               ParamTxBl="{Binding ApproxTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                               ParamTxBx="{Binding Path=Approx,
+                                                            ValidatesOnDataErrors=True}" 
-                                UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                                ValidatesOnDataErrors=True}" 
+            </StackPanel>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+         </Expander>
                </StackPanel>
            </Expander>
-            <Expander Style="{StaticResource ExpanderStyle}">
+         <Expander Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
+            <Expander.Header>
-                    <TextBlock Text="{Binding ToolExpanderHeader}"/>
+               <TextBlock Text="{Binding ToolExpanderHeader}"/>
-                </Expander.Header>
+            </Expander.Header>
-                <StackPanel>
+            <StackPanel>
-                    <EgtWPFLib5:StringParamV 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding SpeedTxBl}" 
-                               ParamTxBl="{Binding SpeedTxBl}" 
+                                        ParamTxBx="{Binding Path=Speed,
-                               ParamTxBx="{Binding Path=Speed,
+                                                            UpdateSourceTrigger=PropertyChanged,
-                                UpdateSourceTrigger=PropertyChanged,
+                                                            ValidatesOnDataErrors=True}" 
-                                ValidatesOnDataErrors=True}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                               Style="{DynamicResource StringParamV_Margin}"/>
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding FeedTxBl}" 
-                    <EgtWPFLib5:StringParamV 
+                                        ParamTxBx="{Binding Path=Feed,
-                          ParamTxBl="{Binding FeedTxBl}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBx="{Binding Path=Feed,
+                                                            ValidatesOnDataErrors=True}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           ValidatesOnDataErrors=True}" 
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding TipFeedTxBl}" 
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                        ParamTxBx="{Binding Path=TipFeed,
-                    <EgtWPFLib5:StringParamV 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          ParamTxBl="{Binding TipFeedTxBl}" 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBx="{Binding Path=TipFeed,
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                           UpdateSourceTrigger=PropertyChanged,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding StartFeedTxBl}" 
-                           ValidatesOnDataErrors=True}" 
+                                        ParamTxBx="{Binding Path=StartFeed,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            UpdateSourceTrigger=PropertyChanged,
-                    <EgtWPFLib5:StringParamV 
+                                                            ValidatesOnDataErrors=True}" 
-                          ParamTxBl="{Binding StartFeedTxBl}" 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBx="{Binding Path=StartFeed,
+               <EgtWPFLib5:StringParamV ParamTxBl="{Binding EndFeedTxBl}" 
-                           UpdateSourceTrigger=PropertyChanged,
+                                        ParamTxBx="{Binding Path=EndFeed,
-                           ValidatesOnDataErrors=True}" 
+                                                            UpdateSourceTrigger=PropertyChanged,
-                          Style="{DynamicResource StringParamV_Margin}"/>
+                                                            ValidatesOnDataErrors=True}" 
-                    <EgtWPFLib5:StringParamV 
+                                        Style="{DynamicResource StringParamV_Margin}"/>
-                          ParamTxBl="{Binding EndFeedTxBl}" 
+            </StackPanel>
-                          ParamTxBx="{Binding Path=EndFeed,
+         </Expander>
-                           UpdateSourceTrigger=PropertyChanged,
+         <Interactivity:Interaction.Behaviors>
-                           ValidatesOnDataErrors=True}" 
+            <EgtCAM5:AutomaticCloseExpander/>
-                          Style="{DynamicResource StringParamV_Margin}"/>
+         </Interactivity:Interaction.Behaviors>
-                </StackPanel>
+      </StackPanel>
-            </Expander>
+   </StackPanel>
            <Interactivity:Interaction.Behaviors>
                <EgtCAM5:AutomaticCloseExpander/>
            </Interactivity:Interaction.Behaviors>
        </StackPanel>
    </StackPanel>
 </UserControl>
@@ -3,17 +3,17 @@ Imports EgtWPFLib5.EgtFloating
 Public Class WoodSawingParameterExpanderV
-   Private EgtFloatingTray As EgtFloatingTray
+   Private m_RightTrayV As RightTrayV
   Private EgtFloatingPanel As EgtFloatingPanel
   Private m_bFirst As Boolean = True
   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      If m_bFirst Then
-         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         m_RightTrayV = FindAncestor(Of RightTrayV)(Me)
         EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-         AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
+         AddHandler m_RightTrayV.SizeChanged, AddressOf RightTrayV_SizeChanged
-         PanelHeight = EgtFloatingPanel.ActualHeight
+         PanelHeight = EgtFloatingPanel.DesiredSize.Height
         Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
         m_bFirst = False
      End If
@@ -22,7 +22,7 @@ Public Class WoodSawingParameterExpanderV
   Dim m_bSizeChanging As Boolean = False
-   Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+   Private Sub RightTrayV_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
      If m_bSizeChanging Then Return
      m_bSizeChanging = True
      CalculateOperationParametersStackPanelMaxHeight()
@@ -32,6 +32,7 @@ Public Class WoodSawingParameterExpanderV
   Dim PanelHeight As Double = 0
   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
   ' ricalcola spazio utilizzabile quando modificata dimensione finestra e quindi dimensione della tray
   Private Sub CalculateOperationParametersStackPanelMaxHeight()
      Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
      Dim OpenedExpanderList As New List(Of Boolean)
@@ -53,7 +54,7 @@ Public Class WoodSawingParameterExpanderV
            OpenedExpanderList.Add(False)
         End If
      Next
-      Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
+      Dim RemainingHeight As Double = m_RightTrayV.ActualHeight - PanelHeight
      AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
      For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
         If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
@@ -63,6 +63,7 @@ Public Class OperationListBoxItem
               Dim bEnabModif As Boolean = EgtGetEnableModified()
               EgtDisableModified()
               EgtResetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_CL))
               EgtResetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_DBL))
               EgtSetStatus(EgtGetFirstNameInGroup(Id, MCH_MGR_AUXVIEW), GDB_ST.OFF)
               SelData.ClearIdSub()
               If bEnabModif Then EgtEnableModified()
@@ -96,6 +97,7 @@ Public Class OperationListBoxItem
               Dim bEnabModif As Boolean = EgtGetEnableModified()
               EgtDisableModified()
               EgtSetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_CL))
               EgtSetMark(EgtGetFirstNameInGroup(Id, MCH_MGR_DBL))
               EgtSetStatus(EgtGetFirstNameInGroup(Id, MCH_MGR_AUXVIEW), GDB_ST.ON_)
               If bEnabModif Then EgtEnableModified()
               ' Seleziono la geometria della lavorazione
@@ -109,6 +109,7 @@ Public Class OperationParametersExpanderVM
            Exit For
         End If
      Next
      If IsNothing(selOperation) Then Return False
      If IsValidDispositionType(selOperation.m_Type) Then
         ParametersExpanderName = selOperation.Name
@@ -136,6 +137,8 @@ Public Class OperationParametersExpanderVM
         End While
         EgtDraw()
      ElseIf IsValidMachiningType(selOperation.m_Type) Then
         ' Imposto la fase di lavorazione corrente
         EgtSetCurrPhase(EgtGetOperationPhase(selOperation.m_Id))
         ' Leggo il tipo di operazione per impostare il tipo di selezione
         EgtSetCurrMachining(selOperation.m_Id)
         Dim sOpMach As String = String.Empty
@@ -488,6 +488,7 @@ Public Class OperationsListExpanderVM
            OnPropertyChanged( "MoveDown_IsEnabled")
            Map.refProjectVM.EmitTitle()
         Else
            Dim nCurrPhase As Integer = EgtGetOperationPhase(LastSelectedId)
            For index As Integer = 0 To indexes.Count - 1
               Dim nOpeId As Integer = OperationList( indexes( index) - 1).Id
               If EgtGetOperationType( nOpeId) <> MCH_OY.DISP Then
@@ -500,6 +501,8 @@ Public Class OperationsListExpanderVM
               EgtSetCurrMachining( PreviousId)
               EgtApplyMachining( False)
            End If
            Dim nNewPhase As Integer = EgtGetOperationPhase(LastSelectedId)
            If nNewPhase <> nCurrPhase Then EgtSetCurrPhase( nNewPhase)
            EgtDraw()
            OnPropertyChanged( NameOf(MoveUp_IsEnabled))
            OnPropertyChanged( NameOf(MoveDown_IsEnabled))
@@ -720,6 +723,7 @@ Public Class OperationsListExpanderVM
         selOperation.m_Type = MCH_OY.DISP Then Return
      ' Tolgo Mark da lavorazione originale
      EgtResetMark(EgtGetFirstNameInGroup(selOperation.Id, MCH_MGR_CL))
      EgtResetMark(EgtGetFirstNameInGroup(selOperation.Id, MCH_MGR_DBL))
      EgtSetStatus(EgtGetFirstNameInGroup(selOperation.Id, MCH_MGR_AUXVIEW), GDB_ST.OFF)
      SelData.ClearIdSub()
      ' Eseguo la copia
@@ -967,8 +971,8 @@ Public Class OperationsListExpanderVM
      Map.refProjectVM.SceneSelMode = SceneSelModeOpt.ALL
      OnPropertyChanged("ListIsExpanded")
      Map.refMachinePanelVM.ToolMachSetUpIsEnabled(True, True, True)
-      Map.refDoorPanelVM.MTableIsEnabled(True)
+      If Not IsNothing(Map.refDoorPanelVM) Then Map.refDoorPanelVM.MTableIsEnabled(True)
-      Map.refSpecialPanelVM.SpecialPanelIsEnabled(True)
+      If Not IsNothing(Map.refSpecialPanelVM) Then Map.refSpecialPanelVM.SpecialPanelIsEnabled(True)
      Return True
   End Function
@@ -1184,15 +1188,15 @@ Public Class OperationsListExpanderVM
      Next
   End Sub
-   Friend Function IsInOperationList(nId As Integer) As Boolean
+   Friend Function GetOperationId(nId As Integer) As Integer
-      Dim nOpId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nId)))
+      Dim nOpeId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nId)))
      For Index = 0 To OperationList.Count - 1
-         Dim nOpType As Integer = EgtGetOperationType(nOpId)
+         Dim nOpeType As Integer = EgtGetOperationType(nOpeId)
-         If OperationList(Index).Id = nOpId And nOpType <> MCH_OY.NONE And nOpType <> MCH_OY.DISP Then
+         If OperationList(Index).Id = nOpeId And nOpeType <> MCH_OY.NONE And nOpeType <> MCH_OY.DISP Then
-            Return True
+            Return nOpeId
         End If
      Next
-      Return False
+      Return GDB_ID.NULL
   End Function
   Friend Sub DeselOperationFromId()
@@ -1,129 +0,0 @@
 Imports System.ComponentModel
 Imports EgtUILib
 Public Class MachineAxis
   Implements INotifyPropertyChanged
   Private m_IsReadOnlyAxesValue As Boolean
   Public Property IsReadOnlyAxesValue As Boolean
      Get
         Return m_IsReadOnlyAxesValue
      End Get
      Set(value As Boolean)
         If value <> m_IsReadOnlyAxesValue Then
            m_IsReadOnlyAxesValue = value
            NotifyPropertyChanged("IsReadOnlyAxesValue")
            NotifyPropertyChanged("IsEnabledAxesValue")
         End If
      End Set
   End Property
   Public ReadOnly Property IsEnabledAxesValue As Boolean
      Get
         Return Not m_IsReadOnlyAxesValue
      End Get
   End Property
   ' Definizione comandi
   Private m_cmdManualAxisModify As ICommand
   Private m_Name As String
   Public Property Name As String
      Get
         Return m_Name
      End Get
      Set(value As String)
         m_Name = value
         UpdateInvert()
      End Set
   End Property
   Private m_Token As String
   Public Property Token As String
      Get
         Return m_Token
      End Get
      Set(value As String)
         If value <> m_Token Then
            m_Token = value
            NotifyPropertyChanged("Token")
         End If
      End Set
   End Property
   Private m_bLinear As Boolean = True
   Public WriteOnly Property Linear As Boolean
      Set(value As Boolean)
         m_bLinear = value
      End Set
   End Property
   Private m_bInvert As Boolean = False
   Private Function UpdateInvert() As Boolean
      Return EgtGetAxisInvert(m_Name, m_bInvert)
   End Function
   Private m_Value As String
   Public Property Value As String
      Get
         Return m_Value
      End Get
      Set(value As String)
         m_Value = value
         NotifyPropertyChanged("Value")
      End Set
   End Property
   Sub New()
      IsReadOnlyAxesValue = True
   End Sub
 #Region "COMMANDS"
 #Region "ManualAxisModifyCommand"
   ''' <summary>
   ''' Returns a command that create a new tool.
   ''' </summary>
   Public ReadOnly Property ManualAxisModifyCommand As ICommand
      Get
         If m_cmdManualAxisModify Is Nothing Then
            m_cmdManualAxisModify = New Command(AddressOf ManualAxisModify)
         End If
         Return m_cmdManualAxisModify
      End Get
   End Property
   ''' <summary>
   ''' Creata the new tool.  This method is invoked by the NewCommand.
   ''' </summary>
   Public Sub ManualAxisModify(ByVal param As Object)
      Dim dVal As Double
      If m_bLinear Then
         StringToLen(m_Value, dVal)
      Else
         StringToDouble(m_Value, dVal)
      End If
      If m_bInvert Then dVal = -dVal
      EgtSetAxisPos(m_Name, dVal)
      EgtGetAxisPos(m_Name, dVal)
      If m_bInvert Then dVal = -dVal
      If m_bLinear Then
         Value = LenToString(dVal, -3)
      Else
         Value = DoubleToString(dVal, -3)
      End If
      EgtDraw()
   End Sub
 #End Region ' ManualAxisModifyCommand
 #End Region
   Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged
   Public Sub NotifyPropertyChanged(propName As String)
      RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName))
   End Sub
 End Class
@@ -87,14 +87,12 @@
                                <TextBlock Text="{Binding Token}" FontSize="15"
                              HorizontalAlignment="Center" VerticalAlignment="Center"
                              TextWrapping="Wrap" TextAlignment="Center"/>
-                                <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Grid.Column="1"
+                                <EgtWPFLib5:EgtTextBox Text="{Binding Value, UpdateSourceTrigger=Explicit}" Grid.Column="1"
-                              IsReadOnly="{Binding IsReadOnlyAxesValue}"
+                                                        ExplicitUpdateSource="EnterKeyPress"
-                              IsEnabled="{Binding IsEnabledAxesValue}"
+                                                        IsReadOnly="{Binding IsReadOnlyAxesValue}"
-                              TextAlignment="Right">
+                                                        IsEnabled="{Binding IsEnabledAxesValue}"
-                                    <TextBox.InputBindings>
+                                                        TextAlignment="Right">
-                                        <KeyBinding Key="Enter" Command="{Binding ManualAxisModifyCommand}"/>
+                                </EgtWPFLib5:EgtTextBox>
                                    </TextBox.InputBindings>
                                </TextBox>
                            </Grid>
                        </DataTemplate>
@@ -176,7 +176,9 @@ Public Class SimulationExpanderVM
      Return True
   End Function
-   Private Function UpdateAllMachinings() As Boolean
+   Friend Function UpdateAllMachinings() As Boolean
      ' Se disabilitato, esco
      If GetPrivateProfileInt( S_MACH, K_AUTOUPDATEALLMACHININGS, 1) = 0 Then Return True   
      ' Eseguo ricalcolo
      Dim bModified As Boolean = EgtGetModified()
      Dim sErr As String = String.Empty
@@ -198,10 +200,12 @@ Public Class SimulationExpanderVM
      Dim nPhase As Integer = EgtGetCurrPhase()
      ' Aggiorno le lavorazioni
      If Not UpdateAllMachinings() Then EgtSetCurrPhase(If(nPhase = 0, 1, nPhase), True)
      ' Inizio simulazione
      Dim bOk As Boolean = EgtSimInit() AndAlso EgtSimStart()
      ' Costringo ad aggiornare UI
      UpdateUI()
-      ' Inizio simulazione
+      ' Messaggio in caso di errore
-      If Not EgtSimInit() OrElse Not EgtSimStart() Then
+      If Not bOk Then
         If EgtGetLastMachMgrErrorId() <> 0 Then
            Dim sErr As String = EgtGetLastMachMgrErrorString()
            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)                     '.... - ERRORE
@@ -250,6 +254,7 @@ Public Class SimulationExpanderVM
         Else
            MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)    'Errore sconosciuto - ERRORE
         End If
         SetSimulationStatus(MCH_SIM_ST.UI_STOP)
      End If
      Dim nShowDataCounter As Integer = 0
      While GetStatus() <> MCH_SIM_ST.UI_STOP
@@ -385,7 +390,11 @@ Public Class SimulationExpanderVM
         End If
      End If
      sCncFile = ""
-      sInfo = "EgtCAM5 ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
+      #If PLATFORM = "x64" Then
         sInfo = "EgtCAM5 64bit ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
      #Else
         sInfo = "EgtCAM5 ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
      #End If
      If EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_NCNAME, sCncFile) AndAlso Not String.IsNullOrWhiteSpace(sCncFile) Then
         sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile
      Else
@@ -1,13 +1,14 @@
-<UserControl x:Class="OptionPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="OptionPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+                              TitleBarOrientation="Vertical"
                              Visibility="{Binding Panel_Visibility}">
-    <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
+    <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
        <!--ContentPresenter that contains the ModePanel-->
        <ContentPresenter Content="{Binding ModePanel}"/>
    </StackPanel>
-</UserControl>
+</EgtFloating:EgtFloatingPanel>
@@ -1,7 +1,3 @@
 Public Class OptionPanelV
   Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
      Dim x = ciao.MaxHeight
   End Sub
 End Class
@@ -1,20 +1,12 @@
 Imports EgtUILib
 Public Class OptionPanelVM
-   Inherits ViewModelBase
+   Inherits BasePanelVM
   Private m_DrawIsChecked As Boolean = True
   Private m_MachiningIsChecked As Boolean = False
   Sub New()
      Map.SetRefOptionPanelVM(Me)
      DrawOptPanelV = New DrawOptionPanelV
      MachOptPanelV = New MachiningOptionPanelV
   End Sub
   Dim DrawOptPanelV As DrawOptionPanelV
   Dim MachOptPanelV As MachiningOptionPanelV
@@ -23,31 +15,43 @@ Public Class OptionPanelVM
   Public ReadOnly Property ModePanel As ContentControl
      Get
         DrawOptPanelV.DataContext = Nothing
         MachOptPanelV.DataContext = Nothing
         If Not IsNothing(Map.refDrawOptionPanelVM) And Not IsNothing(Map.refMachiningOptionPanelVM) Then
            If m_DrawIsChecked And Not m_MachiningIsChecked Then
               Map.refMachiningOptionPanelVM.ExitMachiningOptionPanel()
               Map.refDrawOptionPanelVM.InitDrawOptionPanel()
-               DrawOptPanelV.DataContext = Map.refDrawOptionPanelVM
+               If DrawOptPanelV.DataContext IsNot Map.refDrawOptionPanelVM Then
                  DrawOptPanelV.DataContext = Map.refDrawOptionPanelVM
               End If
               Return DrawOptPanelV
            End If
            If m_MachiningIsChecked And Not m_DrawIsChecked Then
               Map.refDrawOptionPanelVM.ExitDrawOptionPanel()
               Map.refMachiningOptionPanelVM.InitMachiningOptionPanel()
-               MachOptPanelV.DataContext = Map.refMachiningOptionPanelVM
+               If MachOptPanelV.DataContext IsNot Map.refMachiningOptionPanelVM Then
                  MachOptPanelV.DataContext = Map.refMachiningOptionPanelVM
               End If
               Return MachOptPanelV
            End If
         End If
         DrawOptPanelV.DataContext = Nothing
         MachOptPanelV.DataContext = Nothing
         Return Nothing
      End Get
   End Property
   Sub New()
      Map.SetRefOptionPanelVM(Me)
      SetPanelViewState(ViewPanelStates.ALWAYS)
      DrawOptPanelV = New DrawOptionPanelV
      MachOptPanelV = New MachiningOptionPanelV
   End Sub
   Friend Sub DrawMode_IsChecked()
      m_DrawIsChecked = True
      m_MachiningIsChecked = False
@@ -56,14 +60,14 @@ Public Class OptionPanelVM
         Map.refSimulationExpanderVM.Simulation_IsExpanded = False
         Map.refEstimationsExpanderVM.Estimation_IsExpanded = False
      End If
-      OnPropertyChanged("ModePanel")
+      NotifyPropertyChanged("ModePanel")
   End Sub
   Friend Sub MachiningMode_IsChecked()
      m_DrawIsChecked = False
      m_MachiningIsChecked = True
      EgtZoom(ZM.ALL, False)
-      OnPropertyChanged("ModePanel")
+      NotifyPropertyChanged("ModePanel")
   End Sub
 End Class
@@ -59,6 +59,13 @@ Friend Module OptionModule
   ' Variabile che indica se usare lo script per calcolare automaticamente la disposizione quando si passa in lavorazione
   Friend m_bUseDispositionScript As Boolean
   ' Variabili per gli Extra
   Friend m_bSpecialOn As Boolean
   Friend m_bBeamOn As Boolean
   Friend m_bWallOn As Boolean
   Friend m_bDoorsOn As Boolean
   Friend m_bGunstockOn As Boolean
   ' inizializzazione lettura variabili ad inizio programma
   Friend Sub InitOptionModule()
      ' Leggo elenco lingue disponibili da file ini
@@ -95,9 +102,9 @@ Friend Module OptionModule
      GetPrivateProfileColor(S_GRID, K_MINLNCOLOR, GridColor)
      m_GridColor = GridColor
      ' Inizializzo flag linee ingrossate
-      m_bThickLine = GetPrivateProfileInt(S_SCENE, K_LINEWIDTH, 1) <> 1
+      m_bThickLine = ( GetPrivateProfileInt(S_SCENE, K_LINEWIDTH, 1) <> 1)
      ' Inizializzo flag visualizzazione smussata delle superfici
-      m_bSmoothTriMesh = GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0
+      m_bSmoothTriMesh = ( GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
      ' Inizio colore di default in disegno
      Dim DefColor As New Color3d(0, 0, 0)
      GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
@@ -136,9 +143,15 @@ Friend Module OptionModule
      m_SelGeomSurfFinishing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
      m_SelGeomWaterJetting = SceneSelModeOpt.PARTCURVES
      ' Inizializzo variabile che indica posizione nuova operazione di lavorazione
-      m_bNewMachiningIsLastOne = If(GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0, True, False)
+      m_bNewMachiningIsLastOne = (GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0)
      ' Inizializzo variabile che indica se usare script di disposizione
-      m_bUseDispositionScript = If(GetPrivateProfileInt(S_OPTIONS, K_USEDISPOSITIONSCRIPT, 0) <> 0, True, False)
+      m_bUseDispositionScript = (GetPrivateProfileInt(S_OPTIONS, K_USEDISPOSITIONSCRIPT, 0) <> 0)
      ' Inizializzo variabili per Extra
      m_bSpecialOn = (GetPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) <> 0) 
      m_bBeamOn = (GetPrivateProfileInt(S_BEAM, K_BEAMENABLE, 0) <> 0) 
      m_bWallOn = (GetPrivateProfileInt(S_WALL, K_WALLENABLE, 0) <> 0) 
      m_bDoorsOn = (GetPrivateProfileInt(S_DOORS, K_DDFENABLE, 0) <> 0) 
      m_bGunstockOn = (GetPrivateProfileInt(S_GUNSTOCK, K_GUNSTOCKENABLE, 0) <> 0) 
   End Sub
 End Module
@@ -8,8 +8,8 @@
   BorderBrush="{StaticResource EgaltechBlue1}"
   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
   IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-   MinWidth="400" MinHeight="372"
+   MinWidth="400" MinHeight="382"
-   Width="400" Height="402"
+   Width="400" Height="412"
   CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
   <EgtWPFLib5:EgtCustomWindow.Resources>
@@ -75,6 +75,9 @@
                            SelectedItem="{Binding SelectedTextFont}" Height="25"
                            Margin="10,5,0,0"/>
            </UniformGrid>
            <Grid Margin="5,5,5,5">
               <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
            </Grid>
         </StackPanel>
      </TabItem>
      <TabItem Header="{Binding CADMsg}">
@@ -297,6 +300,52 @@
            </Grid>
         </StackPanel>
      </TabItem>
      <TabItem Header="{Binding ExtraMsg}">
         <StackPanel>
            <Grid Margin="5,20,5,0">
               <Grid.ColumnDefinitions>
                  <ColumnDefinition Width="1*"/>
                  <ColumnDefinition Width="1*"/>
                  <ColumnDefinition Width="1*"/>
               </Grid.ColumnDefinitions>
               <Grid.RowDefinitions>
                  <RowDefinition Height="1*"/>
                  <RowDefinition Height="1*"/>
                  <RowDefinition Height="1*"/>
                  <RowDefinition Height="1*"/>
                  <RowDefinition Height="1*"/>
               </Grid.RowDefinitions>
               <TextBlock Text="{Binding SpecialMsg}"
                          Grid.Row="0" Margin="0,5,0,5"/>
               <CheckBox IsChecked="{Binding SpecialOn}"
                         Grid.Row="0" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
               <TextBlock Text="{Binding BeamMsg}"
                          Grid.Row="1" Grid.Column="0" Margin="0,5,0,5"/>
               <CheckBox IsChecked="{Binding BeamOn}" IsEnabled="{Binding BeamEnabled}"
                         Grid.Row="1" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
               <Button Content="{Binding UpdateMsg}" IsEnabled="{Binding BeamActive}"
                       Command="{Binding UpdateBeam_Command}"
                       Grid.Row="1" Grid.Column="2" Height="26"/>
               <TextBlock Text="{Binding WallMsg}"
                          Grid.Row="2" Grid.Column="0" Margin="0,5,0,5"/>
               <CheckBox IsChecked="{Binding WallOn}" IsEnabled="{Binding WallEnabled}"
                         Grid.Row="2" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
               <Button Content="{Binding UpdateMsg}" IsEnabled="{Binding WallActive}"
                       Command="{Binding UpdateWall_Command}"
                       Grid.Row="2" Grid.Column="2" Height="26"/>
               <TextBlock Text="{Binding DoorsMsg}" VerticalAlignment="Center"
                          Grid.Row="3" Grid.Column="0" Margin="0,5,0,5"/>
               <CheckBox IsChecked="{Binding DoorsOn}" IsEnabled="{Binding DoorsEnabled}"
                         Grid.Row="3" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
               <TextBlock Text="{Binding GunstockMsg}" VerticalAlignment="Center"
                          Grid.Row="4" Grid.Column="0" Margin="0,5,0,5"/>
               <CheckBox IsChecked="{Binding GunstockOn}" IsEnabled="{Binding GunstockEnabled}"
                         Grid.Row="4" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
            </Grid>
         </StackPanel>   
      </TabItem>
   </TabControl>
 </EgtWPFLib5:EgtCustomWindow>
@@ -386,7 +386,7 @@ Public Class OptionWindowVM
      End Get
      Set(value As String)
         Dim nVal As Integer = 0
-         If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then
+         If Integer.TryParse(value, nVal) Then
            OptionModule.m_nDecDigit = nVal
            EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight)
            WritePrivateProfileString(S_DIMENSIONSTYLE, K_DECDIGIT, OptionModule.m_nDecDigit.ToString())
@@ -528,14 +528,98 @@ Public Class OptionWindowVM
      End Set
   End Property
   Public Property SpecialOn As Boolean
      Get
         Return OptionModule.m_bSpecialOn
      End Get
      Set(value As Boolean)
         OptionModule.m_bSpecialOn = value
         WritePrivateProfileString(S_SPECIAL, K_SPECIALENABLE, If( value, "1", "0"))
      End Set
   End Property
   Public ReadOnly Property BeamEnabled As Boolean
      Get
         Return (IniFile.m_nKeyOptions And KEY_OPT.BEAM) <> 0
      End Get
   End Property
   Public ReadOnly Property BeamActive As Boolean
      Get
         Return IniFile.IsActiveBeam()
      End Get
   End Property
   Public Property BeamOn As Boolean
      Get
         Return BeamEnabled AndAlso OptionModule.m_bBeamOn
      End Get
      Set(value As Boolean)
         OptionModule.m_bBeamOn = value
         WritePrivateProfileString(S_BEAM, K_BEAMENABLE, If( value, "1", "0"))
      End Set
   End Property
   Public ReadOnly Property WallEnabled As Boolean
      Get
         Return (IniFile.m_nKeyOptions And KEY_OPT.WALL) <> 0
      End Get
   End Property
   Public ReadOnly Property WallActive As Boolean
      Get
         Return IniFile.IsActiveWall()
      End Get
   End Property
   Public Property WallOn As Boolean
      Get
         Return WallEnabled AndAlso OptionModule.m_bWallOn
      End Get
      Set(value As Boolean)
         OptionModule.m_bWallOn = value
         WritePrivateProfileString(S_WALL, K_WALLENABLE, If( value, "1", "0"))
      End Set
   End Property
   Public ReadOnly Property DoorsEnabled As Boolean
      Get
         Return (IniFile.m_nKeyOptions And KEY_OPT.DOORS) <> 0
      End Get
   End Property
   Public Property DoorsOn As Boolean
      Get
         Return DoorsEnabled AndAlso OptionModule.m_bDoorsOn
      End Get
      Set(value As Boolean)
         OptionModule.m_bDoorsOn = value
         WritePrivateProfileString(S_DOORS, K_DDFENABLE, If( value, "1", "0"))
      End Set
   End Property
   Public ReadOnly Property GunstockEnabled As Boolean
      Get
         Return (IniFile.m_nKeyOptions And KEY_OPT.GUNSTOCK) <> 0
      End Get
   End Property
   Public Property GunstockOn As Boolean
      Get
         Return OptionModule.m_bGunstockOn
      End Get
      Set(value As Boolean)
         OptionModule.m_bGunstockOn = value
         WritePrivateProfileString(S_GUNSTOCK, K_GUNSTOCKENABLE, If( value, "1", "0"))
      End Set
   End Property
   ' Definizione comandi
   Private m_cmdCloseOptions As ICommand
   Private m_cmdTopSceneBackground As ICommand
   Private m_cmdBotSceneBackground As ICommand
   Private m_cmdGridColor As ICommand
   Private m_cmdUpdateLicenceCmd As ICommand
   Private m_cmdDefMaterialColor As ICommand
   Private m_cmdAddMachineCmd As ICommand
   Private m_cmdExportMachineCmd As ICommand
   Private m_cmdUpdateBeamCmd As ICommand
   Private m_cmdUpdateWallCmd As ICommand
 #Region "Messages"
@@ -586,6 +670,11 @@ Public Class OptionWindowVM
         Return EgtMsg( 6518)                     ' Superfici smussate
      End Get
   End Property
   Public ReadOnly Property UpdateLicenceMsg As String
      Get
         Return EgtMsg( 6553)                     ' Aggiorna licenza
      End Get
   End Property
   Public ReadOnly Property CADMsg As String
      Get
@@ -602,6 +691,46 @@ Public Class OptionWindowVM
         Return EgtMsg(MSG_OPTIONPAGE + 12)
      End Get
   End Property
   Public ReadOnly Property DimensionMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 44)   ' Quotatura
      End Get
   End Property
   Public ReadOnly Property ExtLineLenMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 37)   ' Estensione linea
      End Get
   End Property
   Public ReadOnly Property ArrowLenMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 38)   ' Dimensione freccia
      End Get
   End Property
   Public ReadOnly Property TextDistMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 39)   ' Distanza messaggio
      End Get
   End Property
   Public ReadOnly Property LenIsMMMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 40)   ' Unità di misura
      End Get
   End Property
   Public ReadOnly Property DecDigitMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 41)   ' Numero dicmali
      End Get
   End Property
   Public ReadOnly Property FontMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 42)   ' Caretteri
      End Get
   End Property
   Public ReadOnly Property TextHeightMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 43)   ' Dimensione testo
      End Get
   End Property
   Public ReadOnly Property ImportMsg As String
      Get
@@ -710,52 +839,45 @@ Public Class OptionWindowVM
         Return EgtMsg(MSG_OPTIONPAGE + 27)   ' Aggiungi macchina
      End Get
   End Property
   Public ReadOnly Property ExportMachineMsg As String
      Get
         Return EgtMsg(6549)   ' Esporta macchina
      End Get
   End Property
-   Public ReadOnly Property DimensionMsg As String
+   Public ReadOnly Property ExtraMsg As String
      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 44)   ' Quotatura
+         Return "Extra"
      End Get
   End Property
-
+   Public ReadOnly Property SpecialMsg As String
   Public ReadOnly Property ExtLineLenMsg As String
      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 37)   ' Estensione linea
+         Return "Special"
      End Get
   End Property
-   Public ReadOnly Property ArrowLenMsg As String
+   Public ReadOnly Property BeamMsg As String
      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 38)   ' Dimensione freccia
+         Return "Beam"
      End Get
   End Property
-   Public ReadOnly Property TextDistMsg As String
+   Public ReadOnly Property WallMsg As String
      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 39)   ' Distanza messaggio
+         Return "Wall"
      End Get
   End Property
-   Public ReadOnly Property LenIsMMMsg As String
+   Public ReadOnly Property DoorsMsg As String
      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 40)   ' Unità di misura
+         Return "Doors"
      End Get
   End Property
-   Public ReadOnly Property DecDigitMsg As String
+   Public ReadOnly Property GunstockMsg As String
      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 41)   ' Numero dicmali
+         Return "Gunstock"
      End Get
   End Property
-   Public ReadOnly Property FontMsg As String
+   Public ReadOnly Property UpdateMsg As String
      Get
-         Return EgtMsg(MSG_OPTIONPAGE + 42)   ' Caretteri
+         Return EgtMsg(6554)  ' Aggiorna
      End Get
   End Property
   Public ReadOnly Property TextHeightMsg As String
      Get
         Return EgtMsg(MSG_OPTIONPAGE + 43)   ' Dimensione testo
      End Get
   End Property
@@ -898,6 +1020,49 @@ Public Class OptionWindowVM
 #End Region ' DefMaterialColor
 #Region "UpdateLicence"
   ''' <summary>
   ''' Returns a command that update the licence.
   ''' </summary>
   Public ReadOnly Property UpdateLicence_Command() As ICommand
      Get
         If m_cmdUpdateLicenceCmd Is Nothing Then
            m_cmdUpdateLicenceCmd = New RelayCommand(AddressOf UpdateLicenceCmd)
         End If
         Return m_cmdUpdateLicenceCmd
      End Get
   End Property
   ''' <summary>
   ''' Update the licence.
   ''' </summary>
   Public Sub UpdateLicenceCmd()
      ' Apro dialogo per richiesta file licenza
      Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
         .DefaultExt = ".lic",
         .Filter = "Licences (.lic)|*.lic",
         .CheckFileExists = True,
         .ValidateNames = True
      }
      If LicDlg.ShowDialog() = True Then
         ' Recupero il direttorio del file
         Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
         ' Se il file non è già nel direttorio di configurazione lo copio
         If Not String.Equals(Path.GetFullPath(sDir), Path.GetFullPath(IniFile.m_sConfigDir), StringComparison.OrdinalIgnoreCase) Then
            Try
               File.Copy(LicDlg.FileName, Path.Combine(IniFile.m_sConfigDir, LicDlg.SafeFileName), True)
            Catch ex As Exception
               Return
            End Try
         End If
         ' Imposto il nuovo file di licenza nell'Ini
         WritePrivateProfileString(S_GENERAL, K_LICENCE, LicDlg.SafeFileName)
      End If
   End Sub
 #End Region ' AddMachine
 #Region "AddMachine"
   ''' <summary>
@@ -925,7 +1090,7 @@ Public Class OptionWindowVM
      }
      If MachDlg.ShowDialog() <> True Then Return
      Dim sMachZip As String = MachDlg.FileName
-      Dim sMachName As String = Path.GetFileNameWithoutExtension(sMachZip)
+      Dim sMachName As String = Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(sMachZip))
      Dim sMachDir As String = Path.Combine(IniFile.m_sMachinesRoot, sMachName)
      ' Preparo direttorio temporaneo
      Dim sTempDir As String = Path.Combine(IniFile.m_sMachinesRoot, "Temp")
@@ -1099,11 +1264,13 @@ Public Class OptionWindowVM
         File.Delete(sZipToCreate)
      End If
      Try
-         Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+         Using zip As New Ionic.Zip.ZipFile(sZipToCreate)
            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
            zip.AlternateEncoding = Text.Encoding.UTF8
            ' aggiungo i file della Macchina
            Dim sMachineDir As String = IniFile.m_sMachinesRoot & "\" & sCurrMachineName
            If Directory.Exists(sMachineDir) Then
-               zip.AddItem(sMachineDir, sCurrMachineName)
+               zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
            End If
            ' salvo lo zip
            zip.Save()
@@ -1114,6 +1281,7 @@ Public Class OptionWindowVM
         Dim sKo As String = String.Format(EgtMsg(6551), sCurrMachineName)
         EgtOutLog(sKo)
         MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
         return
      End Try
      'La macchina "{0}" è stata esportata con successo.
      Dim sOk As String = String.Format(EgtMsg(6552), sCurrMachineName)
@@ -1123,6 +1291,213 @@ Public Class OptionWindowVM
 #End Region ' ExportMachine
 #Region "UpdateBeam"
   Public ReadOnly Property UpdateBeam_Command() As ICommand
      Get
         If m_cmdUpdateBeamCmd Is Nothing Then
            m_cmdUpdateBeamCmd = New RelayCommand(AddressOf UpdateBeamCmd)
         End If
         Return m_cmdUpdateBeamCmd
      End Get
   End Property
   Public Sub UpdateBeamCmd()
      ' Recupero la versione del programma in esecuzione
      Dim sExeVer As String = IniFile.GetProgramVersion()
      ' Verifico presenza di una precedente installazione del Beam
      Dim sBeamVer As String = ""
      IniFile.GetSpecialLuaVersion( IniFile.m_sBeamDirPath, sBeamVer)
      If String.IsNullOrEmpty( sBeamVer) Then
         ' Il modulo "{0}" non è stato trovato, impossibile aggiornare. - Avviso
         Dim sOut As String = String.Format(EgtMsg(6555), "Beam") 
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
         ' Esco
         Return
      End If
      ' Apro dialogo per richiesta file zip del Beam
      Dim BeamDlg As New Microsoft.Win32.OpenFileDialog() With {
         .DefaultExt = ".zip",
         .Filter = "Beam (.zip)|*.zip",
         .CheckFileExists = True,
         .ValidateNames = True
      }
      If BeamDlg.ShowDialog() <> True Then Return
      Dim sBeamZip As String = BeamDlg.FileName
      ' Preparo direttorio temporaneo
      Dim sTempDir As String = Path.Combine(IniFile.m_sTempDir, "Beam")
      If My.Computer.FileSystem.DirectoryExists( sTempDir) Then
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
      End If
      My.Computer.FileSystem.CreateDirectory( sTempDir)
      ' Unzip nel direttorio temporaneo
      Using zip As New Ionic.Zip.ZipFile(sBeamZip)
         zip.ExtractAll( sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
      End Using
      ' Recupero i dati del nuovo Beam
      Dim sNewName = ""
      Dim sNewVer = ""
      Dim sNewMinExe = ""
      IniFile.GetSpecialLuaData( sTempDir, sNewName, sNewVer, sNewMinExe)
      ' Verifico che sia veramente il Beam
      If String.Compare(sNewName, "Beam") <> 0 Then
         ' Il file zip non contiene il modulo "{0}". - Avviso
         Dim sOut As String = String.Format(EgtMsg(6556), "Beam") 
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
         ' Rimuovo il direttorio temporaneo ed esco
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
         Return
      End If
      ' Verifico la versione minima del programma
      If String.Compare(sExeVer, sNewMinExe) < 0 Then
         ' Il nuovo modulo "{0}" richiede un programma con versione minima {1}. - Avviso
         Dim sOut As String = String.Format(EgtMsg(6557), "Beam", sNewMinExe)
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
         ' Rimuovo il direttorio temporaneo ed esco
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
         Return
      End If
      ' Verifico la versione del Beam e se più vecchia chiedo cosa fare
      If String.Compare(sNewVer, sBeamVer) < 0 Then
         ' La versione del nuovo modulo "{0}" è più vecchia dell'attuale. Vuoi sovrascrivere lo stesso ?
         Dim sOut As String = String.Format(EgtMsg(6558), "Beam")
         if MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
            ' Rimuovo il direttorio temporaneo ed esco
            My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
            Return
         End If
      End If
      ' Faccio una copia di backup del Beam corrente
      Dim sBackupDir As String = IniFile.m_sBeamDirPath & ".old"
      If My.Computer.FileSystem.DirectoryExists( sBackupDir) Then
         My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
      End If
      Try
         My.Computer.FileSystem.MoveDirectory( IniFile.m_sBeamDirPath, sBackupDir, True)
      Catch ex As Exception
         ' Ripristino lo stato originale ed esco
         My.Computer.FileSystem.MoveDirectory( sBackupDir, IniFile.m_sBeamDirPath, True)
         ' L'aggiornamento del modulo "{0}" non è riuscito. - Errore
         Dim sOut As String = String.Format(EgtMsg(6559), "Beam")
         EgtOutLog( sOut)
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
         ' Rimuovo il direttorio temporaneo ed esco
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
         Return
      End Try
      ' Installo il Beam
      My.Computer.FileSystem.MoveDirectory( sTempDir, IniFile.m_sBeamDirPath, True)
      ' Il modulo "{0}" è stata aggiornato con successo. - Info
      Dim sOk As String = String.Format(EgtMsg(6560), "Beam")
      EgtOutLog( sOk)
      MessageBox.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK)
   End Sub
 #End Region ' UpdateBeam
 #Region "UpdateWall"
   Public ReadOnly Property UpdateWall_Command() As ICommand
      Get
         If m_cmdUpdateWallCmd Is Nothing Then
            m_cmdUpdateWallCmd = New RelayCommand(AddressOf UpdateWallCmd)
         End If
         Return m_cmdUpdateWallCmd
      End Get
   End Property
   Public Sub UpdateWallCmd()
      ' Recupero la versione del programma in esecuzione
      Dim sExeVer As String = IniFile.GetProgramVersion()
      ' Verifico presenza di una precedente installazione del Wall
      Dim sWallVer As String = ""
      IniFile.GetSpecialLuaVersion( IniFile.m_sWallDirPath, sWallVer)
      If String.IsNullOrEmpty( sWallVer) Then
         ' Il modulo "{0}" non è stato trovato, impossibile aggiornare. - Avviso
         Dim sOut As String = String.Format(EgtMsg(6555), "Wall") 
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
         ' Esco
         Return
      End If
      ' Apro dialogo per richiesta file zip del Wall
      Dim WallDlg As New Microsoft.Win32.OpenFileDialog() With {
         .DefaultExt = ".zip",
         .Filter = "Wall (.zip)|*.zip",
         .CheckFileExists = True,
         .ValidateNames = True
      }
      If WallDlg.ShowDialog() <> True Then Return
      Dim sWallZip As String = WallDlg.FileName
      ' Preparo direttorio temporaneo
      Dim sTempDir As String = Path.Combine(IniFile.m_sTempDir, "Wall")
      If My.Computer.FileSystem.DirectoryExists( sTempDir) Then
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
      End If
      My.Computer.FileSystem.CreateDirectory( sTempDir)
      ' Unzip nel direttorio temporaneo
      Using zip As New Ionic.Zip.ZipFile(sWallZip)
         zip.ExtractAll( sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
      End Using
      ' Recupero i dati del nuovo Wall
      Dim sNewName = ""
      Dim sNewVer = ""
      Dim sNewMinExe = ""
      IniFile.GetSpecialLuaData( sTempDir, sNewName, sNewVer, sNewMinExe)
      ' Verifico che sia veramente il Wall
      If String.Compare(sNewName, "Wall") <> 0 Then
         ' Il file zip non contiene il modulo "{0}". - Avviso
         Dim sOut As String = String.Format(EgtMsg(6556), "Wall") 
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
         ' Rimuovo il direttorio temporaneo ed esco
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
         Return
      End If
      ' Verifico la versione minima del programma
      If String.Compare(sExeVer, sNewMinExe) < 0 Then
         ' Il nuovo modulo "{0}" richiede un programma con versione minima {1}. - Avviso
         Dim sOut As String = String.Format(EgtMsg(6557), "Wall", sNewMinExe)
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
         ' Rimuovo il direttorio temporaneo ed esco
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
         Return
      End If
      ' Verifico la versione del Wall e se più vecchia chiedo cosa fare
      If String.Compare(sNewVer, sWallVer) < 0 Then
         ' La versione del nuovo modulo "{0}" è più vecchia dell'attuale. Vuoi sovrascrivere lo stesso ?
         Dim sOut As String = String.Format(EgtMsg(6558), "Wall")
         if MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then
            ' Rimuovo il direttorio temporaneo ed esco
            My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
            Return
         End If
      End If
      ' Faccio una copia di backup del Wall corrente
      Dim sBackupDir As String = IniFile.m_sWallDirPath & ".old"
      If My.Computer.FileSystem.DirectoryExists( sBackupDir) Then
         My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
      End If
      Try
         My.Computer.FileSystem.MoveDirectory( IniFile.m_sWallDirPath, sBackupDir, True)
      Catch ex As Exception
         ' Ripristino lo stato originale ed esco
         My.Computer.FileSystem.MoveDirectory( sBackupDir, IniFile.m_sWallDirPath, True)
         ' L'aggiornamento del modulo "{0}" non è riuscito. - Errore
         Dim sOut As String = String.Format(EgtMsg(6559), "Wall")
         EgtOutLog( sOut)
         MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
         ' Rimuovo il direttorio temporaneo ed esco
         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
         Return
      End Try
      ' Installo il Wall
      My.Computer.FileSystem.MoveDirectory( sTempDir, IniFile.m_sWallDirPath, True)
      ' Il modulo "{0}" è stata aggiornato con successo. - Info
      Dim sOk As String = String.Format(EgtMsg(6560), "Wall")
      EgtOutLog( sOk)
      MessageBox.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK)
   End Sub
 #End Region ' UpdateWall
 #Region "CloseOptionsCommand"
   ''' <summary>
@@ -6,6 +6,9 @@
      <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneInvertCommand}" ToolTip="{Binding CPlaneInvertToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneInvert.png" Stretch="Uniform"/>
      </Button>
      <Button Command="{Binding CPlaneRotateCommand}" ToolTip="{Binding CPlaneRotateToolTip}" Style="{StaticResource GridViewPanelButton}">
         <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
      </Button>
@@ -7,6 +7,7 @@ Public Class PopUpGridPanelVM
   ' Definizione comandi
   Private m_cmdCPlaneView As ICommand
   Private m_cmdCPlaneInvert As ICommand
   Private m_cmdCPlaneRotate As ICommand
   Private m_cmdCPlane3P As ICommand
   Private m_cmdCPlanePerpObj As ICommand
@@ -19,6 +20,11 @@ Public Class PopUpGridPanelVM
         Return EgtMsg(MSG_GRIDVIEWPANEL + 25)
      End Get
   End Property
   Public ReadOnly Property CPlaneInvertToolTip As String
      Get
         Return EgtMsg(5285)
      End Get
   End Property
   Public ReadOnly Property CPlaneRotateToolTip As String
      Get
         Return EgtMsg(MSG_GRIDVIEWPANEL + 28)
@@ -70,6 +76,29 @@ Public Class PopUpGridPanelVM
 #End Region ' CPlaneViewCommand
 #Region "CPlaneInvertCommand"
   ''' <summary>
   ''' Returns a command that do CPlaneInvert.
   ''' </summary>
   Public ReadOnly Property CPlaneInvertCommand As ICommand
      Get
         If m_cmdCPlaneInvert Is Nothing Then
            m_cmdCPlaneInvert = New RelayCommand(AddressOf CPlaneInvert)
         End If
         Return m_cmdCPlaneInvert
      End Get
   End Property
   ''' <summary>
   ''' Execute the CPlaneInvert.  This method is invoked by the CPlaneInvertCommand.
   ''' </summary>
   Public Sub CPlaneInvert(ByVal param As Object)
      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.GRID_INVERT)
   End Sub
 #End Region
 #Region "CPlaneRotateCommand"
   ''' <summary>
@@ -12,9 +12,6 @@
      <Button ToolTip="{Binding ZoomSelToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomSelCommand}">
         <Image Source="/Resources/GridViewPanel/ZoomSel.png" Stretch="Uniform"/>
      </Button>
      <Button ToolTip="{Binding LookFromIso_SEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewSECommand}">
         <Image Source="/Resources/GridViewPanel/LookFromISO_SE.png" Stretch="Uniform"/>
      </Button>
      <Button ToolTip="{Binding LookFromIso_NEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNECommand}">
         <Image Source="/Resources/GridViewPanel/LookFromISO_NE.png" Stretch="Uniform"/>
      </Button>
@@ -9,7 +9,6 @@ Public Class PopUpViewPanelVM
   Private m_cmdZoomIn As ICommand
   Private m_cmdZoomOut As ICommand
   Private m_cmdZoomSel As ICommand
   Private m_cmdIsoViewSE As ICommand
   Private m_cmdIsoViewNE As ICommand
   Private m_cmdIsoViewNW As ICommand
   Private m_cmdViewToCPlane As ICommand
@@ -34,12 +33,6 @@ Public Class PopUpViewPanelVM
      End Get
   End Property
   Public ReadOnly Property LookFromIso_SEToolTip As String
      Get
         Return EgtMsg(MSG_GRIDVIEWPANEL + 13)
      End Get
   End Property
   Public ReadOnly Property LookFromIso_NEToolTip As String
      Get
         Return EgtMsg(MSG_GRIDVIEWPANEL + 14)
@@ -133,29 +126,6 @@ Public Class PopUpViewPanelVM
 #End Region ' ZoomOutCommand
 #Region "IsoViewSECommand"
   ''' <summary>
   ''' Returns a command that do IsoViewSE.
   ''' </summary>
   Public ReadOnly Property IsoViewSECommand As ICommand
      Get
         If m_cmdIsoViewSE Is Nothing Then
            m_cmdIsoViewSE = New RelayCommand(AddressOf IsoViewSE)
         End If
         Return m_cmdIsoViewSE
      End Get
   End Property
   ''' <summary>
   ''' Execute the IsoViewSE.  This method is invoked by the IsoViewSECommand.
   ''' </summary>
   Public Sub IsoViewSE(ByVal param As Object)
      Map.refProjectVM.GetScene.IsoViewSE()
   End Sub
 #End Region ' IsoViewSECommand
 #Region "IsoViewNECommand"
   ''' <summary>
@@ -1,101 +1,26 @@
-<UserControl x:Class="ProjectV"
+<ItemsControl x:Class="ProjectV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:local="clr-namespace:EgtCAM5"
+              xmlns:local="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+              xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              ItemsSource="{Binding PanelList}">
   <ItemsControl.ItemsPanel>
      <ItemsPanelTemplate>
         <DockPanel />
      </ItemsPanelTemplate>
   </ItemsControl.ItemsPanel>
   <ItemsControl.ItemContainerStyle>
      <Style>
         <Setter Property="DockPanel.Dock" Value="{Binding}" />
      </Style>
   </ItemsControl.ItemContainerStyle>
-    <interactivity:Interaction.Triggers>
+   <interactivity:Interaction.Triggers>
-        <interactivity:EventTrigger EventName="Loaded">
+      <interactivity:EventTrigger EventName="Loaded">
-            <interactivity:InvokeCommandAction Command="{Binding LoadedCommand}"/>
+         <interactivity:InvokeCommandAction Command="{Binding LoadedCommand}"/>
-        </interactivity:EventTrigger>
+      </interactivity:EventTrigger>
-    </interactivity:Interaction.Triggers>
+   </interactivity:Interaction.Triggers>
-    <EgtFloating:EgtFloatingManager>
+</ItemsControl>
        <EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top">
            <WrapPanel Orientation="Horizontal" Width="{Binding ActualWidth, ElementName=TOPTRAY}">
                <EgtFloating:EgtFloatingPanel Name="ShowPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:ShowPanelV DataContext="{StaticResource ShowPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="ViewPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:ViewPanelV DataContext="{StaticResource ViewPanelViewModel}"/>
                    <local:PopUpViewPanelV DataContext="{StaticResource PopUpViewPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
                </EgtFloating:EgtFloatingPanel>
                <!--<EgtFloating:EgtFloatingPanel Name="InstrumentPanel"
                IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">-->
                <local:InstrumentPanelV DataContext="{StaticResource InstrumentPanelViewModel}"/>
                <!--</EgtFloating:EgtFloatingPanel>-->
                <EgtFloating:EgtFloatingPanel Name="GridPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:GridPanelV DataContext="{StaticResource GridPanelViewModel}"/>
                    <local:PopUpGridPanelV DataContext="{StaticResource PopUpGridPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="DbPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:MachinePanelV DataContext="{StaticResource DbPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="ExecutePanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:ExecutePanelV DataContext="{StaticResource ExecutePanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="SpecialPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:SpecialPanelV DataContext="{StaticResource SpecialPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="BeamPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:BeamPanelV DataContext="{StaticResource BeamPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="WallPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:WallPanelV DataContext="{StaticResource WallPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="BeamWallPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:BeamWallPanelV DataContext="{StaticResource BeamWallPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="DoorsPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:DoorPanelV DataContext="{StaticResource DoorsPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
                <EgtFloating:EgtFloatingPanel Name="GunStockPanel"
             IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
                    <local:GunStockPanelV DataContext="{StaticResource GunStockPanelViewModel}"/>
                </EgtFloating:EgtFloatingPanel>
            </WrapPanel>
        </EgtFloating:EgtFloatingTray>
        <EgtFloating:EgtFloatingTray x:Name="LEFTTRAY" DockPanel.Dock="Left">
            <EgtFloating:EgtFloatingPanel Name="DrawPanel" TitleBarOrientation="Vertical"
            IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
                <local:DrawPanelV DataContext="{StaticResource DrawPanelViewModel}"/>
            </EgtFloating:EgtFloatingPanel>
        </EgtFloating:EgtFloatingTray>
        <EgtFloating:EgtFloatingTray x:Name="RIGHTTRAY" DockPanel.Dock="Right">
            <EgtFloating:EgtFloatingPanel Name="OptionPanel" TitleBarOrientation="Vertical"
            IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
                <local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
            </EgtFloating:EgtFloatingPanel>
        </EgtFloating:EgtFloatingTray>
        <!--<EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom">
         <EgtFloating:EgtFloatingPanel Name="MachGroupPanel"
            IsToolBar="False"
            IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
            <local:MachGroupPanelV DataContext="{StaticResource MachGroupPanelViewModel}"/>
         </EgtFloating:EgtFloatingPanel>
      </EgtFloating:EgtFloatingTray>-->
        <EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom">
            <EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelViewModel}"
                                   RepaetButtonStyle="{StaticResource CustomScrollBarButton}"
                                   MachGroupButtonStyle="{StaticResource {x:Type ToggleButton}}"
                                   IsToolBar="False"
                                   IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False"
                                   IsRightDockable="False" />
        </EgtFloating:EgtFloatingTray>
        <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
        <ContentControl Content="{Binding ProjectSceneHost}"/>
    </EgtFloating:EgtFloatingManager>
 </UserControl>
@@ -11,12 +11,13 @@ Public Class ProjectV
   Private Sub UserControl_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
      ' Creo riferimento a questa classe in Map
      Map.SetRefProjectV(Me)
-      SpecialPanel.Visibility = Visibility.Collapsed
+      'SpecialPanel.Visibility = Visibility.Collapsed
-      BeamPanel.Visibility = Visibility.Collapsed
+      'BeamPanel.Visibility = Visibility.Collapsed
-      WallPanel.Visibility = Visibility.Collapsed
+      'WallPanel.Visibility = Visibility.Collapsed
-      DoorsPanel.Visibility = Visibility.Collapsed
+      'DoorsPanel.Visibility = Visibility.Collapsed
-      GunStockPanel.Visibility = Visibility.Collapsed
+      'GunStockPanel.Visibility = Visibility.Collapsed
-      Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
+      'PrintingPanel.Visibility = Visibility.Collapsed
      ' Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
   End Sub
   Private Sub UserControl_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -64,45 +65,47 @@ Public Class ProjectV
   End Sub
   Friend Sub SetDbPanelVisibility()
-      DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
+      'DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
   End Sub
   Friend Sub MachiningMode_IsChecked()
-      'ShowPanel.Visibility = Visibility.Visible
+      ''ShowPanel.Visibility = Visibility.Visible
-      ViewPanel.Visibility = Visibility.Visible
+      'ViewPanel.Visibility = Visibility.Visible
-      'InstrumentPanel.Visibility = Visibility.Visible
+      ''InstrumentPanel.Visibility = Visibility.Visible
-      GridPanel.Visibility = Visibility.Visible
+      'GridPanel.Visibility = Visibility.Visible
-      DbPanel.Visibility = Visibility.Visible
+      'DbPanel.Visibility = Visibility.Visible
-      ExecutePanel.Visibility = Visibility.Collapsed
+      'ExecutePanel.Visibility = Visibility.Collapsed
-      SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(True), Visibility.Visible, Visibility.Collapsed)
+      'SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(True), Visibility.Visible, Visibility.Collapsed)
-      BeamPanel.Visibility = Visibility.Collapsed
+      'BeamPanel.Visibility = Visibility.Collapsed
-      WallPanel.Visibility = Visibility.Collapsed
+      'WallPanel.Visibility = Visibility.Collapsed
-      BeamWallPanel.Visibility = Visibility.Collapsed
+      'BeamWallPanel.Visibility = Visibility.Collapsed
-      DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
+      'DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
-      GunStockPanel.Visibility = Visibility.Collapsed
+      'PrintingPanel.Visibility = Visibility.Collapsed
-      DrawPanel.Visibility = Visibility.Collapsed
+      'GunStockPanel.Visibility = Visibility.Collapsed
-      OptionPanel.Visibility = Visibility.Visible
+      'DrawPanel.Visibility = Visibility.Collapsed
      'OptionPanel.Visibility = Visibility.Visible
      Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(IniFile.m_bMachiningGroup) ' MachGroupPanel.Visibility = If(IniFile.m_bMachiningGroup, Visibility.Visible, Visibility.Collapsed)
      If m_bDoors Then Map.refDoorPanelVM.SetDoorPanelButtonsVisibility(False)
   End Sub
   Friend Sub DrawMode_IsChecked()
-      'ShowPanel.Visibility = Visibility.Visible
+      ''ShowPanel.Visibility = Visibility.Visible
-      ViewPanel.Visibility = Visibility.Visible
+      'ViewPanel.Visibility = Visibility.Visible
-      'InstrumentPanel.Visibility = Visibility.Visible
+      ''InstrumentPanel.Visibility = Visibility.Visible
-      GridPanel.Visibility = Visibility.Visible
+      'GridPanel.Visibility = Visibility.Visible
-      DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
+      'DbPanel.Visibility = If(IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW, Visibility.Collapsed, Visibility.Visible)
-      ExecutePanel.Visibility = Visibility.Visible
+      'ExecutePanel.Visibility = Visibility.Visible
-      SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(False), Visibility.Visible, Visibility.Collapsed)
+      'SpecialPanel.Visibility = If(m_bSpecial And Map.refSpecialPanelVM.SetSpecialPanelButtonsVisibility(False), Visibility.Visible, Visibility.Collapsed)
-      BeamPanel.Visibility = If(m_bBeam, Visibility.Visible, Visibility.Collapsed)
+      'BeamPanel.Visibility = If(m_bBeam, Visibility.Visible, Visibility.Collapsed)
-      WallPanel.Visibility = If(m_bWall, Visibility.Visible, Visibility.Collapsed)
+      'WallPanel.Visibility = If(m_bWall, Visibility.Visible, Visibility.Collapsed)
-      BeamWallPanel.Visibility = If(m_bBeam Or m_bWall, Visibility.Visible, Visibility.Collapsed)
+      'BeamWallPanel.Visibility = If(m_bBeam Or m_bWall, Visibility.Visible, Visibility.Collapsed)
-      DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
+      'DoorsPanel.Visibility = If(m_bDoors, Visibility.Visible, Visibility.Collapsed)
-      GunStockPanel.Visibility = If(m_bGunStock, Visibility.Visible, Visibility.Collapsed)
+      'PrintingPanel.Visibility = If(m_bPrinting3d, Visibility.Visible, Visibility.Collapsed)
-      DrawPanel.Visibility = Visibility.Visible
+      'GunStockPanel.Visibility = If(m_bGunStock, Visibility.Visible, Visibility.Collapsed)
-      OptionPanel.Visibility = Visibility.Visible
+      'DrawPanel.Visibility = Visibility.Visible
-      Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
+      'OptionPanel.Visibility = Visibility.Visible
-      If m_bDoors Then Map.refDoorPanelVM.SetDoorPanelButtonsVisibility(True)
+      '      Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
      '     If m_bDoors Then Map.refDoorPanelVM.SetDoorPanelButtonsVisibility(True)
   End Sub
   Private Sub UserControl_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
@@ -7,82 +7,141 @@ Imports EgtWPFLib5
 Imports EgtWPFLib5.EgtFloating
 Public Class ProjectVM
-    Inherits TabViewModel
+   Inherits TabViewModel
 #Region "FIELDS"
-    ' Variabili in cui salvo i filtri di selezione della modalità Draw e che poi ripristino all'uscita dalla modalità Machining
+   Friend Event OnPreControllerExec(sFilePath As String)
-    Private m_bSelZeroDim As Boolean = True
+   Friend Event OnPostControllerExec()
    Private m_bSelCurve As Boolean = True
    Private m_bSelSurf As Boolean = True
    Private m_bSelVolume As Boolean = True
    Private m_bSelExtra As Boolean = True
-    Private m_bLoaded As Boolean = False
+   ' Variabili in cui salvo i filtri di selezione della modalità Draw e che poi ripristino all'uscita dalla modalità Machining
   Private m_bSelZeroDim As Boolean = True
   Private m_bSelCurve As Boolean = True
   Private m_bSelSurf As Boolean = True
   Private m_bSelVolume As Boolean = True
   Private m_bSelExtra As Boolean = True
-    ' Variabile che contiene il Frame di disegno per poterlo ripristinare dopo essere passato dalla lavorazioneù
+   Private m_bLoaded As Boolean = False
    Private m_GridDrawFrame3d As Frame3d = New Frame3d(New Point3d(0, 0, 0))
-    'PROJECT PAGE'S SCENE FIELDS AND PROPERTIES
+   ' Variabile che contiene il Frame di disegno per poterlo ripristinare dopo essere passato dalla lavorazioneù
-    ' Reference to the ProjectScene
+   Private m_GridDrawFrame3d As Frame3d = New Frame3d(New Point3d(0, 0, 0))
    Private WithEvents m_ProjectScene As New Scene
    ' Reference to the ProjectSceneHost
    Private SceneHost As WindowsFormsHost
    ' Property used to bind the scene to the WindowsFormsHost in XAML
    Private m_bfirst As Boolean = True
    Public ReadOnly Property ProjectSceneHost As WindowsFormsHost
        Get
            If m_bfirst Then
                SceneHost = New WindowsFormsHost() With {.Child = m_ProjectScene}
                m_bfirst = False
            End If
            Return SceneHost
        End Get
    End Property
    ' Scene controller
    Private WithEvents m_Controller As New Controller
-    ' Definizione comandi
+   'PROJECT PAGE'S SCENE FIELDS AND PROPERTIES
-    Private m_cmdLoaded As ICommand
+   ' Reference to the ProjectScene
   Private WithEvents m_ProjectScene As New Scene
   ' Reference to the ProjectSceneHost
   Private SceneHost As WindowsFormsHost
   ' Property used to bind the scene to the WindowsFormsHost in XAML
   Private m_bfirst As Boolean = True
   Public ReadOnly Property ProjectSceneHost As WindowsFormsHost
      Get
         If m_bfirst Then
            SceneHost = New WindowsFormsHost() With {.Child = m_ProjectScene}
            m_bfirst = False
         End If
         Return SceneHost
      End Get
   End Property
   ' Scene controller
   Private WithEvents m_Controller As New Controller
-    ' Flag per non salvare Script appena eseguito in elenco MruScript
+   ' Definizione comandi
-    Private m_bScriptInMru As Boolean = True
+   Private m_cmdLoaded As ICommand
   ' Flag per non salvare Script appena eseguito in elenco MruScript
   Private m_bScriptInMru As Boolean = True
   Private m_PanelList As New List(Of Panel)
   Public ReadOnly Property PanelList As List(Of Panel)
      Get
         Return m_PanelList
      End Get
   End Property
 #End Region
 #Region "EGTUILIB FIELDS"
    Private m_bCPlaneTypePos As Boolean
    'Private m_bStopExec As Boolean = False
    'Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
    'Private m_OutTextCallback As New OutTextCallback(AddressOf OutText)
-    ' Variabile per implementazione eventi
+   ' Variabile per implementazione eventi
-    Private m_InputText As String
+   Private m_InputText As String
 #End Region
 #Region "CONSTRUCTOR"
-    Sub New()
+   Sub New()
-        ' Creo riferimento a questa classe in EgtCAM5Map
+      ' Creo riferimento a questa classe in EgtCAM5Map e in ButtonItem
-        Map.SetRefProjectVM(Me)
+      Map.SetRefProjectVM(Me)
-        ' Creo classe di supporto per la visualizzazione dei parametri utensile e di lavorazione per Db e operazioni
+      ButtonItem.m_ProjectVM = Me
-        TMDbParamVisibility.bFirst = True
+      ' Creo classe di supporto per la visualizzazione dei parametri utensile e di lavorazione per Db e operazioni
-        ' Inizializza i parametri della scena
+      TMDbParamVisibility.bFirst = True
-        'InitializeEgtProject()
+      ' Inizializza i parametri della scena
-    End Sub
+      'InitializeEgtProject()
      ' aggiungo componenti interfaccia
      Dim bPlugin As Boolean = False
      Dim PluginDirNameList() As String = {}
      If IsActivePlugin() Then
         Dim sPluginDirPath As String = IniFile.m_sDataRoot & "\Plugin"
         If Directory.Exists(sPluginDirPath) Then
            ' recupero nome del plugin
            PluginDirNameList = Directory.GetDirectories(IniFile.m_sDataRoot & "\Plugin")
            ' verifico che il nome delle cartelle corrisponda al nome delle dll
            For PluginDirIndex As Integer = 0 To PluginDirNameList.Count - 1
               Dim sPluginDirName As String = Path.GetFileName(PluginDirNameList(PluginDirIndex))
               Dim sPluginFileNameList() As String = Directory.GetFiles(PluginDirNameList(PluginDirIndex))
               If sPluginFileNameList.Count = 0 OrElse Not sPluginFileNameList.Any(Function(x) Path.GetFileNameWithoutExtension(x) = sPluginDirName) Then
                  PluginDirNameList(PluginDirIndex) = ""
               End If
            Next
            bPlugin = PluginDirNameList.Count(Function(x) Not String.IsNullOrWhiteSpace(x)) > 0
         End If
      End If
      If bPlugin Then
         For Each PluginDirName In PluginDirNameList
            If Not String.IsNullOrWhiteSpace(PluginDirName) Then
               Dim PluginName As String = Path.GetFileName(PluginDirName)
               Dim ConfigurationData As IPluginConfigData = Map.refMainWindowVM.GetConfigData(Of IPluginConfigData)(PluginName & ".ConfigurationData")
               If Not IsNothing(ConfigurationData) And ConfigurationData.ControlList.Count > 0 Then
                  For Each Element In ConfigurationData.ControlList
                     Select Case Element.Name
                        Case PLUGIN_RIGHT_TRAY
                           m_PanelList.Add(New RightTrayV)
                           Map.refOptionPanelVM.SetPanelViewState(Element.ViewPanelState)
                        Case PLUGIN_LEFT_TRAY
                           m_PanelList.Add(New LeftTrayV)
                        Case Else
                           m_PanelList.Add(Map.refMainWindowVM.GetControlByName(Of IPluginControl)(Element))
                     End Select
                  Next
               End If
            End If
         Next
         m_PanelList.Add(New BottomTrayV)
         m_PanelList.Add(New TopTrayV)
         ' nascondo tasti gestione progetto se attivo plugin
         Map.refTopCommandBarVM.SetProjectManagerVisibility(False)
      Else
         m_PanelList.Add(New TopTrayV)
         m_PanelList.Add(New LeftTrayV)
         m_PanelList.Add(New RightTrayV)
         m_PanelList.Add(New BottomTrayV)
      End If
      m_PanelList.Add(New SceneContentControlV)
   End Sub
 #End Region
 #Region "Get & Set"
-    Friend Function GetScene() As Scene
+   Friend Function GetScene() As Scene
-        Return m_ProjectScene
+      Return m_ProjectScene
-    End Function
+   End Function
-    Friend Function GetController() As Controller
+   Friend Function GetController() As Controller
-        Return m_Controller
+      Return m_Controller
-    End Function
+   End Function
 #End Region    ' Get & Set
@@ -96,7 +155,7 @@ Public Class ProjectVM
   Public ReadOnly Property LoadedCommand As ICommand
      Get
         If m_cmdLoaded Is Nothing Then
-               m_cmdLoaded = New RelayCommand(AddressOf Loaded)
+            m_cmdLoaded = New RelayCommand(AddressOf Loaded)
         End If
         Return m_cmdLoaded
      End Get
@@ -125,10 +184,42 @@ Public Class ProjectVM
            Map.refProjectV.SetDbPanelVisibility()
         End If
         ' Inizializzo gestore travi e pareti
-         If ( IniFile.m_nKeyOptions And KEY_OPT.BEAM) <> 0  Or  ( IniFile.m_nKeyOptions And KEY_OPT.WALL) <> 0 Then
+         If (IniFile.m_nKeyOptions And KEY_OPT.BEAM) <> 0 Or (IniFile.m_nKeyOptions And KEY_OPT.WALL) <> 0 Then
-            Dim nFlag As Integer = GetPrivateProfileInt( S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
+            Dim nFlag As Integer = GetPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
-            EgtInitBeamMgr( nFlag)
+            EgtInitBeamMgr(nFlag)
         End If
         ' Log di eventuali estensioni
         EgtOutLog("Extensions :")
         Dim bExtensions As Boolean = False
         If IniFile.IsActiveBeam() Then
            bExtensions = True
            Dim sVersion As String = "---"
            IniFile.GetSpecialLuaVersion(IniFile.m_sBeamDirPath, sVersion)
            Dim sOut As String = "Beam ver. " & sVersion & "   " & IniFile.m_sBeamDirPath
            EgtOutLog(sOut)
         End If
         If IniFile.IsActiveWall() Then
            bExtensions = True
            Dim sVersion As String = "---"
            IniFile.GetSpecialLuaVersion(IniFile.m_sWallDirPath, sVersion)
            Dim sOut As String = "Wall ver. " & sVersion & "   " & IniFile.m_sWallDirPath
            EgtOutLog(sOut)
         End If
         If IniFile.IsActiveDoors() Then
            bExtensions = True
            Dim sVersion As String = "---"
            IniFile.GetSpecialLuaVersion(IniFile.m_sDoorsDirPath, sVersion)
            Dim sOut As String = "Doors ver. " & sVersion & "   " & IniFile.m_sDoorsDirPath
            EgtOutLog(sOut)
         End If
         If IniFile.IsActiveGunStock() Then
            bExtensions = True
            Dim sVersion As String = "---"
            IniFile.GetSpecialLuaVersion(IniFile.m_sGunstockDirPath, sVersion)
            Dim sOut As String = "Gunstock ver. " & sVersion & "   " & IniFile.m_sGunstockDirPath
            EgtOutLog(sOut)
         End If
         If Not bExtensions Then EgtOutLog("---")
         ' Apro progetto vuoto
         Map.refTopCommandBarVM.NewCmd()
         ' Seleziono la macchina impostata nel file ini
@@ -140,18 +231,33 @@ Public Class ProjectVM
      SceneHost.Child = Nothing
      ' Se manca la chiave
      If IniFile.m_nKeyLevel = -1 Or IniFile.m_nKeyLevel = -2 Then
-         EgtOutLog("Missing Dongle")
+         If Not EgtGetNetHwKey() Then
-         ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
+            EgtOutLog("Missing Dongle")
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
+            ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+            Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
            Dim sTitle As String = EgtMsg(10101)
            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
         Else
            EgtOutLog("NetDongle is full")
            ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC."  "Errore"
            Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111)
            Dim sTitle As String = EgtMsg(10101)
            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
         End If
      ' Se altrimenti manca il collegamento con la chiave di rete
      ElseIf IniFile.m_nKeyLevel = -9 Then
         EgtOutLog("Missing Link with Net Dongle")
         ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione."  "Errore"
         Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
         Dim sTitle As String = EgtMsg(10101)
         MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         ' Altrimenti manca la licenza
+      ' Altrimenti manca la licenza
      Else
         EgtOutLog("Problems with Licence")
         ' Box di avviso licenza con problemi : sKeyInfo \n "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
         Dim sKeyInfo As String = "" : EgtGetKeyInfo(sKeyInfo)
-         Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
+         Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(10105) & vbCrLf & EgtMsg(10106)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         Dim sTitle As String = EgtMsg(10101)
         If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
            ' Apro dialogo per richiesta file licenza
            Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
@@ -161,17 +267,17 @@ Public Class ProjectVM
               .ValidateNames = True
            }
            If LicDlg.ShowDialog() = True Then
-            ' Recupero il direttorio del file
+               ' Recupero il direttorio del file
-            Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
+               Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
-            ' Se il file non è già nel direttorio di configurazione lo copio
+               ' Se il file non è già nel direttorio di configurazione lo copio
-            If Not String.Equals(Path.GetFullPath(sDir), Path.GetFullPath(IniFile.m_sConfigDir), StringComparison.OrdinalIgnoreCase) Then
+               If Not String.Equals(Path.GetFullPath(sDir), Path.GetFullPath(IniFile.m_sConfigDir), StringComparison.OrdinalIgnoreCase) Then
-               Try
+                  Try
-                  File.Copy(LicDlg.FileName, Path.Combine(IniFile.m_sConfigDir, LicDlg.SafeFileName), True)
+                     File.Copy(LicDlg.FileName, Path.Combine(IniFile.m_sConfigDir, LicDlg.SafeFileName), True)
-               Catch ex As Exception
+                  Catch ex As Exception
-               End Try
+                  End Try
-            End If
+               End If
-            ' Imposto il nuovo file di licenza nell'Ini
+               ' Imposto il nuovo file di licenza nell'Ini
-            WritePrivateProfileString(S_GENERAL, K_LICENCE, LicDlg.SafeFileName)
+               WritePrivateProfileString(S_GENERAL, K_LICENCE, LicDlg.SafeFileName)
            End If
         End If
      End If
@@ -228,15 +334,14 @@ Public Class ProjectVM
   Private Sub PostInitializeScene()
      ' Impostazioni Controller
      m_Controller.SetUserLevel( IniFile.m_nUserLevel)
      m_Controller.SetScene(m_ProjectScene)
      Dim bLuaReg As Boolean = (GetPrivateProfileInt(S_GENERAL, K_COMMANDLOG, 0) <> 0)
      Dim sCmdLogFile As String = CMDLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString())
      If Not m_Controller.SetCommandLog(bLuaReg, m_sTempDir, sCmdLogFile) Then
         EgtOutLog("Command log not started")
         If Environment.GetCommandLineArgs.Count() <= 1 Then
-               MessageBox.Show("Command log not started", "EgtCAM5 Warning",
+            MessageBox.Show("Command log not started", "EgtCAM5 Warning",
-                           MessageBoxButton.OK, MessageBoxImage.Warning)
+                            MessageBoxButton.OK, MessageBoxImage.Warning)
         End If
      End If
      m_Controller.SetSurfTmTolerance(OptionModule.m_dGeometryTolerance)
@@ -288,9 +393,9 @@ Public Class ProjectVM
      ' lettura flag visualizzazione solo tavola in definizione lavorazioni
      IniFile.m_bShowOnlyTable = (GetPrivateProfileInt(S_MACH, K_SHOWONLYTABLE, 1) <> 0)
      ' ObjTree non selezionato
-      Map.refManageLayerExpanderVM.UpdateObjTreeOldId(GDB_ID.NULL)
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateObjTreeOldId(GDB_ID.NULL)
      ' nascondo input box
-      Map.refInputExpanderVM.ResetInputBox()
+      If Not IsNothing(Map.refInputExpanderVM) Then Map.refInputExpanderVM.ResetInputBox()
      ' Imposto stato filtro selezione
      m_ProjectScene.GetObjFilterForSel(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
      m_Controller.MouseSetObjFilterForSelect(m_bSelZeroDim, m_bSelCurve, m_bSelSurf, m_bSelVolume, m_bSelExtra)
@@ -353,7 +458,7 @@ Public Class ProjectVM
         ' Verifico se travi o pareti (dal nome della macchina)
         Dim sBeamMachines As String = ""
         GetPrivateProfileString(S_BEAM, K_BEAMMACHINES, "", sBeamMachines)
-         Dim vsBMachs() As String = sBeamMachines.Split(","c).ToArray
+         Dim vsBMachs() As String = sBeamMachines.Split(","c)
         Dim bBeam As Boolean = False
         For Each sBMach In vsBMachs
            If Not String.IsNullOrWhiteSpace(sBMach) AndAlso sMachine.StartsWith(sBMach, True, CultureInfo.InvariantCulture) Then
@@ -377,8 +482,8 @@ Public Class ProjectVM
               Return
            End If
            ' Esecuzione
-            bOk = ExecBeam(sFile, sMachine, nFlag, true)
+            bOk = ExecBeam(sFile, sMachine, nFlag, True)
-         ' altrimenti pareti
+            ' altrimenti pareti
         Else
            ' Verifica abilitazione elaborazione pareti
            If Not VerifyWall(sFile, sMachine, nFlag) Then
@@ -386,18 +491,18 @@ Public Class ProjectVM
               Return
            End If
            ' Esecuzione
-            bOk = ExecWall(sFile, sMachine, nFlag, true)
+            bOk = ExecWall(sFile, sMachine, nFlag, True)
         End If
         ' Se richiesta uscita immediata
         If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Then
            Map.refMachinePanelVM.SaveCurrentMachine()
            Map.refMainWindowVM.CloseApplicationCmd()
-         ' Altrimenti se richiesta visualizzazione DB utensili
+            ' Altrimenti se richiesta visualizzazione DB utensili
         ElseIf nFlag = 11 And bOk Then
            MyMachinePanelVM.ToolDb()
            Map.refMachinePanelVM.SaveCurrentMachine()
            Map.refMainWindowVM.CloseApplicationCmd()
-         ' Altrimenti se richiesta visualizzazione DB lavorazioni
+            ' Altrimenti se richiesta visualizzazione DB lavorazioni
         ElseIf nFlag = 12 And bOk Then
            MyMachinePanelVM.MachDb()
            If bBeam Then
@@ -407,7 +512,7 @@ Public Class ProjectVM
            End If
            Map.refMachinePanelVM.SaveCurrentMachine()
            Map.refMainWindowVM.CloseApplicationCmd()
-         ' Altrimenti se errore
+            ' Altrimenti se errore
         ElseIf Not bOk Then
            EgtZoom(ZM.ALL)
         End If
@@ -468,8 +573,8 @@ Public Class ProjectVM
               Return
            End If
            ' Esecuzione
-            bOk = ExecBeam(sFile, sMachine, nFlag, false)
+            bOk = ExecBeam(sFile, sMachine, nFlag, False)
-         ' altrimenti pareti
+            ' altrimenti pareti
         ElseIf nBWType = 2 Then
            ' Verifica abilitazione elaborazione pareti
            If Not VerifyWall(sFile, sMachine, nFlag) Then
@@ -477,13 +582,13 @@ Public Class ProjectVM
               Return
            End If
            ' Esecuzione
-            bOk = ExecWall(sFile, sMachine, nFlag, false)
+            bOk = ExecWall(sFile, sMachine, nFlag, False)
         End If
         ' Se richiesta uscita immediata
         If nFlag = 0 Or nFlag = 3 Or nFlag = 4 Then
            Map.refMachinePanelVM.SaveCurrentMachine()
            Map.refMainWindowVM.CloseApplicationCmd()
-         ' Altrimenti se errore
+            ' Altrimenti se errore
         ElseIf Not bOk Then
            EgtZoom(ZM.ALL)
         End If
@@ -499,7 +604,7 @@ Public Class ProjectVM
      Select Case nFileType
         Case FT.NGE, FT.NFE
            Return m_Controller.OpenProject(sFile, False)
-         Case FT.DXF, FT.STL, FT._3MF, FT.CNC, FT.CSF, FT.BTL, FT.BTLX, FT.IMG, FT.PNT, FT.IGES, FT.STEP_, FT.ACIS, FT.PARASOLID, FT.JT, FT.VRML, FT.C3D
+         Case FT.DXF, FT.STL, FT._3MF, FT._3DM, FT.OBJ, FT.CNC, FT.CSF, FT.BTL, FT.BTLX, FT.IMG, FT.PNT, FT.IGES, FT.STEP_, FT.ACIS, FT.PARASOLID, FT.JT, FT.VRML, FT.C3D
            Return m_Controller.ImportProject(sFile, False)
         Case FT.TSC, FT.LUA
            Return m_Controller.Exec(sFile, False)
@@ -511,7 +616,7 @@ Public Class ProjectVM
      Dim nErr As Integer = 0
      ' Formato descrizione porte
      If Path.GetExtension(sFile).ToLower() = ".ddf" Then
-         nErr = ExecDoors(m_ProjectScene, sFile)
+         nErr = ExecDoors(m_ProjectScene, sFile, bNcGen, bBatch, nProbing)
         'CreateDoors(sFile, bNcGen, bBatch, nProbing)
         Map.refProjectVM.EmitTitle()
         Return True
@@ -625,7 +730,7 @@ Public Class ProjectVM
   Friend Sub InsertProject()
      ' eseguo
      Dim sDir As String = String.Empty
-      GetPrivateProfileString(S_GENERAL, K_LASTNGEDIR, "", sDir)
+      GetPrivateProfileString(S_GENERAL, K_LASTNGEINSDIR, "", sDir)
      m_Controller.InsertProject(sDir)
   End Sub
@@ -644,13 +749,15 @@ Public Class ProjectVM
      m_bScriptInMru = bScriptInMru
   End Sub
-   Friend Sub ExecScript(sFilePath As String)
+   Friend Sub ExecScript(sFilePath As String, Optional bRaiseEvent As Boolean = False)
      If String.IsNullOrEmpty(sFilePath) Then
         Dim sDir As String = String.Empty
         GetPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir)
         m_Controller.Exec(sDir)
      Else
         If bRaiseEvent Then RaiseEvent OnPreControllerExec(sFilePath)
         m_Controller.Exec(sFilePath, False)
         If bRaiseEvent Then RaiseEvent OnPostControllerExec()
      End If
      Dim bMachiningMode As Boolean = EgtGetCurrMachGroup() <> GDB_ID.NULL
      If Not bMachiningMode And EgtGetCurrLayer() = GDB_ID.NULL Then
@@ -714,7 +821,7 @@ Public Class ProjectVM
            Try
               Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_PEZFilePath, ".txt")
               Dim Lines() As String = File.ReadAllLines(sErrFilePath)
-               Dim values() As String = Lines(0).Split("="c).ToArray
+               Dim values() As String = Lines(0).Split("="c)
               Lines(0) = EgtMsg(MSG_DOORSERRORS + 1) & " " & Convert.ToInt32(values(1))
               Dim sErrMsg As String = String.Empty
               For Index = 1 To Lines.Count - 1
@@ -765,6 +872,20 @@ Public Class ProjectVM
      End If
   End Sub
   Friend Sub GunStockCopy(sFilePath As String, sDirDest As String)
      Dim bOk As Boolean
      bOk = ExecGunStockCopy(m_ProjectScene, sFilePath, sDirDest)
      If bOk Then
         ' Copia dei file terminata con successo ...
         Dim sMsg As String = EgtMsg(8216) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest
         MessageBox.Show(sMsg, EgtMsg(8214), MessageBoxButton.OK, MessageBoxImage.Information)
      Else
         ' Errore nella copia dei file ...
         Dim sMsg As String = EgtMsg(8255) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest
         MessageBox.Show(sMsg, EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error)
      End If
   End Sub
 #End Region
 #Region "DrawOptionPanel Commands"
@@ -919,12 +1040,12 @@ Public Class ProjectVM
   End Sub
   Private Sub OnMouseDeselectedAll(ByVal sender As Object) Handles m_ProjectScene.OnMouseDeselectedAll
-      ' Se in modalità Draw seleziono tutto
+      ' Se in modalità Draw deseleziono tutto
      If IniFile.m_ProjectMode = ProjectModeOpt.DRAW OrElse IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW Then
-         m_Controller.MouseDeselectedAll()
+         m_Controller.MouseDeselectedAll(True)
         Return
      End If
-      ' Sono in modalità Machining, se la modalità di selezione è NULL non seleziono nulla ed esco
+      ' Sono in modalità Machining, se la modalità di selezione è NULL non deseleziono nulla ed esco
      If m_SceneSelMode = SceneSelModeOpt.NULL Then Return
      ' Se sono in lavorazione
      If IniFile.m_ProjectMode = ProjectModeOpt.MACHINING Then
@@ -944,7 +1065,7 @@ Public Class ProjectVM
   Private m_nIdToSel As Integer = GDB_ID.NULL
   Private m_SelType As DispositionUtility.SelType = DispositionUtility.SelType.NULL
   Private m_nIdToDesel As Integer = GDB_ID.NULL
-   'Private m_nFirstRawPartId As Integer = GDB_ID.NULL
+   Private m_nSelOpeId As Integer = GDB_ID.NULL
   ' Dati per Drag
   Private m_nRestRadius As Integer = 3
@@ -954,14 +1075,18 @@ Public Class ProjectVM
   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
+   Private Sub OnStartingMouseDown(ByVal sender As Object, e As System.Windows.Forms.MouseEventArgs, ByRef bContinue As Boolean) Handles m_ProjectScene.OnStartingMouseDownScene
      ' Se in modalità Draw accetto tutto
      If IniFile.m_ProjectMode = ProjectModeOpt.DRAW OrElse IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW Then Return
      ' Sono in modalità Machining
      ' se non posso selezionare nulla o in lavorazione esco
-      If m_SceneSelType = SceneSelTypeOpt.NULL OrElse m_SceneSelType = SceneSelTypeOpt.MACHINING Then Return
+      If m_SceneSelType = SceneSelTypeOpt.NULL OrElse
         m_SceneSelType = SceneSelTypeOpt.MACHINING OrElse
         m_SceneSelType = SceneSelTypeOpt.MACHPATH Then Return
      ' Si può selezionare solo con il tasto sinistro
      If e.Button <> Forms.MouseButtons.Left Then Return
      ' Si Sostituisce completamente la gestione dell'evento chiamante
      bContinue = False
      ' Dati per drag
      Dim TableRef As Point3d
      EgtGetTableRef(1, TableRef)
@@ -1079,10 +1204,10 @@ Public Class ProjectVM
      ' Se eseguito drag
      If Not m_bDragToStart Then
         ' Basta reset alla fine
-      ' se sono in modalità movimento barre
+         ' se sono in modalità movimento barre
      ElseIf m_SelType = DispositionUtility.SelType.BARS Then
         ' Basta reset alla fine
-      ' Se selezione da eseguire
+         ' Se selezione da eseguire
      ElseIf m_nIdToSel <> GDB_ID.NULL Then
         ' se sono in modalità sottopezzi
         If m_SceneSelType = SceneSelTypeOpt.FIXTURE Then
@@ -1094,7 +1219,7 @@ Public Class ProjectVM
               m_nIdToDesel = GDB_ID.NULL
               EgtDraw()
               Return
-            ' altrimenti verifico il tipo del primo oggetto selezionato
+               ' altrimenti verifico il tipo del primo oggetto selezionato
            Else
               Dim nFirstSelId As Integer = EgtGetFirstSelectedObj()
               ' se è un riferimento resetto lo stato di selezione ed esco
@@ -1120,7 +1245,7 @@ Public Class ProjectVM
         End If
         ' Eseguo la selezione
         EgtSelectObj(m_nIdToSel)
-      ' Se deselezione da eseguire
+         ' Se deselezione da eseguire
      ElseIf m_nIdToDesel <> GDB_ID.NULL Then
         ' se l'elemento da deselezionare è marcato
         Dim bMarked As Boolean = False
@@ -1153,9 +1278,20 @@ Public Class ProjectVM
      EgtDraw()
   End Sub
   Private Sub OnStartingMouseSelectingObj(ByVal sender As Object) Handles m_ProjectScene.OnStartingMouseSelectingObj
      m_nSelOpeId = GDB_ID.NULL
   End Sub
   Private Sub OnMouseSelectingObj(ByVal sender As Object, ByVal nId As Integer, ByRef bOk As Boolean) Handles m_ProjectScene.OnMouseSelectingObj
      ' Se oggetto già rifiutato non faccio le verifiche
      If Not bOk Then Return
      ' Impedisco la selezione di oggetti in modo Locked o Hidden
      Dim nMode As Integer = GDB_MD.STD
      EgtGetCalcMode(nId, nMode)
      If nMode <> GDB_MD.STD Then
         bOk = False
         Return
      End If
      ' Se in modalità Draw accetto tutto
      If IniFile.m_ProjectMode = ProjectModeOpt.DRAW OrElse IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW Then Return
      ' Sono in modalità Machining
@@ -1168,7 +1304,9 @@ Public Class ProjectVM
               bOk = False
            End If
         Case SceneSelTypeOpt.MACHPATH
-            bOk = Map.refOperationsListExpanderVM.IsInOperationList(nId)
+            Dim nCurrOpeId As Integer = Map.refOperationsListExpanderVM.GetOperationId(nId)
            bOk = (nCurrOpeId <> GDB_ID.NULL AndAlso nCurrOpeId <> m_nSelOpeId)
            If m_nSelOpeId = GDB_ID.NULL Then m_nSelOpeId = nCurrOpeId
         Case Else
            bOk = False
      End Select
@@ -1177,13 +1315,11 @@ Public Class ProjectVM
   Private Sub OnMouseSelectedObj(ByVal sender As Object, ByVal nId As Integer, ByVal bLast As Boolean) Handles m_ProjectScene.OnMouseSelectedObj
      If IniFile.m_ProjectMode = ProjectModeOpt.MACHINING And m_SceneSelType = SceneSelTypeOpt.MACHPATH Then
         Map.refOperationsListExpanderVM.SelOperationItemFromId(nId)
-      Else
+      ElseIf IniFile.m_ProjectMode = ProjectModeOpt.MACHINING And m_SceneSelType = SceneSelTypeOpt.MACHINING And
         If IniFile.m_ProjectMode = ProjectModeOpt.MACHINING And m_SceneSelType = SceneSelTypeOpt.MACHINING And
            (EgtGetType(nId) = GDB_TY.SRF_MESH Or EgtGetType(nId) = GDB_TY.SRF_FRGN) Then
-            If Not EgtIsSelectedObj(nId) Then m_Controller.MouseSelectedObj(nId, bLast)
+         If Not EgtIsSelectedObj(nId) Then m_Controller.MouseSelectedObj(nId, bLast)
-         Else
+      Else
-            m_Controller.MouseSelectedObj(nId, bLast)
+         m_Controller.MouseSelectedObj(nId, bLast)
         End If
      End If
   End Sub
@@ -1202,15 +1338,15 @@ Public Class ProjectVM
   Private Sub OnMousePointFromSelection(ByVal sender As Object, ByVal nId As Integer, ByVal PtP As Point3d, ByVal nAux As Integer) Handles m_ProjectScene.OnMousePointFromSelection
      m_Controller.SetPointFromSelection(nId, PtP, nAux)
      If IniFile.m_ProjectMode = ProjectModeOpt.MACHINING And m_SceneSelType = SceneSelTypeOpt.MACHINING And
-         ( EgtGetType( nId) = GDB_TY.SRF_MESH Or EgtGetType( nId) = GDB_TY.SRF_FRGN) Then
+         (EgtGetType(nId) = GDB_TY.SRF_MESH Or EgtGetType(nId) = GDB_TY.SRF_FRGN) Then
-         If EgtIsSelectedObj( nId) Then
+         If EgtIsSelectedObj(nId) Then
-            Dim nFac As Integer = If( EgtGetType( nId) = GDB_TY.SRF_MESH, Math.Max( EgtSurfTmFacetFromTria( nId, nAux), 0), nAux)
+            Dim nFac As Integer = If(EgtGetType(nId) = GDB_TY.SRF_MESH, Math.Max(EgtSurfTmFacetFromTria(nId, nAux), 0), nAux)
-            If Not SelData.FindIdSub( nId, nFac) Then
+            If Not SelData.FindIdSub(nId, nFac) Then
               SelData.AddIdSub(nId, nFac)
            Else
               SelData.RemoveIdSub(nId, nFac)
-               If Not SelData.FindId( nId) Then
+               If Not SelData.FindId(nId) Then
-                  EgtDeselectObj( nId)
+                  EgtDeselectObj(nId)
               End If
            End If
         Else
@@ -1244,29 +1380,29 @@ Public Class ProjectVM
      Analyze.ClearAnalyzeGroup()
      Map.refStatusBarVM.NotifyStatusOutput("")
      ' Se curva composita, visualizzo numerazione curve semplici
-      If EgtGetType( nId) = GDB_TY.CRV_COMPO Then
+      If EgtGetType(nId) = GDB_TY.CRV_COMPO Then
         ' Visualizzo numerazione
         Analyze.CreateAnalyzeGroup()
-         Analyze.CreateCurveCompoPntNbrs( nId)
+         Analyze.CreateCurveCompoPntNbrs(nId)
-      ' Se superficie trimesh, visualizzo dati faccetta toccata
+         ' Se superficie trimesh, visualizzo dati faccetta toccata
-      ElseIf EgtGetType( nId) = GDB_TY.SRF_MESH Then
+      ElseIf EgtGetType(nId) = GDB_TY.SRF_MESH Then
-         Dim nFac As Integer = EgtSurfTmFacetFromTria( nId, nSub)
+         Dim nFac As Integer = EgtSurfTmFacetFromTria(nId, nSub)
         If nFac <> -1 Then
            ' Visualizzo la normale e il contorno della faccia
            Analyze.CreateAnalyzeGroup()
-            Analyze.CreateNormal( nId, nFac)
+            Analyze.CreateNormal(nId, nFac)
-            Analyze.CreateFacetLoops( nId, nFac)
+            Analyze.CreateFacetLoops(nId, nFac)
            ' Recupero i dati (in globale o griglia a seconda della impostazione)
            Dim ptC As Point3d
            Dim vtN As Vector3d
-            EgtSurfTmFacetCenter( nId, nFac, If( m_bCPlaneTypePos, GDB_ID.GRID, GDB_ID.ROOT), ptC, vtN)
+            EgtSurfTmFacetCenter(nId, nFac, If(m_bCPlaneTypePos, GDB_ID.GRID, GDB_ID.ROOT), ptC, vtN)
            Dim dLen, dPhi, dTheta As Double
-            vtN.ToSpherical( dLen, dTheta, dPhi)
+            vtN.ToSpherical(dLen, dTheta, dPhi)
            ' Emetto info sulla barra di stato
            Dim sOut As String = "Facet " + nFac.ToString() +
-                                 " : C(" + LenToString( ptC.x, 3) + "," + LenToString( ptC.y, 3) + ","  + LenToString( ptC.z, 3) + ")" +
+                                 " : C(" + LenToString(ptC.x, 3) + "," + LenToString(ptC.y, 3) + "," + LenToString(ptC.z, 3) + ")" +
-                                   " N(" + DoubleToString( vtN.x, 4) + "," + DoubleToString( vtN.y, 4) + "," + DoubleToString( vtN.z, 4) + ")" +
+                                   " N(" + DoubleToString(vtN.x, 4) + "," + DoubleToString(vtN.y, 4) + "," + DoubleToString(vtN.z, 4) + ")" +
-                                 " / φ=" + DoubleToString( dPhi, 2) + " θ=" + DoubleToString( dTheta, 2)
+                                 " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2)
            Map.refStatusBarVM.NotifyStatusOutput(sOut)
         End If
      End If
@@ -1283,16 +1419,19 @@ Public Class ProjectVM
      If e.KeyData = System.Windows.Forms.Keys.Delete AndAlso Map.refTopCommandBarVM.DrawIsChecked Then
         m_Controller.SetLastInteger(GDB_ID.SEL)
         m_Controller.ExecuteCommand(Controller.CMD.DELETE)
-      ' Con SPAZIO ripeto l'ultimo comando
+         ' Con END eseguo deselezione di tutto
      ElseIf e.KeyData = System.Windows.Forms.Keys.End Then
         m_Controller.MouseDeselectedAll(True)
         ' Con SPAZIO ripeto l'ultimo comando
      ElseIf e.KeyData = System.Windows.Forms.Keys.Space Then
         m_Controller.RepeatLastCommand()
-      ' Con 'A' e in modalità continuazione, forzo il passaggio ad arco
+         ' Con 'A' e in modalità continuazione, forzo il passaggio ad arco
-      ElseIf e.KeyData = System.Windows.Forms.Keys.A And m_Controller.GetContinue() Then
+      ElseIf e.KeyData = System.Windows.Forms.Keys.A AndAlso m_Controller.GetContinue() Then
         m_Controller.ContinueArcPDP()
-      ' Con 'L'  e in modalità continuazione, forzo il passaggio a retta
+         ' Con 'L'  e in modalità continuazione, forzo il passaggio a retta
-      ElseIf e.KeyData = System.Windows.Forms.Keys.L And m_Controller.GetContinue() Then
+      ElseIf e.KeyData = System.Windows.Forms.Keys.L AndAlso m_Controller.GetContinue() Then
         m_Controller.ContinueLine2P()
-      ' Con 'V' cambio lo stato del check
+         ' Con 'V' cambio lo stato del check
      ElseIf e.KeyData = System.Windows.Forms.Keys.V Then
         Map.refInputExpanderVM.ChangeInputBoxCheck()
      End If
@@ -1318,7 +1457,7 @@ Public Class ProjectVM
   End Sub
   Private Sub OnOpeningProject(ByVal sender As Object) Handles m_Controller.OnOpeningProject
-      Map.refManageLayerExpanderVM.ClearObjTree()
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.ClearObjTree()
   End Sub
   Private Sub OnOpenProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnOpenProject
@@ -1329,7 +1468,7 @@ Public Class ProjectVM
      Else
         IniFile.m_MruFiles.Remove(sFile)
         Dim sMsg As String
-         If My.Computer.FileSystem.FileExists( sFile) Then
+         If My.Computer.FileSystem.FileExists(sFile) Then
            sMsg = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
         Else
            sMsg = EgtMsg(10009) & " '" & sFile & "'"            'Missing file
@@ -1338,8 +1477,18 @@ Public Class ProjectVM
      End If
   End Sub
   Private Sub OnInsertingProject(ByVal sender As Object, nType As Integer, ByRef nFlag As Integer) Handles m_Controller.OnInsertingProject
      If nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
         nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
         nFlag = GetMainPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
      Else
         nFlag = 0
      End If
   End Sub
   Private Sub OnInsertedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnInsertedProject
      EgtZoom(ZM.ALL)
      WritePrivateProfileString(S_GENERAL, K_LASTNGEINSDIR, Path.GetDirectoryName(sFile))
   End Sub
   Private Sub OnSavingProject(ByVal sender As Object, ByVal sFile As String) Handles m_Controller.OnSavingProject
@@ -1377,6 +1526,9 @@ Public Class ProjectVM
            nFlag = GetPrivateProfileInt(S_IMPORT, K_CNCFLAG, EIC_FL.NONE)
         ElseIf nType = FT.BTL Or nType = FT.BTLX Then
            nFlag = GetPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.NONE)
         ElseIf nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
                nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
            nFlag = GetPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
         Else
            nFlag = 0
         End If
@@ -1430,7 +1582,7 @@ Public Class ProjectVM
         End If
      Else
         If m_bScriptInMru Then
-            If File.Exists( sFile) Then
+            If File.Exists(sFile) Then
               IniFile.m_MruScripts.Add(sFile)
               WritePrivateProfileString(S_GENERAL, K_LASTLUADIR, Path.GetDirectoryName(sFile))
            Else
@@ -1465,7 +1617,7 @@ Public Class ProjectVM
   Private Sub OnUpdateUI(ByVal sender As Object, ByVal bReloadUI As Boolean) Handles m_Controller.UpdateUI
      ' pulisco input e relativi messaggi
-      Map.refInputExpanderVM.ResetInputBox()
+      If Not IsNothing(Map.refInputExpanderVM) Then Map.refInputExpanderVM.ResetInputBox()
      If m_Controller.GetContinue() Then
         Map.refStatusBarVM.NotifyStatusOutput((EgtMsg(399)))      ' Continue : 'L' with line, 'A' with arc
      Else
@@ -1475,9 +1627,9 @@ Public Class ProjectVM
      EmitTitle()
      EmitCurrPartLayer()
      If bReloadUI Then
-         Map.refManageLayerExpanderVM.LoadObjTree()
+         If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.LoadObjTree()
      Else
-         Map.refManageLayerExpanderVM.UpdateObjTree()
+         If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateObjTree()
      End If
      ' aggiorno macchina corrente
      Map.refMachinePanelVM.UpdateCurrentMachine()
@@ -1552,9 +1704,9 @@ Public Class ProjectVM
            EgtGetCalcColor(nCurrLayer, colObj)
         End If
      End If
-      Map.refManageLayerExpanderVM.UpdateHeaderName(sText)
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateHeaderName(sText)
      colObj.A = 100
-      Map.refManageLayerExpanderVM.UpdateHeaderColor(colObj)
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.UpdateHeaderColor(colObj)
   End Sub
 #End Region    'DrawOptionPanel
@@ -0,0 +1,7 @@
 <Grid x:Class="RightTrayV"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:local="clr-namespace:EgtCAM5"
      DockPanel.Dock="Right">
   <local:OptionPanelV DataContext="{StaticResource OptionPanelViewModel}"/>
 </Grid>
@@ -0,0 +1,3 @@
 Public Class RightTrayV
 End Class
@@ -0,0 +1,8 @@
 <Grid x:Class="SceneContentControlV"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
   <ContentControl Content="{Binding ProjectSceneHost}"/>
 </Grid>
@@ -0,0 +1,3 @@
 Public Class SceneContentControlV
 End Class
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Demetrio Cassarino	85f22f9978	Merge remote-tracking branch 'origin/master' into feature/ManageNote	2024-05-06 16:12:13 +02:00
Dario Sassi	9eea6f220d	EgtCAM5 2.6e1 : - ricompilazione con cambio versione.	2024-05-03 15:03:29 +02:00
Dario Sassi	23820e3ed8	EgtCAM5 : - aggiunto bottone per comando GRID_INVERT.	2024-04-26 17:52:37 +02:00
Dario Sassi	e2d1231ea2	EgtCAM5 : - aggiunta gestione disegno arco per due punti e raggio.	2024-04-19 17:57:22 +02:00
Dario Sassi	b7b824ab8a	EgtCAM5 : - aggiunto bottone per comando Nascondi, Visualizza Layer (Shift) e Visualizza Pezzo (Ctrl) - nell'albero entità corretto visualizza/nascondi Layer con tutte le sue entità (Shift su Lampadina).	2024-04-19 11:28:50 +02:00
Dario Sassi	14ed0480cd	EgtCAM5 : - corretto errore feedback non creato quando progetto contiene più macchinate con la stessa macchina.	2024-04-16 20:54:04 +02:00
Dario Sassi	928b8f679e	EgtCAM5 : - aggiunta gestione evento OnInsertingProject per poter passare AdvFlag a EgtController.	2024-04-13 18:42:47 +02:00
Demetrio Cassarino	919767fe34	Merge remote-tracking branch 'origin/master' into feature/ManageNote	2024-04-12 12:29:15 +02:00
Demetrio Cassarino	87507c60d8	-aggiornato grafica note	2024-04-12 12:28:46 +02:00
Dario Sassi	a0c93477a1	EgtCAM5 : - aggiunta gestione AdvFlag=0/1 della sezione [Import] nel file INI per Flag importatore formati avanzati.	2024-04-11 00:29:12 +02:00
Dario Sassi	62758acbeb	EgtCAM5 2.6d2 : - eliminata distinzione tra 32 e 64 per le diverse librerie lua (da tempo non serve più) - modifiche per meglio gestire i problemi con la eventuale chiave di rete (errore di collegamento o capacità esaurita).	2024-04-09 14:54:19 +02:00
Dario Sassi	05d1602c2e	EgtCAM5 2.6d1 : - in Opzioni Macchina aggiunto parametro Tolleranza Lineare di Approssimazione.	2024-04-02 15:40:44 +02:00
Demetrio Cassarino	20a153a0ea	-cambio lista con itemscontrol nel paragrafo note	2024-03-29 16:09:27 +01:00
Demetrio Cassarino	2febe6fb5b	-migliorie grafica paragrafo note	2024-03-26 17:19:25 +01:00
Demetrio Cassarino	a414b7a3e6	-pulizia codice	2024-03-15 14:46:12 +01:00
Demetrio Cassarino	fe05264a7d	Merge remote-tracking branch 'origin/master' into feature/ManageNote	2024-03-15 14:13:21 +01:00
Demetrio Cassarino	ee17b9dfbc	-modificato grafica selecteditem list	2024-03-15 12:47:05 +01:00
Dario Sassi	2a056bc9be	EgtCAM5 : - aggiunti bottoni toolbar per quotature angolari e diametrali/radiali - corretta gestione DecDigit di quotature in pagina Opzioni (valore può essere negativo).	2024-03-14 20:08:31 +01:00
Demetrio Cassarino	5fdec18828	-aggiunto controllo su pulsante rimuovi nota	2024-03-14 09:53:54 +01:00
Demetrio Cassarino	e3c84cdf05	-aggiunto immagini pulsanti	2024-03-13 17:21:45 +01:00
Demetrio Cassarino	0fb560a33b	-sistemato merge errato	2024-03-13 16:50:40 +01:00
Dario Sassi	82c40a5b41	EgtCAM5 2.6c2 : - aggiunto bottone per comandi movimento vertice e movimento faccia di superficie trimesh.	2024-03-13 09:29:04 +01:00
Demetrio Cassarino	fdacf0f958	-aggiornato grafica paragrafo note	2024-03-12 17:01:42 +01:00
Dario Sassi	0c4daf8ecb	EgtCAM5 2.6c2 : - aggiunti due nuovi parametri a InitDisp.	2024-03-11 14:18:51 +01:00
Demetrio Cassarino	3588c3d511	-aggiunto tab control per visualizzazione valore in base al tipo	2024-03-08 16:57:53 +01:00
Demetrio Cassarino	5142d2a2e9	.aggiunto combo aggiunti nota, pulizia codice	2024-03-06 16:14:10 +01:00
Demetrio Cassarino	17dbfe6163	-creazione paragrafo note, -correzione codice	2024-03-01 16:42:44 +01:00
Dario Sassi	a7dc65f10e	EgtCAM5 2.6b4 : - in simulazione migliorata gestione errori dopo EgtSimulStart - nella toolbar di Vista aggiunto anche comando IsoViewSE.	2024-02-19 14:58:17 +01:00
Dario Sassi	be256404ff	EgtCAM5 2.6b1 : - corretto falso rilevamento modifica testa usata da posizione in attrezzaggio.	2024-02-02 17:02:37 +01:00
Emmanuele Sassi	efe74f470c	Merge branch 'master' of https://gitlab.steamware.net/egaltech/EgtCAM5	2024-02-02 16:17:00 +01:00
Emmanuele Sassi	3b49b58783	- Ripristinato bottone MTable in modalita' lavorazione	2024-02-02 16:16:56 +01:00
Dario Sassi	d6b61e8633	EgtCAM5 : - in about aggiunto messaggio con indicazione stato piano di manutenzione.	2024-01-25 18:23:31 +01:00
Dario Sassi	9bb0558370	EgtCAM5 2.6a1 : - ricompilazione con cambio versione.	2024-01-23 17:26:02 +01:00
Emmanuele Sassi	f58322e131	EgtCAM5 2.5l4: - ricompilazione con cambio versione.	2024-01-15 09:09:51 +01:00
Emmanuele Sassi	fd7dbaed88	Merge branch 'hotfix/OperationParamError'	2024-01-15 09:07:12 +01:00
Emmanuele Sassi	5b41936ecb	- correzione per apertura parametri di lavorazione	2024-01-15 09:06:56 +01:00
Dario Sassi	14d92c0a2d	- modificati riferimenti a EgtTray che è stata rimossa	2024-01-08 16:33:23 +01:00
Emmanuele Sassi	7639de860f	Merge branch 'master' of https://gitlab.steamware.net/egaltech/EgtCAM5	2024-01-08 11:22:39 +01:00
Emmanuele Sassi	786362b31e	- aggiunto flag per plugin - aggiunto flag per eseguire script Lua	2024-01-08 11:08:41 +01:00
Dario Sassi	3154944f94	EgtCAM5 2.5l3 : - aggiunta vista da sotto e riordinati bottoni per comandi vista in toolbar - riordinati bottoni per comandi griglia in toolbar.	2023-12-29 13:22:26 +01:00
Emmanuele Sassi	423a88b049	Merge remote-tracking branch 'origin/master' into feature/DynamicDllForCustomControls	2023-12-27 11:46:33 +01:00
Dario Sassi	7dc34348ed	EgtCAM5 2.5l2 : - all'uscita dal DB lavorazioni se in modalità lavora si aggiorna subito la lista delle lavorazioni inseribili.	2023-12-18 10:33:10 +01:00
Dario Sassi	bee06b1999	EgtCAM5 2.5l1 : - ricompilazione con cambio versione.	2023-12-01 16:53:08 +01:00
Dario Sassi	64867f25dc	EgtCAM5 : - aggiunta funzione di callback OnTerminateProcess che viene chiamata prima di terminare con comando lua EgtCloseExe per permettere di sistemare lo stato.	2023-11-23 10:52:43 +01:00
Emmanuele Sassi	78a9b32973	- gestiti eventi del plugin - gestita visibility del right panel tra draw e machining - gestita assenza cartella plugin o nomi sbagliati - gestita visibility dei comandi principali della TopCommandBar	2023-11-21 12:56:33 +01:00
Dario Sassi	d210f63296	EgtCAM5 : - differenziata icona per 64 bit da quella per 32 bit - per il feedback migliorata selezione dei file con nome del progetto corrente o similare - eliminata configurazione packages non utilizzata.	2023-11-13 16:35:51 +01:00
Dario Sassi	1273279c1f	EgtCAM5 2.5j2 : - aggiunti file 3dm a gestione drag.	2023-11-12 19:32:09 +01:00
Dario Sassi	978de597ad	EgtCAM5 2.5k1 : - ricompilazione con cambio versione e aggiornamento protezione mensile.	2023-11-06 19:51:12 +01:00
Emmanuele Sassi	75d05a8b31	- create tray top, bottom, left e right - gestiti panel con Visibility - gestiti elementi grafici in ProjectV con ItemsControl - eliminato pannello Printing3d - aggiunta gestione Plugin - verifica bit per Plugin	2023-11-03 11:20:13 +01:00
Dario Sassi	045a7fa731	EgtCAM5 : - modifiche a bottoni SpecialPanel per visualizzazione in Disegna/Lavora.	2023-10-09 13:08:46 +02:00
Dario Sassi	29b2b495c3	EgtCAM5 2.5j1 : - aggiunta memorizzazione ultimo direttorio per progetti inseriti.	2023-10-02 16:08:55 +02:00
Dario Sassi	89a73457c7	EgtCAM5 2.5i6 : - ricompilazione con cambio versione.	2023-09-27 23:41:19 +02:00
Dario Sassi	5f2b1adf98	EgtCAM5 2.5i5 : - ricompilazione per cambio versione.	2023-09-21 16:15:34 +02:00
Dario Sassi	ab11f069e9	EgtCAM5 : - impostata creazione zip con encoding UTF8.	2023-09-14 18:33:36 +02:00
Dario Sassi	880dbeb7b9	EgtCAM5 : - gestione abilitazione da bit di licenza delle lavorazioni avanzate (Sgrossature e Finiture Superfici, Lavorazioni 5 assi) - gestione marcatura geometria mirror di lavorazioni in doppio.	2023-09-11 10:56:58 +02:00
Dario Sassi	6090527b2a	EgtCAM5 2.5i1 : - sostituita Ionic.Zip.dll con DotNetZip.dll (perchè precedente dll era ormai deprecata).	2023-09-05 17:08:13 +02:00
Dario Sassi	6dc81030c9	EgtCAM5 2.5h3 : - in Modo Lavora (quando abilitati più gruppi di lavoro) con [+] nuovo gruppo vuoto e con Shift + [+] nuovo gruppo come copia del corrente.	2023-08-27 18:36:28 +02:00
Dario Sassi	b889f75963	EgtCAM5 2.5h1 : - ricompilazione con cambio versione.	2023-08-07 19:32:08 +02:00
DarioS	ffd1c3d437	EgtCAM5 : - aggiunta disabilitazione UpdateAllMachinings prima di Simulazione, Stima e Generazione da Ini ([Mach] AutoUpdateAllMachinings=0) da usare solo internamente per ripetere esattamente situazioni di clienti.	2023-07-19 09:56:25 +02:00
DarioS	87ddc23ecc	EgtCAM5 2.5g1 : - ricompilazione con cambio versione.	2023-07-07 17:09:26 +02:00
DarioS	6b9808027f	EgtCAM5 2.5f2 : - ricompilazione con cambio versione.	2023-06-19 08:27:56 +02:00
DarioS	e9570187bb	EgtCAM5 : - aggiornato codice controllo mensile.	2023-06-12 09:19:51 +02:00
DarioS	cfdf3b392e	EgtCAM5 : - in aggiungi o aggiorna una macchina ora nello zip di macchina è ammessa una parte aggiuntiva tra punti con la versione (tipo Macchina.25f1.zip).	2023-06-12 08:04:43 +02:00
DarioS	c256a49bb2	EgtCAM5 : - modificata OnMouseSelectingObj per selezione lavorazione da toolpath evitando entità multiple di una stessa lavorazione.	2023-06-05 17:08:10 +02:00
DarioS	3e50c6151b	EgtCAM5 2.5f1 : - eliminata doppia selezione in MachiningMode_IsChecked - corretta gestione movimento grezzo insieme con ventose.	2023-06-05 14:31:05 +02:00
DarioS	b8c1368154	EgtCAM5 2.5e3 : - aggiunta gestione chiave di rete.	2023-05-30 17:10:34 +02:00
DarioS	3f2888f5d3	EgtCAM5 : - aggiornato codice di protezione mensile.	2023-05-17 08:53:20 +02:00
DarioS	17e8be7ab4	EgtCAM5 2.5e2 : - ricompilazione con cambio versione.	2023-05-17 08:49:35 +02:00
DarioS	958a2f005f	EgtCAM5 2.5d3 : - ricompilazione con cambio versione.	2023-04-11 19:39:42 +02:00
DarioS	3f02f139fa	EgtCAM5 2.5d1 : - ricompilazione con cambio versione.	2023-04-05 12:02:13 +02:00
DarioS	f8291c6da0	EgtCAM5 : - corretta modifica precedente su immagini bottoni per estensioni.	2023-03-22 08:32:58 +01:00
DarioS	dc9dc9a916	EgtCAM5 : - aggiunta abilitazione utente e aggiornamento per le estensioni permesse dai codici chiave.	2023-03-21 10:24:57 +01:00
DarioS	562497bfe7	EgtCAM5 2.5c1 : - ricompilazione con cambio versione.	2023-03-13 08:19:45 +01:00
DarioS	f3eb475348	EgtCAM5 : - aggiunta visualizzazione Estensioni caricate (Beam, Wall, Doors, Gunstock) con versione e direttorio di installazione.	2023-02-27 17:26:16 +01:00
DarioS	b428469294	EgtCAM5 : - esportazione macchine non salvano i file di git.	2023-02-27 09:24:20 +01:00
DarioS	9bd1da86b6	EgtCAM5 2.5b3 : - ricompilazione con cambio versione.	2023-02-23 15:27:58 +01:00
Emmanuele Sassi	495a8a9f66	- adattamento per cambiamento assi in simulazione	2023-02-23 10:49:43 +01:00
DarioS	cbd4f6c810	EgtCAM5 2.5b2 : - a stampa si associa per UI il testo EgtCAM5-Print.	2023-02-20 15:39:43 +01:00
DarioS	e72d30c392	EgtCAM5 : - aggiunto comando stampa.	2023-02-13 08:20:56 +01:00
DarioS	82a8ee2230	EgtCAM5 2.5b1 : - ricompilazione con cambio versione.	2023-02-09 10:43:11 +01:00
DarioS	ccf74a8644	EgtCAM5 2.5a4 : - ricompilazione con cambio versione.	2023-02-01 11:54:30 +01:00
DarioS	f0e95a97d7	EgtCAM5 2.5a3 : - ricompilazione con cambio versione.	2023-01-26 11:56:28 +01:00
DarioS	4fc98f419b	EgtCAM5 2.5a2 : - ricompilazione con cambio versione.	2023-01-17 11:34:04 +01:00
DarioS	6123aced14	EgtCAM5 : - in Hide/Show ora si garantisce la congruenza tra stato dell'albero e stato del progetto.	2023-01-11 17:44:45 +01:00
DarioS	bec2d24aac	EgtCAM5 : - velocizzato comando spegni/accendi gruppo e tutti i suoi discendenti individualmente (Shift su lampadina in TreeView).	2023-01-11 16:10:26 +01:00
DarioS	3b73ee84fd	EgtCAM5 2.5a1 : - ricompilazione con cambio versione.	2023-01-03 08:52:26 +01:00
DarioS	a019f5cce4	EgtCAM5 2.4l2 : - ricompilazione con cambio versione.	2022-12-22 15:25:10 +01:00
DarioS	9d420795d8	EgtCAM5 2.4l1 : - in ingresso simulazione spostata prima visualizzazione dopo EgtSimInit e EgtSimStart.	2022-12-07 08:17:51 +01:00
DarioS	5c0a68bfcc	EgtCAM5 2.4k6 : - ricompilazione con cambio versione.	2022-12-01 07:49:13 +01:00
DarioS	a7c8701512	EgtCAM5 2.4k5 : - ricompilazione con cambio versione.	2022-11-30 09:50:26 +01:00
DarioS	67a769e1fb	EgtCAM5 2.4k4 : - ricompilazione con cambio versione.	2022-11-22 08:48:18 +01:00
DarioS	da7d6da74c	EgtCAM5 2.4k3 : - ricompilazione con cambio versione.	2022-11-12 07:58:17 +01:00
DarioS	3ed56120e2	EgtCAM5 2.4k2 : - per la chiamata a DMACH si imposta DGD.BASEDIR.	2022-11-07 19:01:16 +01:00
DarioS	c6aba04921	EgtCAM5 2.4k1 : - aggiunto bottone e comando ApproxSurf - aggiunto comando SurfTmToTriangles come Shift di ExplodeSurf.	2022-11-04 19:26:31 +01:00
Emmanuele Sassi	fabfdf026a	EgtCAM5 2.4j4 : - ricompilazione con cambio versione	2022-10-24 20:27:48 +02:00
Emmanuele Sassi	954ea2f120	Merge branch 'master' of https://gitlab.steamware.net/egaltech/EgtCAM5	2022-10-24 12:14:08 +02:00
Emmanuele Sassi	18883cdbb3	- Modifica per file Lua compilati	2022-10-24 12:14:06 +02:00
DarioS	5ecfb960b5	EgtCAM5 2.4j3 : - aggiunta gestione sThreeJSLibDir da INI.	2022-10-24 08:47:36 +02:00
DarioS	6caf32aa67	EgtCAM5 2.4j2 : - ricompilazione con cambio versione.	2022-10-20 10:20:39 +02:00
DarioS	0125a5b7c7	EgtCAM5 2.4j1 : - ricompilazione con cambio versione.	2022-10-18 07:07:37 +02:00
DarioS	35735866a6	EgtCAM5 2.4i2 : - eliminato modulo MachineAxis.vb già presente in EgtWPFLib5.	2022-09-24 18:55:06 +02:00
DarioS	cf13d51a84	EgtCAM5 : - piccola correzione per caso di caricamento gruppo di lavoro non riuscito.	2022-09-13 09:00:33 +02:00
DarioS	173145ade7	EgtCAM5 2.4i1 : - miglioria per lancio script InitMach della macchina corretta.	2022-09-12 10:08:30 +02:00
DarioS	07b9ff800d	EgtCAM5 2.4h3 : - modifiche per entrare in modalità LAVORA senza pezzi in modo corretto	2022-08-29 07:29:31 +02:00
DarioS	9e2a9fa1ec	EgtCAM5 2.4h2 : - aggiunto comando Modifica Raggio di Arco o di Circonferenza.	2022-08-21 16:27:04 +02:00
DarioS	ef0c2b1f74	EgtCAM5 2.4h1 : - ricompilazione con cambio versione - piccola modifica in deseleziona tutto (per evitare di deselezionare oggetti in modifica).	2022-08-17 19:10:51 +02:00
DarioS	f42b9c5399	EgtCAM5 2.4g7 : - ricompilazione con cambio versione.	2022-08-09 18:35:21 +02:00
DarioS	827871073b	EgtCAM5 2.4g6 : - ricompilazione con cambio versione.	2022-08-03 10:28:31 +02:00
DarioS	53ace07386	EgtCAM5 2.4g5 : - ricompilazione con cambio versione.	2022-08-01 14:49:40 +02:00
DarioS	f24c18d0c2	EgtAM5 2.4g4 : - ricompilazione con cambio versione.	2022-07-29 15:11:45 +02:00
DarioS	1f1e7d6d70	EgtCAM5 2.4g3 : - ricompilazione con cambio versione.	2022-07-15 07:40:56 +02:00
DarioS	797d1dd70f	EgtCAM5 2.4g2 : - ricompilazione con cambio versione.	2022-07-14 06:39:19 +02:00
DarioS	e2a14a746a	EgtCAM5 2.4g1 : - ricompilazione con cambio versione.	2022-07-05 15:18:09 +02:00
DarioS	be6eea1054	EgtCAM5 2.4f6 : - aggiunta possibilità di comando Copia a GunStock.	2022-07-03 18:59:10 +02:00
DarioS	2e70a7c944	EgtCAM5 2.4f5 : - ricompilazione con cambio versione.	2022-06-27 09:55:59 +02:00
DarioS	6a9885d365	EgtCAM5 2.4f4 : - ricopilazione e aggiustamenti per nuget.	2022-06-19 12:34:20 +02:00
DarioS	52b08d92b2	EgtCAM5 2.4f3 : - ricompilazione con cambio versione.	2022-06-17 07:40:11 +02:00
DarioS	2ca14c2fce	EgtCAM5 2.4f2 : - ricompilazione con cambio versione.	2022-06-13 16:31:16 +02:00
Emmanuele Sassi	1c870d55d7	- Modifica per scroll posizioni con tante uscite in SetUp	2022-06-06 19:28:31 +02:00
DarioS	2dd55286c1	EgtCAM5 2.4f1 : - quando si apre una lavorazione per modificarne i parametri si imposta sempre anche la sua fase.	2022-06-06 07:05:36 +02:00
DarioS	55aca03daa	EgtCAM5 : - non si possono selezionare con mouse oggetti in modo Locked - aggiunta gestione materiale Additive come Wood.	2022-05-30 07:31:14 +02:00
DarioS	3fa1c51129	EgtCAM5 2.4e4 : - ricompilazione con cambio versione.	2022-05-21 10:26:21 +02:00
DarioS	455f3c6949	EgtCAM5 2.4e3 : - ricompilazione con cambio di versione.	2022-05-20 15:54:27 +02:00
DarioS	3ed7a3593c	EgtCAM5 2.4e2 : - modifiche per lancio script Beam e Wall con parametro BW (per ottimizzazioni) - modifiche per passare agli stessi script il direttorio di esecuzione - possibilità di settare direttori a parte per 64 bit per esecuzione script Beam e Wall (solo uso interno).	2022-05-09 19:38:25 +02:00
DarioS	f9d459134a	EgtCAM5 2.4e1 : - nelle info di generazione CN indico anche se programma a 64 bit.	2022-04-30 11:13:13 +02:00
Emmanuele Sassi	00d2054cd3	- Modifica per segnalare a LUA travi e pareti che comando arriva da BeamWall	2022-04-29 19:09:50 +02:00
DarioS	2b6a9d49ff	EgtCAM5 2.4d4 : - ricompilazione per nuova versione - aggiunto bit di controllo a chiave per 3dPrinting.	2022-04-27 00:14:39 +02:00
DarioS	ac8577206e	EgtCAM5 2.4d3 : - ricompilazione con cambio versione.	2022-04-22 08:54:59 +02:00
DarioS	d6395f6b9b	EgtCAM5 : - ricompilazione con cambio versione.	2022-04-19 11:25:10 +02:00
DarioS	3c96fec59b	EgtCAM5 2.4d1 : - ricompilazione con cambio versione.	2022-04-07 11:07:59 +02:00
Emmanuele Sassi	320c5ab1c6	- Introduzione barra per stampa 3d	2022-03-26 14:36:38 +01:00
DarioS	3bf58d9069	EgtCam5 2.4c3 : - ricompilazione con cambio versione.	2022-03-26 11:30:49 +01:00
DarioS	4ad745b7ce	EgtCAM5 : - corretto errore comando Aggiorna Macchina introdotto aggiungendo comando Aggiorna Licenza in Opzioni.	2022-03-21 09:47:28 +01:00
DarioS	86e30a0cc0	EgtCAM5 2.4c2 : - ricompilazione con cambio versione.	2022-03-20 18:31:07 +01:00
DarioS	f1096b3f15	EgtCAM5 2.4c1 : - versione 2403 - aggiunto comando per aggiornare licenza in Opzioni-Generale.	2022-03-08 15:07:23 +01:00
DarioS	bc2603436f	EgtCAM5 2.4b6 : - aggiunte info su User Level e Debug Level in AboutBox e Log.	2022-02-26 17:54:21 +01:00
DarioS	65b01a750b	EgtCAM5 2.4b5 : - ricompilazione con cambio versione.	2022-02-23 10:54:31 +01:00
DarioS	f607d7e12c	EgtCAM5 2.4b4 : - ricompilazione con cambio versione.	2022-02-17 22:29:58 +01:00
DarioS	534fa33a09	EgtCAM5 2.3b3 : - ricompilazione con cambio versione.	2022-02-15 08:21:00 +01:00
DarioS	9dbd69b0bd	Merge branch 'master' of https://gitlab.steamware.net/egaltech/EgtCAM5	2022-02-14 17:48:40 +01:00
DarioS	d0412f4e07	EgtCAM5 2.4b2 : - ricompilazione con cambio versione.	2022-02-14 17:47:01 +01:00
RenzoL	8b9c4c63c3	Merge remote-tracking branch 'origin/RenzoL'	2022-02-09 09:42:55 +01:00
RenzoL	687933571d	- Aggiunti i campi Raggio Epicicli e Distanza Epicicli al MachiningParameterExpander, visibili per Pocketing nel caso di Macchina Stone e utensile Polishing	2022-02-09 09:41:43 +01:00
DarioS	5b01e4ebfe	EgtCAM5 2.4b1 : - ricompilazione con cambio versione.	2022-02-03 21:45:32 +01:00
DarioS	211eb17c49	EgtCAM5 2.4a4 : - quando si sposta una lavorazione da una fase all'altra si aggiorna la fase corrente.	2022-01-26 08:55:32 +01:00
Emmanuele Sassi	4d898e6423	- Ripristinata generazione cnc per ddf con flag opportuno - Aggiornata versione	2022-01-20 20:02:35 +01:00
RenzoL	bc97e3599f	Merge branch 'RenzoL'	2022-01-20 14:39:54 +01:00
RenzoL	8eae142985	- VM della Tabella delle lavorazioni delle travi spostato in EgtWPFLib5	2022-01-20 14:38:10 +01:00
DarioS	921996c39c	EgtCAM5 2.4a2 : - aggiunta gestione file OBJ (Alias-Wavefront).	2022-01-14 18:57:26 +01:00
DarioS	747a34d443	EgtCAM5 2.4a1 : - ricompilazione per cambio versione.	2022-01-04 08:20:06 +01:00
DarioS	e338d3d9ea	EgtCAM5 2.3l2 : - ricompilazione per cambio versione.	2021-12-21 05:36:17 +01:00
DarioS	12c65ff40c	EgtCAM5 2.3l1 : - ricompilazione per cambio versione.	2021-12-08 16:47:23 +01:00
DarioS	672686978d	EgtCAM5 2.3k5: - ricompilazione per cambio versione.	2021-11-22 22:58:43 +01:00
RenzoL	dca32c5dcc	Merge branch 'develop'	2021-11-17 12:14:53 +01:00
DarioS	bc7b5d1da3	EgtCAM5 2.3k4 : - ricompilazione per cambio versione.	2021-11-15 09:56:24 +01:00
DarioS	908d0bf187	EgtCAM5 2.3k3 : - ricompilazione per cambio versione.	2021-11-08 19:00:45 +01:00
DarioS	fee8a11358	EgtCAM5 2.3k2 : - ricompilazione per cambio versione.	2021-11-04 10:02:53 +01:00
DarioS	8cbb54a541	EgtCAM5 2.3k1 : - ricompilazione con cambio versione.	2021-11-03 13:26:30 +01:00
DarioS	fdf1661f78	EgtCAM5 2.3j7 : - ricompilazione per cambio versione.	2021-11-02 08:24:51 +01:00
NicolaP	63a7ea25ba	Merge branch 'develop'	2021-10-27 19:34:33 +02:00
Emmanuele Sassi	00b02e3a6b	Merge branch 'develop'	2021-10-25 19:21:57 +02:00
		`@@ -0,0 +1,3 @@`
							`Public Class SceneContentControlV`

							`End Class`